add on server properties feature

Author: Taymindis

build_test_resources/linkfuntest.c

@@ -3,8 +3,15 @@
 #include <ngx_link_func_module.h>
 
 
-/***gcc -shared -o liblinkfuntest.so -fPIC linkfuntest.c***/
-/***cp liblinkfuntest.so /etc/nginx/***/
+/* gcc -shared -o liblinkfuntest.so -fPIC linkfuntest.c  */
+/* cp liblinkfuntest.so /etc/nginx/  */
+
+/* for Darwin */
+/*
+*
+* clang -dynamiclib -o liblinkfuntest.dylib -fPIC linkfuntest.c -Wl,-undefined,dynamic_lookup
+*
+*/
 
 int is_service_on = 0;
 
@@ -14,7 +21,6 @@ void ngx_link_func_init(ngx_link_func_ctx_t* ctx) {
     is_service_on = 1;
 }
 
-
 void my_app_simple_get_greeting(ngx_link_func_ctx_t *ctx) {
     ngx_link_func_log_info(ctx, "Calling back and log from my_app_simple_get");
 
@@ -30,7 +36,44 @@ void my_app_simple_get_greeting(ngx_link_func_ctx_t *ctx) {
     );
 }
 
+void my_app_simple_get_delay_greeting(ngx_link_func_ctx_t *ctx) {
+    ngx_link_func_log_info(ctx, "Calling back and log from my_app_simple_get");
+
+    char *rep = "2 second delay greeting from ngx_link_func testing";
+    sleep(2); 
+    ngx_link_func_write_resp(
+        ctx,
+        200,
+        "200 OK",
+        "text/plain",
+        rep,
+        strlen(rep)
+    );
+}
 
+void my_app_simple_get_prop_greeting(ngx_link_func_ctx_t *ctx) {
+    ngx_link_func_log_info(ctx, "Calling back and log from my_app_simple_get");
+    u_char *defaultGreeting =  ngx_link_func_get_prop(ctx, "defaultGreeting", sizeof("defaultGreeting") - 1);
+    if(defaultGreeting) {
+        ngx_link_func_write_resp(
+            ctx,
+            200,
+            "200 OK",
+            "text/plain",
+            (char*) defaultGreeting,
+            strlen(defaultGreeting)
+        );
+    } else {
+        ngx_link_func_write_resp(
+            ctx,
+            404,
+            "404 NOT FOUND",
+            "text/plain",
+            NULL,
+            0
+        );
+    }
+}
 
 void my_app_simple_get_args(ngx_link_func_ctx_t *ctx) {
     ngx_link_func_log(info, ctx, "Calling back and log from my_app_simple_get_args");

config

@@ -24,7 +24,7 @@ ngx_feature_incs="#include <ngx_link_func_module.h>"
 ngx_feature_path=
 ngx_feature_libs=
 # ngx_feature_exit_if_not_found=yes
-ngx_feature_test="int ngx_link_func_module_current_version_=ngx_link_func_module_version_31;"
+ngx_feature_test="int ngx_link_func_module_current_version_=ngx_link_func_module_version_32;"
 . auto/feature
 
 if [ $ngx_found != yes ]; then

src/ngx_link_func_module.c

@@ -92,6 +92,7 @@ typedef struct {
     ngx_str_t _headers;
     ngx_str_t _ca_cart;
     ngx_queue_t *_link_func_locs_queue;
+    ngx_array_t *_props;
 } ngx_http_link_func_srv_conf_t;
 
 typedef struct {
@@ -206,7 +207,8 @@ void ngx_link_func_log_info(ngx_link_func_ctx_t *ctx, const char* msg);
 void ngx_link_func_log_warn(ngx_link_func_ctx_t *ctx, const char* msg);
 void ngx_link_func_log_err(ngx_link_func_ctx_t *ctx, const char* msg);
 char *ngx_link_func_strdup(ngx_link_func_ctx_t *ctx, const char *src);
-u_char* ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char*key, size_t keylen);
+u_char* ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen);
+u_char* ngx_link_func_get_prop(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen);
 int ngx_link_func_add_header_in(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen, const char *value, size_t val_len );
 int ngx_link_func_add_header_out(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen, const char *value, size_t val_len );
 void* ngx_link_func_get_query_param(ngx_link_func_ctx_t *ctx, const char *key);
@@ -294,6 +296,13 @@ static ngx_command_t ngx_http_link_func_commands[] = {
         offsetof(ngx_http_link_func_loc_conf_t, _method_name), /* No offset when storing the module configuration on struct. */
         NULL
     },
+    {   ngx_string("ngx_link_func_add_prop"), 
+        NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_CONF_TAKE2,
+        ngx_conf_set_keyval_slot,
+        NGX_HTTP_SRV_CONF_OFFSET,
+        offsetof(ngx_http_link_func_srv_conf_t, _props),
+        NULL
+    },
     ngx_null_command /* command termination */
 };
 
@@ -711,7 +720,7 @@ ngx_http_link_func_pre_configuration(ngx_conf_t *cf) {
     return NGX_ERROR;
 #endif
 
-#ifndef ngx_link_func_module_version_31
+#ifndef ngx_link_func_module_version_32
     ngx_conf_log_error(NGX_LOG_EMERG, cf,  0, "%s", "the ngx_http_link_func_module.h might not be latest or not found in the c header path, \
         please copy latest ngx_http_link_func_module.h to your /usr/include or /usr/local/include or relavent header search path \
         with read and write permission.");
@@ -990,8 +999,8 @@ ngx_http_link_func_create_srv_conf(ngx_conf_t *cf) {
 static char *
 ngx_http_link_func_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
 {
-    // ngx_http_link_func_srv_conf_t *prev = parent;
-    // ngx_http_link_func_srv_conf_t *conf = child;
+    ngx_http_link_func_srv_conf_t *prev = parent;
+    ngx_http_link_func_srv_conf_t *conf = child;
 
 
     // ngx_conf_merge_str_value(conf->_libname, prev->_libname, "");
@@ -1010,6 +1019,11 @@ ngx_http_link_func_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
     //                   "lib_name");
     //     return NGX_CONF_ERROR;
     // }
+
+    if (conf->_props == NULL) {
+        conf->_props = prev->_props;
+    }
+
     return NGX_CONF_OK;
 }
 
@@ -1659,7 +1673,7 @@ ngx_http_link_func_strdup_with_p(ngx_pool_t *pool, const char *src, size_t len)
 }
 
 u_char*
-ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char*key, size_t keylen) {
+ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen) {
     ngx_http_request_t *r = (ngx_http_request_t*)ctx->__r__;
     ngx_list_part_t *part = &r->headers_in.headers.part;
     ngx_table_elt_t *header = part->elts;
@@ -1685,6 +1699,43 @@ ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char*key, size_t keylen
     }
 }
 
+u_char*
+ngx_link_func_get_prop(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen) {
+    ngx_http_request_t *r = (ngx_http_request_t*)ctx->__r__;
+    ngx_http_link_func_srv_conf_t *scf;
+    ngx_uint_t nelts, i;
+    ngx_keyval_t *keyval;
+
+    if (r == NULL) {
+        ngx_log_error(NGX_LOG_EMERG, r->connection->log, 0, "Invalid Session access");
+        return NULL;
+    }
+
+    scf = ngx_http_get_module_srv_conf(r, ngx_http_link_func_module);
+
+    if( scf == NULL ) {
+        ngx_log_error(NGX_LOG_EMERG, r->connection->log, 0, "Invalid link function server config");
+        return NULL;
+    }
+
+    if(scf->_props == NULL) {
+        return NULL;
+    }
+
+    nelts = scf->_props->nelts;
+    keyval = scf->_props->elts;
+
+    for (i = 0; i < nelts; i++) {
+      if ( keyval->key.len == keylen && ngx_strncasecmp(keyval->key.data, (u_char*) key, keylen) == 0) {
+        /** it is config memory pool, should not reallocate or overwrite **/
+        return keyval->value.data;          
+      }
+      keyval++;
+    }
+    return NULL;
+}
+
+
 static int
 strpos(const char *haystack, const char *needle) {
     char *p = ngx_strstr(haystack, needle);

src/ngx_link_func_module.h

@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#define ngx_link_func_module_version_31 31
+#define ngx_link_func_module_version_32 32
 
 
 #define ngx_link_func_content_type_plaintext "text/plain"
@@ -70,7 +70,8 @@ extern void ngx_link_func_log_info(ngx_link_func_ctx_t *ctx, const char* msg);
 extern void ngx_link_func_log_warn(ngx_link_func_ctx_t *ctx, const char* msg);
 extern void ngx_link_func_log_err(ngx_link_func_ctx_t *ctx, const char* msg);
 
-extern u_char* ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char*key, size_t keylen);
+extern u_char* ngx_link_func_get_header(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen);
+extern u_char* ngx_link_func_get_prop(ngx_link_func_ctx_t *ctx, const char *key, size_t keylen);
 extern void* ngx_link_func_get_query_param(ngx_link_func_ctx_t *ctx, const char *key);
 extern void* ngx_link_func_palloc(ngx_link_func_ctx_t *ctx, size_t size);
 extern void* ngx_link_func_pcalloc(ngx_link_func_ctx_t *ctx, size_t size);