[or-cvs] backport the "Got an end because of %s, but we"re not an AP...

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-010x/tor/src/or

Modified Files:
      Tag: tor-0_1_0-patches
	relay.c 
Log Message:
backport the "Got an end because of %s, but we're not an AP" bugfix.


Index: relay.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -u -p -d -r1.69.2.1 -r1.69.2.2
--- relay.c	2 Jan 2006 13:32:46 -0000	1.69.2.1
+++ relay.c	7 Jan 2006 01:03:46 -0000	1.69.2.2
@@ -601,12 +601,8 @@ connection_edge_process_end_not_open(
   routerinfo_t *exitrouter;
   int reason = *(cell->payload+RELAY_HEADER_SIZE);
 
-  if (rh->length > 0 && edge_reason_is_retriable(reason)) {
-    if (conn->type != CONN_TYPE_AP) {
-      log_fn(LOG_WARN,"Got an end because of %s, but we're not an AP. Closing.",
-             connection_edge_end_reason_str(reason));
-      return -1;
-    }
+  if (rh->length > 0 && edge_reason_is_retriable(reason) &&
+      conn->type == CONN_TYPE_AP) {
     log_fn(LOG_INFO,"Address '%s' refused due to '%s'. Considering retrying.",
            safe_str(conn->socks_request->address),
            connection_edge_end_reason_str(reason));