[or-cvs] Stop being printist: just because our local platform doesn"t

arma at seul.org arma at seul.org
Wed Mar 15 19:17:36 UTC 2006


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	buffers.c connection_edge.c 
Log Message:
Stop being printist: just because our local platform doesn't
consider an alleged destination to be printable doesn't mean
nobody in the world will want to use it.


Index: buffers.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/buffers.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -d -r1.187 -r1.188
--- buffers.c	12 Mar 2006 23:31:16 -0000	1.187
+++ buffers.c	15 Mar 2006 19:17:34 -0000	1.188
@@ -1003,13 +1003,6 @@ fetch_from_buf_socks(buf_t *buf, socks_r
           req->address[len] = 0;
           req->port = ntohs(get_uint16(buf->cur+5+len));
           buf_remove_from_front(buf, 5+len+2);
-          if (!tor_strisprint(req->address) || strchr(req->address,'\"')) {
-            log_warn(LD_PROTOCOL,
-                     "Your application (using socks5 on port %d) gave Tor "
-                     "a malformed hostname: %s. Rejecting the connection.",
-                     req->port, escaped(req->address));
-            return -1;
-          }
 
           if (log_sockstype)
             log_notice(LD_APP,
@@ -1105,13 +1098,6 @@ fetch_from_buf_socks(buf_t *buf, socks_r
       log_debug(LD_APP,"socks4: Everything is here. Success.");
       strlcpy(req->address, startaddr ? startaddr : tmpbuf,
               sizeof(req->address));
-      if (!tor_strisprint(req->address) || strchr(req->address,'\"')) {
-        log_warn(LD_PROTOCOL,
-                 "Your application (using socks4 on port %d) gave Tor "
-                 "a malformed hostname: %s. Rejecting the connection.",
-                 req->port, escaped(req->address));
-        return -1;
-      }
       /* next points to the final \0 on inbuf */
       buf_remove_from_front(buf, next-buf->cur+1);
       return 1;

Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -d -r1.384 -r1.385
--- connection_edge.c	14 Mar 2006 23:40:37 -0000	1.384
+++ connection_edge.c	15 Mar 2006 19:17:34 -0000	1.385
@@ -1533,12 +1533,6 @@ connection_exit_begin_conn(cell_t *cell,
     tor_free(address);
     return 0;
   }
-  if (!tor_strisprint(address)) {
-    log_warn(LD_PROTOCOL,"Non-printing characters in address %s in relay "
-             "begin cell. Dropping.", escaped(address));
-    tor_free(address);
-    return 0;
-  }
 
   log_debug(LD_EXIT,"Creating new exit connection.");
   n_stream = connection_new(CONN_TYPE_EXIT);



More information about the tor-commits mailing list