towards fixing blacklisting APIs and implementation

5 files changed, 10 insertions, 57 deletions

diff --git a/src/core/core.h b/src/core/core.h
index 45d138140..f91995734 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -43,13 +43,12 @@
  * transmitted to the client.
  */
 #define GNUNET_CORE_OPTION_NOTHING             0
-#define GNUNET_CORE_OPTION_SEND_PRE_CONNECT    1
-#define GNUNET_CORE_OPTION_SEND_CONNECT        2
-#define GNUNET_CORE_OPTION_SEND_DISCONNECT     4
-#define GNUNET_CORE_OPTION_SEND_FULL_INBOUND   8
-#define GNUNET_CORE_OPTION_SEND_HDR_INBOUND   16
-#define GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND 32
-#define GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND  64
+#define GNUNET_CORE_OPTION_SEND_CONNECT        1
+#define GNUNET_CORE_OPTION_SEND_DISCONNECT     2
+#define GNUNET_CORE_OPTION_SEND_FULL_INBOUND   4
+#define GNUNET_CORE_OPTION_SEND_HDR_INBOUND    8
+#define GNUNET_CORE_OPTION_SEND_FULL_OUTBOUND 16
+#define GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND  32
 
 
 /**
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 4672c7843..42e8f1c06 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -56,12 +56,6 @@ struct GNUNET_CORE_Handle
   GNUNET_CORE_StartupCallback init;
 
   /**
-   * Function to call whenever we're notified about a peer connecting
-   * (pre-connects, no session key exchange yet).
-   */
-  GNUNET_CORE_ConnectEventHandler pre_connects;
-
-  /**
    * Function to call whenever we're notified about a peer connecting.
    */
   GNUNET_CORE_ConnectEventHandler connects;
@@ -406,23 +400,6 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg)
 #endif
   switch (ntohs (msg->type))
     {
-    case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_PRE_CONNECT:
-      if (NULL == h->pre_connects)
-        {
-          GNUNET_break (0);
-          break;
-        }
-      if (msize != sizeof (struct ConnectNotifyMessage))
-        {
-          GNUNET_break (0);
-          break;
-        }
-      cnm = (const struct ConnectNotifyMessage *) msg;
-      h->pre_connects (h->cls,
-                       &cnm->peer,
-                       GNUNET_TIME_relative_ntoh (cnm->latency),
-                       ntohl (cnm->distance));
-      break;
     case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT:
       if (NULL == h->connects)
         {
@@ -662,8 +639,6 @@ transmit_start (void *cls, size_t size, void *buf)
   init->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT);
   init->header.size = htons (msize);
   opt = GNUNET_CORE_OPTION_NOTHING;
-  if (h->pre_connects != NULL)
-    opt |= GNUNET_CORE_OPTION_SEND_PRE_CONNECT;
   if (h->connects != NULL)
     opt |= GNUNET_CORE_OPTION_SEND_CONNECT;
   if (h->disconnects != NULL)
@@ -705,7 +680,6 @@ transmit_start (void *cls, size_t size, void *buf)
  * @param cls closure for the various callbacks that follow (including handlers in the handlers array)
  * @param init callback to call on timeout or once we have successfully
  *        connected to the core service; note that timeout is only meaningful if init is not NULL
- * @param pre_connects function to call on peer pre-connect (no session key yet), can be NULL
  * @param connects function to call on peer connect, can be NULL
  * @param disconnects function to call on peer disconnect / timeout, can be NULL
  * @param inbound_notify function to call for all inbound messages, can be NULL
@@ -726,7 +700,6 @@ GNUNET_CORE_connect (struct GNUNET_SCHEDULER_Handle *sched,
                      struct GNUNET_TIME_Relative timeout,
                      void *cls,
                      GNUNET_CORE_StartupCallback init,
-                     GNUNET_CORE_ConnectEventHandler pre_connects,
                      GNUNET_CORE_ConnectEventHandler connects,
                      GNUNET_CORE_DisconnectEventHandler disconnects,
                      GNUNET_CORE_MessageCallback inbound_notify,
@@ -742,7 +715,6 @@ GNUNET_CORE_connect (struct GNUNET_SCHEDULER_Handle *sched,
   h->cfg = cfg;
   h->cls = cls;
   h->init = init;
-  h->pre_connects = pre_connects;
   h->connects = connects;
   h->disconnects = disconnects;
   h->inbound_notify = inbound_notify;
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 044b7496e..bad6f05d3 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -3450,13 +3450,6 @@ handle_transport_receive (void *cls,
           (n->status != PEER_STATE_KEY_CONFIRMED))
         {
           GNUNET_break_op (0);
-          /* blacklist briefly (?); might help recover (?) */
-          GNUNET_TRANSPORT_blacklist (sched, cfg,
-                                      &n->peer, 
-                                      GNUNET_TIME_UNIT_SECONDS,
-                                      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                                                     5),
-                                      NULL, NULL);
           return;
         }
       handle_encrypted_message (n, (const struct EncryptedMessage *) message);
@@ -3626,7 +3619,6 @@ handle_transport_notify_connect (void *cls,
                                  unsigned int distance)
 {
   struct Neighbour *n;
-  struct ConnectNotifyMessage cnm;
 
   if (0 == memcmp (peer, &my_identity, sizeof (struct GNUNET_PeerIdentity)))
     {
@@ -3665,12 +3657,6 @@ handle_transport_notify_connect (void *cls,
               "Received connection from `%4s'.\n",
               GNUNET_i2s (&n->peer));
 #endif
-  cnm.header.size = htons (sizeof (struct ConnectNotifyMessage));
-  cnm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_PRE_CONNECT);
-  cnm.distance = htonl (n->last_distance);
-  cnm.latency = GNUNET_TIME_relative_hton (n->last_latency);
-  cnm.peer = *peer;
-  send_to_all_clients (&cnm.header, GNUNET_YES, GNUNET_CORE_OPTION_SEND_PRE_CONNECT);
   GNUNET_TRANSPORT_set_quota (transport,
                               &n->peer,
                               n->bw_in,
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 78d6b7fe1..6b8387461 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -229,8 +229,7 @@ init_notify (void *cls,
                            p2.cfg,
                            TIMEOUT,
                            &p2,
-                           &init_notify,
-                           NULL,
+                           &init_notify,                         
                            &connect_notify,
                            &disconnect_notify,
                            &inbound_notify,
@@ -325,8 +324,7 @@ run (void *cls,
                        TIMEOUT,
                        &p1,
                        &init_notify,
-                       NULL,
-                       &connect_notify,
+                       &connect_notify,
                        &disconnect_notify,
                        &inbound_notify,
                        GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index e8bfdd4e5..86eff056c 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -130,8 +130,7 @@ init_notify (void *cls,
                            p2.cfg,
                            TIMEOUT,
                            &p2,
-                           &init_notify,
-                           NULL,
+                           &init_notify,                         
                            &connect_notify,
                            &disconnect_notify,
                            &inbound_notify,
@@ -185,8 +184,7 @@ run (void *cls,
                        TIMEOUT,
                        &p1,
                        &init_notify,
-                       NULL,
-                       &connect_notify,
+                       &connect_notify,
                        &disconnect_notify,
                        &inbound_notify,
                        GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);