If the hostname is 'localhost' or not specified, request an AF_INET address.

[privoxy.git] / urlmatch.c

diff --git a/urlmatch.c b/urlmatch.c
index fa11f20..b1e72b9 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,4 +1,4 @@
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.47 2009/03/02 19:18:10 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.49 2009/04/17 11:34:35 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
@@ -33,6 +33,12 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.47 2009/03/02 19:18:10 fabianke
  *
  * Revisions   :
  *    $Log: urlmatch.c,v $
+ *    Revision 1.49  2009/04/17 11:34:35  fabiankeil
+ *    Style cosmetics for the IPv6 code.
+ *
+ *    Revision 1.48  2009/04/17 11:27:49  fabiankeil
+ *    Petr Pisar's privoxy-3.0.12-ipv6-3.diff.
+ *
  *    Revision 1.47  2009/03/02 19:18:10  fabiankeil
  *    Streamline parse_http_request()'s prototype. As
  *    cparser pointed out it doesn't actually use csp.
@@ -554,8 +560,8 @@ jb_err parse_http_url(const char *url, struct http_request *http, int require_pr
             return JB_ERR_PARSE;
          }
 
-         *port++='\0';
-         
+         *port++ = '\0';
+
          if (*port == '\0')
          {
             port = NULL;
@@ -569,7 +575,7 @@ jb_err parse_http_url(const char *url, struct http_request *http, int require_pr
       }
       else
       {
-         /* Plain non-escaped hostname */ 
+         /* Plain non-escaped hostname */
          port = strchr(host, ':');
       }
 
@@ -876,18 +882,20 @@ static jb_err compile_url_pattern(struct url_spec *url, char *buf)
       *p = '\0';
    }
 
-   /* XXX: IPv6 numeric hostname contains colons, thus we need to delimit the
-    * hostname before real port separator. Because brackets are used in
-    * hostname matching on lower layer, we can't use it. I decided to use
-    * angle brackets '<' '>' instead. */
-   if (buf[0] == '<' && NULL != (p = strchr(buf + 1, '>')))
+   /*
+    * IPv6 numeric hostnames can contain colons, thus we need
+    * to delimit the hostname before the real port separator.
+    * As brackets are already used in the hostname pattern,
+    * we use angle brackets ('<', '>') instead.
+    */
+   if ((buf[0] == '<') && (NULL != (p = strchr(buf + 1, '>'))))
    {
       *p++ = '\0';
       buf++;
 
       if (*p == '\0')
       {
-         /* Only IPv6 address without port number */
+         /* IPv6 address without port number */
          p = NULL;
       }
       else if (*p != ':')
@@ -1501,10 +1509,61 @@ int match_portlist(const char *portlist, int port)
 }
 
 
+/*********************************************************************
+ *
+ * Function    :  parse_forwarder_address
+ *
+ * Description :  Parse out the host and port from a forwarder address.
+ *
+ * Parameters  :
+ *          1  :  address = The forwarder address to parse.
+ *          2  :  hostname = Used to return the hostname. NULL on error.
+ *          3  :  port = Used to return the port. Untouched if no port
+ *                       is specified.
+ *
+ * Returns     :  JB_ERR_OK on success
+ *                JB_ERR_MEMORY on out of memory
+ *                JB_ERR_PARSE on malformed address.
+ *
+ *********************************************************************/
+jb_err parse_forwarder_address(char *address, char **hostname, int *port)
+{
+   char *p = address;
+
+   if ((*address == '[') && (NULL == strchr(address, ']')))
+   {
+      /* XXX: Should do some more validity checks here. */
+      return JB_ERR_PARSE;
+   }
+
+   *hostname = strdup(address);
+   if (NULL == *hostname)
+   {
+      return JB_ERR_MEMORY;
+   }
+
+   if ((**hostname == '[') && (NULL != (p = strchr(*hostname, ']'))))
+   {
+      *p++ = '\0';
+      memmove(*hostname, (*hostname + 1), (size_t)(p - *hostname));
+      if (*p == ':')
+      {
+         *port = (int)strtol(++p, NULL, 0);
+      }
+   }
+   else if (NULL != (p = strchr(*hostname, ':')))
+   {
+      *p++ = '\0';
+      *port = (int)strtol(p, NULL, 0);
+   }
+
+   return JB_ERR_OK;
+
+}
+
+
 /*
   Local Variables:
   tab-width: 3
   end:
-
-  vim:softtabstop=3 shiftwidth=3
 */