Browse Source

remove duplicate packagewindow-checking code,
see if we can induce that segfault i just saw more often


svn:r407

Roger Dingledine 21 years ago
parent
commit
33b0569fba
1 changed files with 8 additions and 7 deletions
  1. 8 7
      src/or/connection.c

+ 8 - 7
src/or/connection.c

@@ -620,13 +620,14 @@ repeat_connection_package_raw_inbuf:
   }
 
   assert(conn->package_window > 0);
-  if(--conn->package_window <= 0) { /* is it 0 after decrement? */
-    connection_stop_reading(conn);
-    log_fn(LOG_DEBUG,"conn->package_window reached 0.");
-    circuit_consider_stop_edge_reading(circ, conn->type, conn->cpath_layer);
-    return 0; /* don't process the inbuf any more */
-  }
-  log_fn(LOG_DEBUG,"conn->package_window is %d",conn->package_window);
+  conn->package_window--;
+//  if(--conn->package_window <= 0) { /* is it 0 after decrement? */
+//    connection_stop_reading(conn);
+//    log_fn(LOG_DEBUG,"conn->package_window reached 0.");
+//    circuit_consider_stop_edge_reading(circ, conn->type, conn->cpath_layer);
+//    return 0; /* don't process the inbuf any more */
+//  }
+  log_fn(LOG_DEBUG,"conn->package_window is now %d",conn->package_window);
 
   /* handle more if there's more, or return 0 if there isn't */
   goto repeat_connection_package_raw_inbuf;