Changeset 430

Timestamp:

07/08/2005 10:28:46 PM (3 years ago)

Author:

jan

Message:

added namespace support for memcached

Files:

• branches/lighttpd-1.3.x/src/mod_trigger_b4_dl.c (modified) (12 diffs)

branches/lighttpd-1.3.x/src/mod_trigger_b4_dl.c

@@ -42 +42 @@
         
         array  *mc_hosts;
+        buffer *mc_namespace;
 #if defined(HAVE_PCRE_H)
         pcre *trigger_regex;
@@ -59 +60 @@
 typedef struct {
         PLUGIN_DATA;
+        
+        buffer *tmp_buf;
         
         plugin_config **config_storage;
@@ -70 +73 @@
         
         p = calloc(1, sizeof(*p));
+        
+        p->tmp_buf = buffer_init();
         
         return p;
@@ -92 +97 @@
                         buffer_free(s->deny_url);
                         
+                        buffer_free(s->mc_namespace);
+                        array_free(s->mc_hosts);
+                        
 #if defined(HAVE_PCRE_H)
                         if (s->trigger_regex) pcre_free(s->trigger_regex);
@@ -111 +119 @@
                 free(p->config_storage);
         }
+        
+        buffer_free(p->tmp_buf);
         
         free(p);
@@ -131 +141 @@
                 { "trigger-before-download.trigger-timeout", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },        /* 4 */
                 { "trigger-before-download.memcache-hosts",  NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION },        /* 5 */
+                { "trigger-before-download.memcache-namespace", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },    /* 6 */
                 { NULL,                        NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
@@ -159 +170 @@
                 cv[4].destination = &(s->trigger_timeout);
                 cv[5].destination = s->mc_hosts;
+                cv[6].destination = s->mc_namespace;
                 
                 p->config_storage[i] = s;
@@ -268 +280 @@
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("trigger-before-download.deny-url"))) {
                                 PATCH(deny_url);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("trigger-before-download.memcache-namespace"))) {
+                                PATCH(mc_namespace);
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("trigger-before-download.memcache-hosts"))) {
 #if defined(HAVE_MEMCACHE_H)
@@ -356 +370 @@
                 } else if (p->conf.mc) {
 # if defined(HAVE_MEMCACHE_H)
+                        buffer_copy_string_buffer(p->tmp_buf, p->conf.mc_namespace);
+                        buffer_append_string(p->tmp_buf, remote_ip);
+                        
                         if (0 != mc_set(p->conf.mc, 
-                                        (char *)remote_ip, strlen(remote_ip),
+                                        CONST_BUF_LEN(p->tmp_buf),
                                         (char *)&(srv->cur_ts), sizeof(srv->cur_ts),
                                         p->conf.trigger_timeout, 0)) {
@@ -436 +453 @@
                         void *r;
                         
+                        buffer_copy_string_buffer(p->tmp_buf, p->conf.mc_namespace);
+                        buffer_append_string(p->tmp_buf, remote_ip);
+                        
                         /**
                          * 
@@ -443 +463 @@
                          */
                         if (NULL == (r = mc_aget(p->conf.mc, 
-                                                 (char *)remote_ip, strlen(remote_ip)))) {
+                                                 CONST_BUF_LEN(p->tmp_buf)
+                                                 ))) {
                                 
                                 response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->conf.deny_url));
@@ -456 +477 @@
                         /* set a new timeout */
                         if (0 != mc_set(p->conf.mc, 
-                                        (char *)remote_ip, strlen(remote_ip),
+                                        CONST_BUF_LEN(p->tmp_buf),
                                         (char *)&(srv->cur_ts), sizeof(srv->cur_ts),
                                         p->conf.trigger_timeout, 0)) {