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

[gnunet]

Author: wachs
Date: 2014-03-31 11:35:55 +0200 (Mon, 31 Mar 2014)
New Revision: 32840

Modified:
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
fix duplicate connect notifications


Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2014-03-31 
09:03:01 UTC (rev 32839)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2014-03-31 
09:35:55 UTC (rev 32840)
@@ -3426,17 +3426,21 @@
   }
 
   /* We are connected */
-  set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED, 
GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+  if (GNUNET_NO == GST_neighbours_test_connected(&n->id))
+  {
+    /* Notify about connection */
+    connect_notify_cb (callback_cls, &n->id,
+                     n->primary_address.bandwidth_in,
+                     n->primary_address.bandwidth_out);
+  }
+
+  set_state_and_timeout (n, GNUNET_TRANSPORT_PS_CONNECTED,
+      GNUNET_TIME_relative_to_absolute 
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
   GNUNET_STATISTICS_set (GST_stats,
                         gettext_noop ("# peers connected"),
                         ++neighbours_connected,
                         GNUNET_NO);
 
-  /* Notify about connection */
-  connect_notify_cb (callback_cls, &n->id,
-                     n->primary_address.bandwidth_in,
-                     n->primary_address.bandwidth_out);
-
   /* Add session to ATS since no session was given (NULL) and we may have
    * obtained a new session */
   GST_ats_add_address (n->primary_address.address, n->primary_address.session,