error msg

[oweals/gnunet.git] / src / transport / transport_api_blacklist.c

diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c
index 1025edef46af5b3edc2ca9d17639c158cab9f346..04646204f0db0a6b63dc5f18be6df668e8be72e2 100644 (file)
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -42,12 +42,7 @@ struct GNUNET_TRANSPORT_Blacklist
   /**
    * Connection to transport service.
    */
-  struct GNUNET_CLIENT_Connection * client;
-
-  /**
-   * Scheduler to use.
-   */
-  struct GNUNET_SCHEDULER_Handle *sched;
+  struct GNUNET_CLIENT_Connection *client;
 
   /**
    * Configuration to use.
@@ -103,19 +98,20 @@ reply (struct GNUNET_TRANSPORT_Blacklist *br);
  * @param msg query
  */
 static void
-query_handler (void *cls,
-              const struct GNUNET_MessageHeader *msg)
+query_handler (void *cls, const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_TRANSPORT_Blacklist *br = cls;
   const struct BlacklistMessage *bm;
 
-  if ( (ntohs(msg->size) != sizeof (struct BlacklistMessage)) ||
-       (ntohs(msg->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY) )
-    {
-      reconnect (br);
-      return;
-    }
-  bm = (const struct BlacklistMessage *)msg;
+  GNUNET_assert (br != NULL);
+  if ((NULL == msg) ||
+      (ntohs (msg->size) != sizeof (struct BlacklistMessage)) ||
+      (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY))
+  {
+    reconnect (br);
+    return;
+  }
+  bm = (const struct BlacklistMessage *) msg;
   GNUNET_break (0 == ntohl (bm->is_allowed));
   br->peer = bm->peer;
   reply (br);
@@ -130,10 +126,8 @@ query_handler (void *cls,
 static void
 receive (struct GNUNET_TRANSPORT_Blacklist *br)
 {
-  GNUNET_CLIENT_receive (br->client,
-                        &query_handler,
-                        br,
-                        GNUNET_TIME_UNIT_FOREVER_REL);
+  GNUNET_CLIENT_receive (br->client, &query_handler, br,
+                         GNUNET_TIME_UNIT_FOREVER_REL);
 }
 
 
@@ -146,17 +140,17 @@ receive (struct GNUNET_TRANSPORT_Blacklist *br)
  * @return number of bytes written to buf
  */
 static size_t
-transmit_blacklist_init (void *cls,
-                        size_t size, void *buf)
+transmit_blacklist_init (void *cls, size_t size, void *buf)
 {
   struct GNUNET_TRANSPORT_Blacklist *br = cls;
   struct GNUNET_MessageHeader req;
 
+  br->th = NULL;
   if (buf == NULL)
-    {
-      reconnect (br);
-      return 0;
-    }
+  {
+    reconnect (br);
+    return 0;
+  }
   req.size = htons (sizeof (struct GNUNET_MessageHeader));
   req.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT);
   memcpy (buf, &req, sizeof (req));
@@ -174,17 +168,15 @@ static void
 reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
 {
   if (br->client != NULL)
-    GNUNET_CLIENT_disconnect (br->client, GNUNET_NO);
-  br->client = GNUNET_CLIENT_connect (br->sched,
-                                     "transport",
-                                     br->cfg);
+    GNUNET_CLIENT_disconnect (br->client);
+  br->client = GNUNET_CLIENT_connect ("transport", br->cfg);
   GNUNET_assert (br->client != NULL);
-  br->th = GNUNET_CLIENT_notify_transmit_ready (br->client,
-                                               sizeof (struct GNUNET_MessageHeader),
-                                               GNUNET_TIME_UNIT_FOREVER_REL,
-                                               GNUNET_YES,
-                                               &transmit_blacklist_init,
-                                               br);
+  br->th =
+      GNUNET_CLIENT_notify_transmit_ready (br->client,
+                                           sizeof (struct GNUNET_MessageHeader),
+                                           GNUNET_TIME_UNIT_FOREVER_REL,
+                                           GNUNET_YES, &transmit_blacklist_init,
+                                           br);
 }
 
 
@@ -197,22 +189,23 @@ reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
  * @return number of bytes written to buf
  */
 static size_t
-transmit_blacklist_reply (void *cls,
-                         size_t size, void *buf)
+transmit_blacklist_reply (void *cls, size_t size, void *buf)
 {
   struct GNUNET_TRANSPORT_Blacklist *br = cls;
   struct BlacklistMessage req;
 
+  br->th = NULL;
   if (buf == NULL)
-    {
-      reconnect (br);
-      return 0;
-    }
+  {
+    reconnect (br);
+    return 0;
+  }
   req.header.size = htons (sizeof (req));
   req.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY);
   req.is_allowed = htonl (br->cb (br->cb_cls, &br->peer));
   req.peer = br->peer;
   memcpy (buf, &req, sizeof (req));
+  br->th = NULL;
   receive (br);
   return sizeof (req);
 }
@@ -226,17 +219,18 @@ transmit_blacklist_reply (void *cls,
 static void
 reply (struct GNUNET_TRANSPORT_Blacklist *br)
 {
-  br->th = GNUNET_CLIENT_notify_transmit_ready (br->client,
-                                               sizeof (struct BlacklistMessage),
-                                               GNUNET_TIME_UNIT_FOREVER_REL,
-                                               GNUNET_NO,
-                                               &transmit_blacklist_reply,
-                                               br);
+  GNUNET_assert (br->th == NULL);
+  br->th =
+      GNUNET_CLIENT_notify_transmit_ready (br->client,
+                                           sizeof (struct BlacklistMessage),
+                                           GNUNET_TIME_UNIT_FOREVER_REL,
+                                           GNUNET_NO, &transmit_blacklist_reply,
+                                           br);
   if (br->th == NULL)
-    {
-      reconnect (br);
-      return;
-    }
+  {
+    reconnect (br);
+    return;
+  }
 }
 
 
@@ -249,34 +243,33 @@ reply (struct GNUNET_TRANSPORT_Blacklist *br)
  * only way to re-enable connections from peers that were previously
  * blacklisted.
  *
- * @param sched scheduler to use
  * @param cfg configuration to use
  * @param cb callback to invoke to check if connections are allowed
  * @param cb_cls closure for cb
  * @return NULL on error, otherwise handle for cancellation
  */
 struct GNUNET_TRANSPORT_Blacklist *
-GNUNET_TRANSPORT_blacklist (struct GNUNET_SCHEDULER_Handle *sched,
-                           const struct GNUNET_CONFIGURATION_Handle *cfg,
-                           GNUNET_TRANSPORT_BlacklistCallback cb,
-                           void *cb_cls)
+GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                            GNUNET_TRANSPORT_BlacklistCallback cb, void *cb_cls)
 {
-  struct GNUNET_CLIENT_Connection * client;
+  struct GNUNET_CLIENT_Connection *client;
   struct GNUNET_TRANSPORT_Blacklist *ret;
 
-  client = GNUNET_CLIENT_connect (sched, "transport", cfg);
+  client = GNUNET_CLIENT_connect ("transport", cfg);
   if (NULL == client)
     return NULL;
   ret = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_Blacklist));
   ret->client = client;
-  ret->sched = sched;
   ret->cfg = cfg;
-  ret->th = GNUNET_CLIENT_notify_transmit_ready (client,
-                                                sizeof (struct GNUNET_MessageHeader),
-                                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                                GNUNET_YES,
-                                                &transmit_blacklist_init,
-                                                ret);
+  ret->cb = cb;
+  ret->cb_cls = cb_cls;
+  GNUNET_assert (ret->th == NULL);
+  ret->th =
+      GNUNET_CLIENT_notify_transmit_ready (client,
+                                           sizeof (struct GNUNET_MessageHeader),
+                                           GNUNET_TIME_UNIT_FOREVER_REL,
+                                           GNUNET_YES, &transmit_blacklist_init,
+                                           ret);
   return ret;
 }
 
@@ -291,8 +284,11 @@ void
 GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br)
 {
   if (br->th != NULL)
+  {
     GNUNET_CLIENT_notify_transmit_ready_cancel (br->th);
-  GNUNET_CLIENT_disconnect (br->client, GNUNET_NO);
+    br->th = NULL;
+  }
+  GNUNET_CLIENT_disconnect (br->client);
   GNUNET_free (br);
 }