Update signatures of go funcs in C

Author: TheTeaCat

src/nginx_module/access_phase_handler.c

@@ -15,8 +15,8 @@ struct ValidateRequestBody_return {
   int r0;
   char *r1;
 };
-typedef struct ValidateRequestBody_return (*ValidateRequestBody)(void *, int, void *, int, void *, int, void *, int,
-                                                                 void *, int);
+typedef struct ValidateRequestBody_return (*ValidateRequestBody)(int, void *, int, void *, int, void *, int, void *,
+                                                                 int);
 
 typedef struct {
   ngx_int_t status;
@@ -150,9 +150,9 @@ static ngx_int_t FiretailClientBodyHandlerInternal(ngx_http_request_t *request)
   ngx_log_debug(NGX_LOG_DEBUG, request->connection->log, 0, "Validating request body...");
 
   struct ValidateRequestBody_return validation_result = request_body_validator(
-      main_config->FiretailAllowUndefinedRoutes.data, main_config->FiretailAllowUndefinedRoutes.len, ctx->request_body,
-      ctx->request_body_size, request->unparsed_uri.data, request->unparsed_uri.len, request->method_name.data,
-      request->method_name.len, (char *)ctx->request_headers_json, ctx->request_headers_json_size);
+      (int)main_config->FiretailAllowUndefinedRoutes, ctx->request_body, ctx->request_body_size,
+      request->unparsed_uri.data, request->unparsed_uri.len, request->method_name.data, request->method_name.len,
+      (char *)ctx->request_headers_json, ctx->request_headers_json_size);
 
   ngx_log_debug(NGX_LOG_DEBUG, request->connection->log, 0, "Validation request result: %d", validation_result.r0);
   ngx_log_debug(NGX_LOG_DEBUG, request->connection->log, 0, "Validating request body: %s", validation_result.r1);

src/nginx_module/filter_response_body.c

@@ -10,9 +10,9 @@ struct ValidateResponseBody_return {
   int r0;
   char *r1;
 };
-typedef struct ValidateResponseBody_return (*ValidateResponseBody)(char *, int, char *, int, char *, int, char *, int,
-                                                                   char *, int, void *, int, char *, int, void *, int,
-                                                                   int, void *, int);
+typedef struct ValidateResponseBody_return (*ValidateResponseBody)(char *, int, char *, int, int, int, int, char *, int,
+                                                                   char *, int, char *, int, void *, int, char *, int,
+                                                                   int, char *, int);
 
 static ngx_buf_t *FiretailResponseBodyFilterBuffer(ngx_http_request_t *request, u_char *response);
 static ngx_int_t FiretailResponseBodyFilterFinalise(ngx_http_request_t *request, FiretailFilterContext *ctx,
@@ -106,14 +106,27 @@ ngx_int_t FiretailResponseBodyFilter(ngx_http_request_t *request, ngx_chain_t *c
     ngx_log_debug(NGX_LOG_DEBUG, request->connection->log, 0, "Validating response body...");
 
     FiretailConfig *main_config = ngx_http_get_module_main_conf(request, ngx_firetail_module);
-    validation_result = response_body_validator(
-        (char *)main_config->FiretailUrl.data, main_config->FiretailUrl.len, (char *)main_config->FiretailApiToken.data,
-        main_config->FiretailApiToken.len, (char *)main_config->FiretailAllowUndefinedRoutes.data,
-        (int)main_config->FiretailAllowUndefinedRoutes.len, (char *)ctx->request_body, (int)ctx->request_body_size,
-        (char *)ctx->request_headers_json, (int)ctx->request_headers_json_size, ctx->response_body,
-        ctx->response_body_size, response_headers_json_string, strlen(response_headers_json_string),
-        request->unparsed_uri.data, request->unparsed_uri.len, ctx->status_code, request->method_name.data,
-        request->method_name.len);
+    validation_result = response_body_validator((char *)main_config->FiretailUrl.data,           // urlCharPtr
+                                                main_config->FiretailUrl.len,                    // urlLength
+                                                (char *)main_config->FiretailApiToken.data,      // tokenCharPtr
+                                                main_config->FiretailApiToken.len,               // tokenLength
+                                                (int)main_config->FiretailAllowUndefinedRoutes,  // allowUndefinedRoutes
+                                                (int)main_config->FiretailRedactRequestBodies,   // redactRequestBodies
+                                                (int)main_config->FiretailRedactResponseBodies,  // redactResponseBodies
+                                                (char *)ctx->request_body,                       // reqBodyCharPtr
+                                                (int)ctx->request_body_size,                     // reqBodyLength
+                                                (char *)ctx->request_headers_json,     // reqHeadersJsonCharPtr
+                                                (int)ctx->request_headers_json_size,   // reqHeadersJsonLength
+                                                (char *)ctx->response_body,            // resBodyCharPtr
+                                                ctx->response_body_size,               // resBodyLength
+                                                response_headers_json_string,          // resHeadersJsonCharPtr
+                                                strlen(response_headers_json_string),  // resHeadersJsonLength
+                                                (char *)request->unparsed_uri.data,    // pathCharPtr
+                                                request->unparsed_uri.len,             // pathLength
+                                                ctx->status_code,                      // statusCode
+                                                (char *)request->method_name.data,     // methodCharPtr
+                                                request->method_name.len               // methodLength
+    );
     ngx_log_debug(NGX_LOG_DEBUG, request->connection->log, 0, "Validation response result: %d", validation_result.r0);
     ngx_log_debug(NGX_LOG_DEBUG, request->connection->log, 0, "Validating response body: %s", validation_result.r1);