[GNUnet-SVN] r21441 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2012-05-11 21:25:57 +0200 (Fri, 11 May 2012)
New Revision: 21441

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
-minor stylistic fixes

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-05-11 
13:55:10 UTC (rev 21440)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-05-11 
19:25:57 UTC (rev 21441)
@@ -56,7 +56,6 @@
  */
 #define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 30)
 
-
 #define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
 
 #define FAST_RECONNECT_RATE GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 100)
@@ -1652,8 +1651,8 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending CONNECT message to %s\n",
                GNUNET_i2s (&n->id));
-    if (n->state != S_CONNECT_RECV)
-      change_state (n, S_CONNECT_RECV);
+    if (n->state != S_CONNECT_SENT)
+      change_state (n, S_CONNECT_SENT);
     ret = send_with_session (n,
       (const char *) &connect_msg, msg_len,
       UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
@@ -1865,7 +1864,7 @@
     /* This can happen during shutdown */
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %X to peer `%s' ended \n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' ended \n",
               session, GNUNET_i2s (peer));
   n = lookup_neighbour (peer);
   if (NULL == n)
@@ -2503,8 +2502,8 @@
   }
 
   if ((NULL == n->address) ||
-       ((n->state != S_CONNECT_SENT) &&
-      ((n->state != S_CONNECT_RECV) && (n->address != NULL))))
+      ((n->state != S_CONNECT_SENT) &&
+       (n->state != S_CONNECT_RECV)))
   {
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop