gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9226 - gnunet/src/util


From: gnunet
Subject: [GNUnet-SVN] r9226 - gnunet/src/util
Date: Tue, 20 Oct 2009 12:54:09 -0600

Author: grothoff
Date: 2009-10-20 12:54:08 -0600 (Tue, 20 Oct 2009)
New Revision: 9226

Modified:
   gnunet/src/util/connection.c
Log:
cleaner

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2009-10-20 18:41:00 UTC (rev 9225)
+++ gnunet/src/util/connection.c        2009-10-20 18:54:08 UTC (rev 9226)
@@ -1344,6 +1344,13 @@
       return;
     }
   GNUNET_assert (NULL != sock->sock);
+  if (tc->write_ready == NULL)
+    {
+      /* special circumstances (in particular,
+        PREREQ_DONE after connect): not yet ready to write,
+        but no "fatal" error either.  Hence retry.  */
+      goto SCHEDULE_WRITE;
+    }
   if (! GNUNET_NETWORK_fdset_isset (tc->write_ready, 
                                    sock->sock))
     {
@@ -1361,13 +1368,6 @@
       transmit_error (sock);
       return;                   /* connect failed for good, we're finished */
     }
- if ((tc->write_ready == NULL) || (!GNUNET_NETWORK_fdset_isset 
(tc->write_ready, sock->sock)))
-    {
-      /* special circumstances (in particular,
-        PREREQ_DONE after connect): not yet ready to write,
-        but no "fatal" error either.  Hence retry.  */
-      goto SCHEDULE_WRITE;
-    }
   GNUNET_assert (sock->write_buffer_off >= sock->write_buffer_pos);
   process_notify (sock);
   have = sock->write_buffer_off - sock->write_buffer_pos;





reply via email to

[Prev in Thread] Current Thread [Next in Thread]