DRAFT: replace crate::net::resolver with ngx::async_::resolver

Cargo.toml

@@ -21,8 +21,8 @@ http-body-util = "0.1.3"
 http-serde = "2.1.1"
 hyper = { version = "1.6.0", features = ["client", "http1"] }
 libc = "0.2.174"
-nginx-sys = "0.5.0-beta"
-ngx = { version = "0.5.0-beta", features = ["async", "serde", "std"] }
+nginx-sys = "0.5.0"
+ngx = { version = "0.5.0", features = ["async", "serde", "std"] }
 openssl = { version = "0.10.73", features = ["bindgen"] }
 openssl-foreign-types = { package = "foreign-types", version = "0.3" }
 openssl-sys = { version = "0.9.109", features = ["bindgen"] }

src/conf.rs

@@ -412,7 +412,7 @@ extern "C" fn cmd_issuer_set_external_account_key(
         return NGX_CONF_DUPLICATE;
     }
 
-    let mut pool = cf.pool();
+    let pool = cf.pool();
     // NGX_CONF_TAKE2 ensures that args contains 3 elements
     let args = cf.args();
 

src/net.rs

@@ -6,4 +6,3 @@
 pub mod connection;
 pub mod http;
 pub mod peer_conn;
-pub mod resolver;

src/net/http.rs

@@ -15,12 +15,12 @@ use http_body::Body;
 use http_body_util::BodyExt;
 use nginx_sys::{ngx_log_t, ngx_resolver_t, NGX_LOG_WARN};
 use ngx::allocator::Box;
+use ngx::async_::resolver::Resolver;
 use ngx::async_::spawn;
 use ngx::ngx_log_error;
 use thiserror::Error;
 
 use super::peer_conn::PeerConnection;
-use super::resolver::Resolver;
 use crate::conf::ssl::NgxSsl;
 
 // The largest response we can reasonably expect is a certificate chain, which should not exceed
@@ -65,7 +65,7 @@ pub enum HttpClientError {
     #[error("request error: {0}")]
     Http(#[from] hyper::Error),
     #[error("name resolution error: {0}")]
-    Resolver(super::resolver::Error),
+    Resolver(ngx::async_::resolver::Error),
     #[error("connection error: {0}")]
     Io(io::Error),
     #[error("invalid uri: {0}")]
@@ -74,7 +74,7 @@ pub enum HttpClientError {
 
 impl From<io::Error> for HttpClientError {
     fn from(err: io::Error) -> Self {
-        match err.downcast::<super::resolver::Error>() {
+        match err.downcast::<ngx::async_::resolver::Error>() {
             Ok(x) => Self::Resolver(x),
             Err(x) => Self::Io(x),
         }

src/net/peer_conn.rs

@@ -17,13 +17,13 @@ use nginx_sys::{
     ngx_ssl_shutdown, ngx_ssl_t, ngx_str_t, ngx_url_t, NGX_DEFAULT_POOL_SIZE, NGX_LOG_ERR,
     NGX_LOG_WARN,
 };
+use ngx::async_::resolver::Resolver;
 use ngx::collections::Vec;
-use ngx::core::Status;
+use ngx::core::{Pool, Status};
 use ngx::{ngx_log_debug, ngx_log_error};
 use openssl_sys::{SSL_get_verify_result, X509_verify_cert_error_string, X509_V_OK};
 
 use super::connection::{Connection, ConnectionLogError};
-use super::resolver::Resolver;
 use crate::util::OwnedPool;
 
 const ACME_DEFAULT_READ_TIMEOUT: ngx_msec_t = 60000;
@@ -165,7 +165,7 @@ impl PeerConnection {
         url.default_port = if ssl.is_some() { 443 } else { 80 };
         url.set_no_resolve(1);
 
-        let addr_vec: Vec<ngx_addr_t>;
+        let addr_vec: Vec<ngx_addr_t, Pool>;
 
         if Status(unsafe { nginx_sys::ngx_parse_url(self.pool.as_mut(), &mut url) })
             != Status::NGX_OK
@@ -183,7 +183,7 @@ impl PeerConnection {
             self.pc.socklen = addr.socklen;
         } else {
             addr_vec = res
-                .resolve(&url.host, self.pool.as_mut())
+                .resolve_name(&url.host, self.pool.as_mut())
                 .await
                 .map_err(io::Error::other)?;