[or-cvs] Jan 05 19:39:27.356 [warn] connection_edge_process_end_not_...

[arma@xxxxxxxx]

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

Modified Files:
	relay.c 
Log Message:
Jan 05 19:39:27.356 [warn] connection_edge_process_end_not_open():
Got an end because of misc error, but we're not an AP. Closing.


Index: relay.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -d -r1.97 -r1.98
--- relay.c	5 Jan 2006 21:23:03 -0000	1.97
+++ relay.c	7 Jan 2006 01:02:21 -0000	1.98
@@ -654,13 +654,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) {
-      warn(LD_PROTOCOL,
-           "Got an end because of %s, but we're not an AP. Closing.",
-           connection_edge_end_reason_str(reason));
-      return - END_CIRC_REASON_TORPROTOCOL;
-    }
+  if (rh->length > 0 && edge_reason_is_retriable(reason) &&
+      conn->type == CONN_TYPE_AP) {
     info(LD_APP,"Address '%s' refused due to '%s'. Considering retrying.",
          safe_str(conn->socks_request->address),
          connection_edge_end_reason_str(reason));