-doxygen

[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 f8f430995758bd533ccd0bfeec348c5f968db198..dcd1ae78180683ccca1e4d46e95bc41a552c9828 100644 (file)
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -24,12 +24,10 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_client_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_arm_service.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
@@ -78,7 +76,8 @@ struct GNUNET_TRANSPORT_Blacklist
  *
  * @param br overall handle
  */
-static void reconnect (struct GNUNET_TRANSPORT_Blacklist *br);
+static void
+reconnect (struct GNUNET_TRANSPORT_Blacklist *br);
 
 
 /**
@@ -86,7 +85,8 @@ static void reconnect (struct GNUNET_TRANSPORT_Blacklist *br);
  *
  * @param br our overall context
  */
-static void reply (struct GNUNET_TRANSPORT_Blacklist *br);
+static void
+reply (struct GNUNET_TRANSPORT_Blacklist *br);
 
 
 /**
@@ -101,7 +101,9 @@ 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)) ||
+  GNUNET_assert (br != NULL);
+  if ((NULL == msg) ||
+      (ntohs (msg->size) != sizeof (struct BlacklistMessage)) ||
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY))
   {
     reconnect (br);
@@ -122,8 +124,8 @@ query_handler (void *cls, const struct GNUNET_MessageHeader *msg)
 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);
 }
 
 
@@ -141,6 +143,7 @@ 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);
@@ -163,15 +166,15 @@ static void
 reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
 {
   if (br->client != NULL)
-    GNUNET_CLIENT_disconnect (br->client, GNUNET_NO);
+    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);
 }
 
 
@@ -189,6 +192,7 @@ 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);
@@ -199,6 +203,7 @@ transmit_blacklist_reply (void *cls, size_t size, void *buf)
   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);
 }
@@ -212,12 +217,13 @@ transmit_blacklist_reply (void *cls, size_t size, void *buf)
 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);
@@ -253,12 +259,15 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
   ret = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_Blacklist));
   ret->client = client;
   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;
 }
 
@@ -273,8 +282,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);
 }