[or-cvs] fix segfault (connecting to dirserver when network is down)
Roger Dingledine
arma at seul.org
Mon Oct 13 19:58:23 UTC 2003
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or
Modified Files:
connection_edge.c directory.c
Log Message:
fix segfault (connecting to dirserver when network is down)
Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- connection_edge.c 10 Oct 2003 01:48:32 -0000 1.38
+++ connection_edge.c 13 Oct 2003 19:58:21 -0000 1.39
@@ -577,7 +577,7 @@
return 0;
/* else fall through */
case -1: /* resolve failed */
- log_fn(LOG_WARN,"Couldn't queue resolve request.");
+ log_fn(LOG_WARN,"Resolve or connect failed (%s).", conn->address);
connection_remove(n_stream);
connection_free(n_stream);
case 0: /* resolve added to pending list */
Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- directory.c 10 Oct 2003 01:48:32 -0000 1.45
+++ directory.c 13 Oct 2003 19:58:21 -0000 1.46
@@ -63,6 +63,7 @@
switch(connection_connect(conn, router->address, router->addr, router->dir_port)) {
case -1:
router_mark_as_down(conn->nickname); /* don't try him again */
+ connection_remove(conn);
connection_free(conn);
return;
case 0:
More information about the tor-commits
mailing list