From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 16 Dec 2007 18:32:46 +0000 (+0000)
Subject: Prevent the log messages for CONNECT requests to unacceptable
X-Git-Tag: v_3_0_8~39
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=afca4c2f31f5acfe16849d6515bc8f6cfc8497a6

Prevent the log messages for CONNECT requests to unacceptable
ports from printing the limit-connect argument as [null] if
limit-connect hasn't been explicitly enabled.
---

diff --git a/jcc.c b/jcc.c
index 4be2e4f4..03ee6f2f 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.162 2007/12/06 17:54:57 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.163 2007/12/13 01:47:11 david__schmidt Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.162 2007/12/06 17:54:57 fabiankeil Exp $"
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.163  2007/12/13 01:47:11  david__schmidt
+ *    Make sure all console-mode apps get a usage() instance
+ *
  *    Revision 1.162  2007/12/06 17:54:57  fabiankeil
  *    Reword NO_SERVER_DATA_RESPONSE to make it harder
  *    to misunderstand what the message is all about.
@@ -2181,6 +2184,10 @@ static void chat(struct client_state *csp)
            || (csp->action->flags & ACTION_LIMIT_CONNECT
               && !match_portlist(csp->action->string[ACTION_STRING_LIMIT_CONNECT], csp->http->port)) )
       {
+         const char *acceptable_connect_ports =
+            csp->action->string[ACTION_STRING_LIMIT_CONNECT] ?
+            csp->action->string[ACTION_STRING_LIMIT_CONNECT] :
+            "443 (implied default)";
          if (csp->action->flags & ACTION_TREAT_FORBIDDEN_CONNECTS_LIKE_BLOCKS)
          {
             /*
@@ -2192,8 +2199,7 @@ static void chat(struct client_state *csp)
              */
             log_error(LOG_LEVEL_INFO, "Request from %s marked for blocking. "
                "limit-connect{%s} doesn't allow CONNECT requests to port %d.",
-               csp->ip_addr_str, csp->action->string[ACTION_STRING_LIMIT_CONNECT],
-               csp->http->port);
+               csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
             csp->action->flags |= ACTION_BLOCK;
             http->ssl = 0;
          }
@@ -2202,8 +2208,7 @@ static void chat(struct client_state *csp)
             write_socket(csp->cfd, CFORBIDDEN, strlen(CFORBIDDEN));
             log_error(LOG_LEVEL_INFO, "Request from %s denied. "
                "limit-connect{%s} doesn't allow CONNECT requests to port %d.",
-               csp->ip_addr_str, csp->action->string[ACTION_STRING_LIMIT_CONNECT],
-               csp->http->port);
+               csp->ip_addr_str, acceptable_connect_ports, csp->http->port);
             assert(NULL != csp->http->ocmd);
             log_error(LOG_LEVEL_CLF, "%s - - [%T] \"%s\" 403 0", csp->ip_addr_str, csp->http->ocmd);