refactor: use Result for handler return type in variable getters and setters

Author: ensh63

examples/async.rs

@@ -1,5 +1,5 @@
 use std::ffi::{c_char, c_void};
-use std::ptr::{addr_of, addr_of_mut};
+use std::ptr::addr_of_mut;
 use std::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
 use std::sync::{Arc, OnceLock};
 use std::time::Instant;
@@ -148,22 +148,20 @@ http_request_handler!(async_access_handler, |request: &mut http::Request| {
         return core::Status::NGX_DECLINED.into();
     }
 
-    if let Some(ctx) =
-        unsafe { request.get_module_ctx::<RequestCTX>(&*addr_of!(ngx_http_async_module)) }
-    {
+    if let Some(ctx) = request.get_module_ctx::<RequestCTX>(Module::module()) {
         if !ctx.done.load(Ordering::Relaxed) {
             return core::Status::NGX_AGAIN.into();
         }
 
         return core::Status::NGX_OK.into();
     }
 
-    let ctx = request
+    let mut ctx = request
         .pool()
         .allocate_with_cleanup(RequestCTX::default())?;
-    request.set_module_ctx(ctx.cast(), unsafe { &*addr_of!(ngx_http_async_module) });
+    request.set_module_ctx(ctx, Module::module());
 
-    let ctx = unsafe { &mut *ctx };
+    let ctx = unsafe { ctx.as_mut() };
     ctx.event.handler = Some(check_async_work_done);
     ctx.event.data = request.connection().cast();
     ctx.event.log = unsafe { (*request.connection()).log };

examples/httporigdst.rs

@@ -1,5 +1,4 @@
-use std::ffi::{c_int, c_void};
-use std::ptr::addr_of;
+use std::ffi::c_int;
 
 use ngx::core;
 use ngx::ffi::{
@@ -20,50 +19,38 @@ struct NgxHttpOrigDstCtx {
 
 impl NgxHttpOrigDstCtx {
     pub fn save(&mut self, addr: &str, port: in_port_t, pool: &core::Pool) -> core::NgxResult {
-        let addr_data = pool.allocate_unaligned(addr.len())?;
-        unsafe { libc::memcpy(addr_data, addr.as_ptr() as *const c_void, addr.len()) };
-        self.orig_dst_addr.len = addr.len();
-        self.orig_dst_addr.data = addr_data as *mut u8;
+        self.orig_dst_addr = unsafe { ngx_str_t::from_str(pool.as_ptr(), addr) };
 
         let port_str = port.to_string();
-        let port_data = pool.allocate_unaligned(port_str.len())?;
-        unsafe {
-            libc::memcpy(
-                port_data,
-                port_str.as_bytes().as_ptr() as *const c_void,
-                port_str.len(),
-            )
-        };
-        self.orig_dst_port.len = port_str.len();
-        self.orig_dst_port.data = port_data as *mut u8;
+        self.orig_dst_port = unsafe { ngx_str_t::from_str(pool.as_ptr(), &port_str) };
 
         Ok(core::Status::NGX_OK.into())
     }
 
-    pub unsafe fn bind_addr(&self, v: *mut ngx_variable_value_t) {
+    pub unsafe fn bind_addr(&self, v: &mut ngx_variable_value_t) {
         if self.orig_dst_addr.len == 0 {
-            (*v).set_not_found(1);
+            v.set_not_found(1);
             return;
         }
 
-        (*v).set_valid(1);
-        (*v).set_no_cacheable(0);
-        (*v).set_not_found(0);
-        (*v).set_len(self.orig_dst_addr.len as u32);
-        (*v).data = self.orig_dst_addr.data;
+        v.set_valid(1);
+        v.set_no_cacheable(0);
+        v.set_not_found(0);
+        v.set_len(self.orig_dst_addr.len as u32);
+        v.data = self.orig_dst_addr.data;
     }
 
-    pub unsafe fn bind_port(&self, v: *mut ngx_variable_value_t) {
+    pub unsafe fn bind_port(&self, v: &mut ngx_variable_value_t) {
         if self.orig_dst_port.len == 0 {
-            (*v).set_not_found(1);
+            v.set_not_found(1);
             return;
         }
 
-        (*v).set_valid(1);
-        (*v).set_no_cacheable(0);
-        (*v).set_not_found(0);
-        (*v).set_len(self.orig_dst_port.len as u32);
-        (*v).data = self.orig_dst_port.data;
+        v.set_valid(1);
+        v.set_no_cacheable(0);
+        v.set_not_found(0);
+        v.set_len(self.orig_dst_port.len as u32);
+        v.data = self.orig_dst_port.data;
     }
 }
 
@@ -185,8 +172,8 @@ unsafe fn ngx_get_origdst(
 
 http_variable_get!(
     ngx_http_orig_dst_addr_variable,
-    |request: &mut http::Request, v: *mut ngx_variable_value_t, _: usize| {
-        let ctx = request.get_module_ctx::<NgxHttpOrigDstCtx>(&*addr_of!(ngx_http_orig_dst_module));
+    |request: &mut http::Request, v: &mut ngx_variable_value_t, _: usize| {
+        let ctx = request.get_module_ctx::<NgxHttpOrigDstCtx>(Module::module());
         if let Some(obj) = ctx {
             ngx_log_debug_http!(request, "httporigdst: found context and binding variable",);
             obj.bind_addr(v);
@@ -206,7 +193,7 @@ http_variable_get!(
             Ok((ip, port)) => {
                 // create context,
                 // set context
-                let new_ctx = request
+                let mut new_ctx = request
                     .pool()
                     .allocate_with_cleanup::<NgxHttpOrigDstCtx>(Default::default())?;
 
@@ -216,10 +203,9 @@ http_variable_get!(
                     ip,
                     port,
                 );
-                (*new_ctx).save(&ip, port, &request.pool())?;
-                (*new_ctx).bind_addr(v);
-                request
-                    .set_module_ctx(new_ctx as *mut c_void, &*addr_of!(ngx_http_orig_dst_module));
+                new_ctx.as_mut().save(&ip, port, &request.pool())?;
+                new_ctx.as_mut().bind_addr(v);
+                request.set_module_ctx(new_ctx, Module::module());
             }
         }
         core::Status::NGX_OK.into()
@@ -228,8 +214,8 @@ http_variable_get!(
 
 http_variable_get!(
     ngx_http_orig_dst_port_variable,
-    |request: &mut http::Request, v: *mut ngx_variable_value_t, _: usize| {
-        let ctx = request.get_module_ctx::<NgxHttpOrigDstCtx>(&*addr_of!(ngx_http_orig_dst_module));
+    |request: &mut http::Request, v: &mut ngx_variable_value_t, _: usize| {
+        let ctx = request.get_module_ctx::<NgxHttpOrigDstCtx>(Module::module());
         if let Some(obj) = ctx {
             ngx_log_debug_http!(request, "httporigdst: found context and binding variable",);
             obj.bind_port(v);
@@ -249,7 +235,7 @@ http_variable_get!(
             Ok((ip, port)) => {
                 // create context,
                 // set context
-                let new_ctx = request
+                let mut new_ctx = request
                     .pool()
                     .allocate_with_cleanup::<NgxHttpOrigDstCtx>(Default::default())?;
 
@@ -259,10 +245,9 @@ http_variable_get!(
                     ip,
                     port,
                 );
-                (*new_ctx).save(&ip, port, &request.pool())?;
-                (*new_ctx).bind_port(v);
-                request
-                    .set_module_ctx(new_ctx as *mut c_void, &*addr_of!(ngx_http_orig_dst_module));
+                new_ctx.as_mut().save(&ip, port, &request.pool())?;
+                new_ctx.as_mut().bind_port(v);
+                request.set_module_ctx(new_ctx, Module::module());
             }
         }
         core::Status::NGX_OK.into()