Add missing include

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

diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c
index bdfcd1e89d559d05405bee437f7d136dba79271e..b3f108675ed62ccf7191ddc7e12b97a36ae29c6c 100644 (file)
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -30,6 +30,7 @@
 #include "gnunet-service-transport_neighbours.h"
 #include "gnunet-service-transport_plugins.h"
 #include "gnunet-service-transport_validation.h"
+#include "gnunet-service-transport_manipulation.h"
 #include "gnunet-service-transport.h"
 #include "transport.h"
 
@@ -464,8 +465,6 @@ client_disconnect_notification (void *cls, struct GNUNET_SERVER_Client *client)
  *
  * @param cls the 'struct TransportClient' to notify
  * @param peer identity of the neighbour
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
  * @param address the address
  * @param bandwidth_in inbound bandwidth in NBO
  * @param bandwidth_out outbound bandwidth in NBO
@@ -473,30 +472,22 @@ client_disconnect_notification (void *cls, struct GNUNET_SERVER_Client *client)
 static void
 notify_client_about_neighbour (void *cls,
                                const struct GNUNET_PeerIdentity *peer,
-                               const struct GNUNET_ATS_Information *ats,
-                               uint32_t ats_count,
                                const struct GNUNET_HELLO_Address *address,
                                struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
                                struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
 {
   struct TransportClient *tc = cls;
   struct ConnectInfoMessage *cim;
-  struct GNUNET_ATS_Information *ap;
-  size_t size =
-      sizeof (struct ConnectInfoMessage) +
-      ats_count * sizeof (struct GNUNET_ATS_Information);
+  size_t size = sizeof (struct ConnectInfoMessage);
   char buf[size] GNUNET_ALIGN;
 
   GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
   cim = (struct ConnectInfoMessage *) buf;
   cim->header.size = htons (size);
   cim->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
-  cim->ats_count = htonl (ats_count);
   cim->id = *peer;
   cim->quota_in = bandwidth_in;
   cim->quota_out = bandwidth_out;
-  ap = (struct GNUNET_ATS_Information *) &cim[1];
-  memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
   unicast (tc, &cim->header, GNUNET_NO);
 }
 
@@ -693,7 +684,7 @@ clients_handle_send (void *cls, struct GNUNET_SERVER_Client *client,
   stcc->target = obm->peer;
   stcc->client = client;
   GNUNET_SERVER_client_keep (client);
-  GST_neighbours_send (&obm->peer, obmm, msize,
+  GST_manipulation_send (&obm->peer, obmm, msize,
                        GNUNET_TIME_relative_ntoh (obm->timeout),
                        &handle_send_transmit_continuation, stcc);
 }
@@ -713,7 +704,12 @@ try_connect_if_allowed (void *cls, const struct GNUNET_PeerIdentity *peer,
                         int result)
 {
   if (GNUNET_OK != result)
+  {
+         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                     "Blacklist refuses connection attempt to peer `%s'\n",
+                     GNUNET_i2s (peer));
     return;                     /* not allowed */
+  }
   GST_neighbours_try_connect (peer);
 }
 
@@ -736,11 +732,24 @@ clients_handle_request_connect (void *cls, struct GNUNET_SERVER_Client *client,
                             gettext_noop
                             ("# REQUEST CONNECT messages received"), 1,
                             GNUNET_NO);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received a request connect message for peer `%s'\n",
-              GNUNET_i2s (&trcm->peer));
-  (void) GST_blacklist_test_allowed (&trcm->peer, NULL, &try_connect_if_allowed,
+
+  if (0 == memcmp (&trcm->peer, &GST_my_identity,
+               sizeof (struct GNUNET_PeerIdentity)))
+  {
+       GNUNET_break_op (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Received a request connect message myself `%s'\n",
+                GNUNET_i2s (&trcm->peer));
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Received a request connect message for peer `%s'\n",
+                GNUNET_i2s (&trcm->peer));
+
+    (void) GST_blacklist_test_allowed (&trcm->peer, NULL, &try_connect_if_allowed,
                                      NULL);
+  }
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -889,15 +898,12 @@ compose_address_iterate_response_message (const struct GNUNET_PeerIdentity
  *
  * @param cls the 'struct GNUNET_SERVER_TransmitContext' for transmission to the client
  * @param peer identity of the neighbour
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
  * @param address the address
  * @param bandwidth_in inbound quota in NBO
  * @param bandwidth_out outbound quota in NBO
  */
 static void
 output_address (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_ATS_Information *ats, uint32_t ats_count,
                 const struct GNUNET_HELLO_Address *address,
                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
@@ -964,7 +970,7 @@ clients_handle_address_iterate (void *cls, struct GNUNET_SERVER_Client *client,
     /* just return one neighbour */
     address = GST_neighbour_get_current_address (&msg->peer);
     if (address != NULL)
-      output_address (tc, &msg->peer, NULL, 0, address,
+      output_address (tc, &msg->peer, address,
                       GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
                       GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT);
   }
@@ -972,7 +978,7 @@ clients_handle_address_iterate (void *cls, struct GNUNET_SERVER_Client *client,
     setup_monitoring_client (client, &msg->peer);
   else
     GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
-                                               GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE);  
+                                               GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE);
   GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
@@ -1006,6 +1012,8 @@ GST_clients_start (struct GNUNET_SERVER_Handle *server)
     {&GST_blacklist_handle_reply, NULL,
      GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY,
      sizeof (struct BlacklistMessage)},
+    {&GST_manipulation_set_metric, NULL,
+     GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC, 0},
     {NULL, NULL, 0, 0}
   };
   nc = GNUNET_SERVER_notification_context_create (server, 0);