[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] backport: stop a sigpipe



Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/0091/tor/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	connection_edge.c onion.c 
Log Message:
backport: stop a sigpipe


Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.264.2.2
retrieving revision 1.264.2.3
diff -u -d -r1.264.2.2 -r1.264.2.3
--- connection_edge.c	28 Jan 2005 06:07:54 -0000	1.264.2.2
+++ connection_edge.c	3 Feb 2005 23:41:18 -0000	1.264.2.3
@@ -45,8 +45,8 @@
      * get the 'end' right around when the client hangs up on us. */
     connection_edge_end(conn, END_STREAM_REASON_DONE, conn->cpath_layer);
     connection_mark_for_close(conn);
-    conn->hold_open_until_flushed = 1; /* just because we shouldn't read
-                                          doesn't mean we shouldn't write */
+//    conn->hold_open_until_flushed = 1; /* just because we shouldn't read
+//                                          doesn't mean we shouldn't write */
   }
   return 0;
 #endif

Index: onion.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/onion.c,v
retrieving revision 1.173
retrieving revision 1.173.2.1
diff -u -d -r1.173 -r1.173.2.1
--- onion.c	13 Dec 2004 00:44:39 -0000	1.173
+++ onion.c	3 Feb 2005 23:41:18 -0000	1.173.2.1
@@ -212,7 +212,7 @@
       break;
   }
   if (len<0) {
-    log_fn(LOG_WARN, "Couldn't decrypt onionskin: client may be using old onion key");
+    log_fn(LOG_INFO, "Couldn't decrypt onionskin: client may be using old onion key");
     goto err;
   } else if (len != DH_KEY_LEN) {
     log_fn(LOG_WARN, "Unexpected onionskin length after decryption: %d",