- fix error messages

[oweals/gnunet.git] / src / transport / gnunet-service-transport.c

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index f54d30e21cd35caa1edc9b9d65a00348a86c3cab..a5ce3fa4a86ff76fc333188fe1986dae314c49cb 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -137,18 +137,27 @@ static struct SessionKiller *sk_tail;
  * @param cls the 'HELLO' message
  * @param target a connected neighbour
  * @param address the address
+ * @param state current state this peer is in
+ * @param state_timeout timeout for the current state of the peer
  * @param bandwidth_in inbound quota in NBO
  * @param bandwidth_out outbound quota in NBO
  */
 static void
 transmit_our_hello (void *cls, const struct GNUNET_PeerIdentity *target,
                     const struct GNUNET_HELLO_Address *address,
+                    enum GNUNET_TRANSPORT_PeerState state,
+                    struct GNUNET_TIME_Absolute state_timeout,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
                     struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
 {
   const struct GNUNET_MessageHeader *hello = cls;
 
-  GST_neighbours_send (target, (const char *) hello, ntohs (hello->size),
+  if ( GNUNET_NO == GST_neighbours_test_connected(target) )
+    return;
+
+  GST_neighbours_send (target,
+                       hello,
+                       ntohs (hello->size),
                        hello_expiration, NULL, NULL);
 }
 
@@ -160,7 +169,8 @@ transmit_our_hello (void *cls, const struct GNUNET_PeerIdentity *target,
  * @param hello new HELLO
  */
 static void
-process_hello_update (void *cls, const struct GNUNET_MessageHeader *hello)
+process_hello_update (void *cls,
+                      const struct GNUNET_MessageHeader *hello)
 {
   GST_clients_broadcast (hello, GNUNET_NO);
   GST_neighbours_iterate (&transmit_our_hello, (void *) hello);
@@ -558,7 +568,11 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
   }
 
   if (GNUNET_YES == GNUNET_ATS_session_known (GST_ats, address, session))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "ATS already knows the address, not passing it on again\n");
     return;
+  }
 
   net = papi->get_network (NULL, session);
   if (GNUNET_ATS_NET_UNSPECIFIED == net)
@@ -740,6 +754,7 @@ plugin_env_session_start (void *cls,
  */
 static void
 ats_request_address_change (void *cls,
+                            const struct GNUNET_PeerIdentity *peer,
                             const struct GNUNET_HELLO_Address *address,
                             struct Session *session,
                             struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
@@ -751,7 +766,7 @@ ats_request_address_change (void *cls,
   uint32_t bw_out = ntohl (bandwidth_out.value__);
 
   /* ATS tells me to disconnect from peer */
-  if ((bw_in == 0) && (bw_out == 0))
+  if ((0 == bw_in) && (0 == bw_out))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "ATS tells me to disconnect from peer `%s'\n",
@@ -759,6 +774,7 @@ ats_request_address_change (void *cls,
     GST_neighbours_force_disconnect (&address->peer);
     return;
   }
+
   GST_neighbours_switch_to_address (&address->peer, address, session, ats,
                                     ats_count, bandwidth_in,
                                     bandwidth_out);
@@ -831,13 +847,28 @@ neighbours_disconnect_notification (void *cls,
  * @param cls closure
  * @param peer peer this update is about (never NULL)
  * @param address address, NULL on disconnect
+ * @param state current state this peer is in
+ * @param state_timeout timeout for the current state of the peer
+ * @param bandwidth_in bandwidth assigned inbound
+ * @param bandwidth_out bandwidth assigned outbound
  */
 static void
-neighbours_address_notification (void *cls,
+neighbours_changed_notification (void *cls,
                                  const struct GNUNET_PeerIdentity *peer,
-                                 const struct GNUNET_HELLO_Address *address)
+                                 const struct GNUNET_HELLO_Address *address,
+                                 enum GNUNET_TRANSPORT_PeerState state,
+                                 struct GNUNET_TIME_Absolute state_timeout,
+                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
 {
-  GST_clients_broadcast_address_notification (peer, address);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      "Notifying about change for peer `%s' with address `%s' in state `%s' timing out at %s\n",
+      GNUNET_i2s (peer),
+      (NULL != address) ? GST_plugins_a2s (address) : "<none>",
+      GNUNET_TRANSPORT_p2s(state),
+      GNUNET_STRINGS_absolute_time_to_string(state_timeout));
+
+  GST_clients_broadcast_peer_notification (peer, address, state, state_timeout);
 }
 
 
@@ -987,7 +1018,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   GST_neighbours_start (NULL,
                         &neighbours_connect_notification,
                         &neighbours_disconnect_notification,
-                        &neighbours_address_notification,
+                        &neighbours_changed_notification,
                         (max_fd / 3) * 2);
   GST_clients_start (GST_server);
   GST_validation_start ((max_fd / 3));