X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=8acfc1e2b6b31bf67324b1d86ec02084d6352606;hb=5fa30e9c838ec797b5ac1886ef0e2337b0134836;hp=c9aa66a74784a89d005d15bcd314fb4e417f4448;hpb=ee8ba350d2365a7c464c4de364a7c2bdf6ddcd16;p=privoxy.git

diff --git a/cgisimple.c b/cgisimple.c
index c9aa66a7..8acfc1e2 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.136 2016/03/17 10:40:53 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.141 2016/05/08 10:46:29 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -310,7 +310,7 @@ static void cgi_create_client_tag_form(char *form, size_t size,
    }
 
    snprintf(form, size,
-      "<form method=\"GET\" action=\"show-client-tags\" style=\"display: inline\">\n"
+      "<form method=\"GET\" action=\"client-tags\" style=\"display: inline\">\n"
       " <input type=\"hidden\" name=\"tag\" value=\"%s\">\n"
       " <input type=\"hidden\" name=\"toggle-state\" value=\"%u\">\n"
       " <input type=\"hidden\" name=\"expires\" value=\"%u\">\n"
@@ -347,18 +347,18 @@ jb_err cgi_show_client_tags(struct client_state *csp,
    const char *toggle_state;
    const char *tag_expires;
    time_t time_to_live;
-   char *client_tags = strdup_or_die("");
+   char *client_tag_status;
    char buf[1000];
 
    assert(csp);
    assert(rsp);
    assert(parameters);
 
-   if (NULL == (exports = default_exports(csp, "show-client-tags")))
+   if (NULL == (exports = default_exports(csp, "client-tags")))
    {
       return JB_ERR_MEMORY;
    }
-
+   assert(csp->client_address != NULL);
    toggled_tag = lookup(parameters, "tag");
    if (*toggled_tag != '\0')
    {
@@ -381,42 +381,38 @@ jb_err cgi_show_client_tags(struct client_state *csp,
          disable_client_specific_tag(csp, toggled_tag);
       }
    }
-
    this_tag = csp->config->client_tags;
    if (this_tag->name == NULL)
    {
-      if (!err) err = string_append(&client_tags, "<p>No tags available.</p>\n");
+      client_tag_status = strdup_or_die("<p>No tags available.</p>\n");
    }
    else
    {
-      if (!err)
-      {
-         err = string_append(&client_tags, "<table border=\"1\">\n"
-            "<tr><th>Tag name</th>\n"
-            "<th>Current state</th><th>Change state</th><th>Description</th></tr>\n");
-      }
+      client_tag_status = strdup_or_die("<table border=\"1\">\n"
+         "<tr><th>Tag name</th>\n"
+         "<th>Current state</th><th>Change state</th><th>Description</th></tr>\n");
       while ((this_tag != NULL) && (this_tag->name != NULL))
       {
          int tag_state;
 
          privoxy_mutex_lock(&client_tags_mutex);
-         tag_state = client_has_requested_tag(csp->ip_addr_str, this_tag->name);
+         tag_state = client_has_requested_tag(csp->client_address, this_tag->name);
          privoxy_mutex_unlock(&client_tags_mutex);
-         if (!err) err = string_append(&client_tags, "<tr><td>");
-         if (!err) err = string_append(&client_tags, this_tag->name);
-         if (!err) err = string_append(&client_tags, "</td><td>");
-         if (!err) err = string_append(&client_tags, tag_state == 1 ? "Enabled" : "Disabled");
-         if (!err) err = string_append(&client_tags, "</td><td>");
+         if (!err) err = string_append(&client_tag_status, "<tr><td>");
+         if (!err) err = string_append(&client_tag_status, this_tag->name);
+         if (!err) err = string_append(&client_tag_status, "</td><td>");
+         if (!err) err = string_append(&client_tag_status, tag_state == 1 ? "Enabled" : "Disabled");
+         if (!err) err = string_append(&client_tag_status, "</td><td>");
          cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 1);
-         if (!err) err = string_append(&client_tags, buf);
+         if (!err) err = string_append(&client_tag_status, buf);
          if (tag_state == 0)
          {
             cgi_create_client_tag_form(buf, sizeof(buf), this_tag->name, !tag_state, 0);
-            if (!err) err = string_append(&client_tags, buf);
+            if (!err) err = string_append(&client_tag_status, buf);
          }
-         if (!err) err = string_append(&client_tags, "</td><td>");
-         if (!err) err = string_append(&client_tags, this_tag->description);
-         if (!err) err = string_append(&client_tags, "</td></tr>\n");
+         if (!err) err = string_append(&client_tag_status, "</td><td>");
+         if (!err) err = string_append(&client_tag_status, this_tag->description);
+         if (!err) err = string_append(&client_tag_status, "</td></tr>\n");
          if (err)
          {
             free_map(exports);
@@ -424,22 +420,22 @@ jb_err cgi_show_client_tags(struct client_state *csp,
          }
          this_tag = this_tag->next;
       }
-      if (!err) err = string_append(&client_tags, "</table>\n");
+      if (!err) err = string_append(&client_tag_status, "</table>\n");
    }
 
-   if (map(exports, "client-tags", 1, client_tags, 0))
+   if (map(exports, "client-tags", 1, client_tag_status, 0))
    {
       free_map(exports);
       return JB_ERR_MEMORY;
    }
 
-   if (map(exports, "client-ip-addr", 1, csp->ip_addr_str, 1))
+   if (map(exports, "client-ip-addr", 1, csp->client_address, 1))
    {
       free_map(exports);
       return JB_ERR_MEMORY;
    }
 
-   return template_fill_for_cgi(csp, "show-client-tags", exports, rsp);
+   return template_fill_for_cgi(csp, "client-tags", exports, rsp);
 }
 #endif /* def FEATURE_CLIENT_TAGS */
 
@@ -1715,6 +1711,14 @@ static jb_err show_defines(struct map *exports)
    };
 
    static const struct feature features[] = {
+      {
+         "FEATURE_64_BIT_TIME_T",
+#if (SIZEOF_TIME_T == 8)
+         1,
+#else
+         0,
+#endif
+      },
       {
          "FEATURE_ACCEPT_FILTER",
 #ifdef FEATURE_ACCEPT_FILTER