fix more leaks

[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 be05e027a5da4dae673bbd7339b491b13fe6f3f3..b3f108675ed62ccf7191ddc7e12b97a36ae29c6c 100644 (file)
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -704,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);
 }
 
@@ -727,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);
 }
 
@@ -960,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);
 }
 
@@ -978,8 +996,6 @@ GST_clients_start (struct GNUNET_SERVER_Handle *server)
      GNUNET_MESSAGE_TYPE_TRANSPORT_START, sizeof (struct StartMessage)},
     {&clients_handle_hello, NULL,
      GNUNET_MESSAGE_TYPE_HELLO, 0},
-         {&clients_handle_hello, NULL,
-                GNUNET_MESSAGE_TYPE_FRIEND_HELLO, 0},
     {&clients_handle_send, NULL,
      GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, 0},
     {&clients_handle_request_connect, NULL,