[or-cvs] start tracking a rare bug: package_raw_inbuf gets called wi...

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	connection_edge.c routers.c 
Log Message:
start tracking a rare bug: package_raw_inbuf gets called with package_window 0

Nov 25 22:39:18.294 [warn] connection_edge_package_raw_inbuf(): called with package_window 0. T
ell Roger.


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- connection_edge.c	30 Nov 2003 09:57:00 -0000	1.67
+++ connection_edge.c	30 Nov 2003 10:10:29 -0000	1.68
@@ -53,6 +53,10 @@
       return 0;
     case AP_CONN_STATE_OPEN:
     case EXIT_CONN_STATE_OPEN:
+      if(conn->package_window <= 0) {
+        log_fn(LOG_WARN,"called with package_window %d. Tell Roger.", conn->package_window);
+        return 0;
+      }
       if(connection_edge_package_raw_inbuf(conn) < 0) {
         connection_edge_end(conn, END_STREAM_REASON_MISC, conn->cpath_layer);
         return -1;

Index: routers.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routers.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- routers.c	19 Nov 2003 21:24:04 -0000	1.96
+++ routers.c	30 Nov 2003 10:10:29 -0000	1.97
@@ -713,7 +713,7 @@
   for (i = 0; i < max; ++i) {
     remove = 0;
     if (router_resolve(dir->routers[i])) {
-      log_fn(LOG_WARN, "Couldn't resolve router %s; removing",
+      log_fn(LOG_WARN, "Couldn't resolve router %s; not using",
              dir->routers[i]->address);
       remove = 1;
     } else if (options.Nickname &&