added themis cmd type and reuqest type

jinglong · Nov 23, 2012 · 62662b6 · 62662b6
1 parent 2e4620e
commit 62662b6
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/core/ngx_http_themis_module.c b/core/ngx_http_themis_module.c
@@ -347,7 +347,7 @@ ngx_http_themis_init_process(ngx_cycle_t *cycle)
 
     if (ngx_add_channel_event(cycle,
             ngx_themis_socketpairs[ngx_process_slot][1], NGX_READ_EVENT,
-            ngx_themis_channel_read_handler) == NGX_ERROR)
+            ngx_themis_channel_handler) == NGX_ERROR)
     {
         return NGX_ERROR;
     }
@@ -375,6 +375,12 @@ ngx_themis_conf_set_config(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ngx_http_themis_main_conf_t  *tmcf;
 
     value = cf->args->elts;
+    if (ngx_strncasecmp(value[1].data, (u_char *) "themis", value[1].len)
+        == 0)
+    {
+        return "\"themis\" is not allowed be a parameter";
+    }
+
     tlcf->name = value[1];
     tlcf->enable = 1;
     http_ctx = cf->ctx;
@@ -542,7 +548,10 @@ ngx_http_themis_interface(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 static ngx_int_t
 ngx_http_themis_interface_handler(ngx_http_request_t *r)
 {
-    /* uri: app/module/command */
+    /*
+      uri: app/module/command
+           themis/...
+    */
 
     return NGX_DONE;
 }
diff --git a/core/ngx_themis.h b/core/ngx_themis.h
@@ -8,9 +8,13 @@
 #include <ngx_themis_channel.h>
 
 
-#define NGX_THEMIS_MODULE 0x53494d54  /* TMIS */
+#define NGX_THEMIS_MODULE 0x53494d54    /* TMIS */
+
 #define NGX_THEMIS_CONF   NGX_ANY_CONF
 
+#define NGX_THEMIS_COMMAND 0
+#define NGX_THEMIS_REQUEST 1
+
 
 typedef void *(*ngx_themis_create_config_pt)(ngx_conf_t *cf);
 typedef ngx_int_t (*ngx_themis_update_config)(ngx_cycle_t *cycle, void *config);

diff --git a/core/ngx_themis_channel.c b/core/ngx_themis_channel.c
@@ -4,7 +4,7 @@ ngx_socket_t ngx_themis_socketpairs[NGX_MAX_PROCESSES][2];
 
 
 void
-ngx_themis_channel_read_handler(ngx_event_t *ev)
+ngx_themis_channel_handler(ngx_event_t *ev)
 {
 
 }
diff --git a/core/ngx_themis_channel.h b/core/ngx_themis_channel.h
@@ -1,6 +1,10 @@
 #ifndef _NGX_THEMIS_CHANNEL_H_INCLUDE_
 #define _NGX_THEMIS_CHANNEL_H_INCLUDE_
 
-void ngx_themis_channel_read_handler(ngx_event_t *ev);
+
+#define THEMIS_CHANNEL_TYPE_CONF 0
+
+
+void ngx_themis_channel_handler(ngx_event_t *ev);
 
 #endif
diff --git a/modules/access_mate/ngx_themis_access_mate_module.c b/modules/access_mate/ngx_themis_access_mate_module.c
@@ -14,6 +14,8 @@ static ngx_int_t ngx_themis_access_mate_apply_config(ngx_http_request_t *r,
     void *config);
 static char *ngx_themis_access_add(ngx_conf_t *cf, ngx_command_t *cmd,
      void *conf);
+static char *ngx_themis_access_status(ngx_conf_t *cf, ngx_command_t *cmd,
+     void *conf);
 
 
 typedef struct {
@@ -50,7 +52,14 @@ static ngx_command_t  ngx_themis_access_commands[] = {
     { ngx_string("add"),
       NGX_THEMIS_CONF|NGX_CONF_TAKE2,
       ngx_themis_access_add,
+      NGX_THEMIS_COMMAND,
       0,
+      NULL },
+
+    { ngx_string("status"),
+      NGX_THEMIS_CONF|NGX_CONF_TAKE2,
+      ngx_themis_access_status,
+      NGX_THEMIS_REQUEST,
       0,
       NULL },
 
@@ -99,6 +108,13 @@ ngx_themis_access_add(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+static char *
+ngx_themis_access_status(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    return NGX_CONF_OK;
+}
+
+
 
 static ngx_int_t
 ngx_themis_access_mate_update_config(ngx_cycle_t *cycle, void *config)
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ ngx_socket_t ngx_themis_socketpairs[NGX_MAX_PROCESSES][2]; @@
     void
-    ngx_themis_channel_read_handler(ngx_event_t *ev)
+    ngx_themis_channel_handler(ngx_event_t *ev)
     {
     }