Ticket #31: remote-comms.diff

src/RemoteSerializer.cc

@@ -2689 +2689 @@
                                 max_fd = listen_fd_ssl;
                         }
 
-                if ( io->IsFillingUp() && ! shutting_conns_down )
+                if ( ! shutting_conns_down && io->IsFillingUp() )
                         {
                         Error("queue to parent filling up; shutting down heaviest connection");
 
@@ -2716 +2716 @@
                         shutting_conns_down = true;
                         }
 
-                if ( ! io->IsFillingUp() && shutting_conns_down )
+                if ( shutting_conns_down && ! io->IsFillingUp() )
                         shutting_conns_down = false;
 
                 // We cannot rely solely on select() as the there may
@@ -2727 +2727 @@
                 // FIXME: Fine-tune this (timeouts, flush, etc.)
                 struct timeval small_timeout;
                 small_timeout.tv_sec = 0;
-                small_timeout.tv_usec = io->CanWrite() ? 1 : 10;
+                small_timeout.tv_usec = io->CanWrite() ? 1000 : 10000;
 
                 if ( select(max_fd + 1, &fd_read, &fd_write, &fd_except,
                                 &small_timeout) < 0 )

src/Net.cc

@@ -563 +563 @@
                         // us a lot of idle time, but doesn't delay near-term
                         // timers too much.  (Delaying them somewhat is okay,
                         // since Bro timers are not high-precision anyway.)
-                        if ( ! using_communication )
-                                usleep(100000);
+                        usleep(100000);
 
                         // Flawfinder says about usleep:
                         //