Browse Source

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.


svn:r870
Roger Dingledine 20 years ago
parent
commit
af4192b172
2 changed files with 5 additions and 1 deletions
  1. 4 0
      src/or/connection_edge.c
  2. 1 1
      src/or/routers.c

+ 4 - 0
src/or/connection_edge.c

@@ -53,6 +53,10 @@ int connection_edge_process_inbuf(connection_t *conn) {
       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;

+ 1 - 1
src/or/routers.c

@@ -713,7 +713,7 @@ router_resolve_directory(directory_t *dir)
   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 &&