-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 d6387b14465fdab3f97e6ad6173ec15c13dcfa7f..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"
 
@@ -103,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);
@@ -143,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);
@@ -165,7 +166,7 @@ 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 =
@@ -191,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);
@@ -201,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);
 }
@@ -214,6 +217,7 @@ transmit_blacklist_reply (void *cls, size_t size, void *buf)
 static void
 reply (struct GNUNET_TRANSPORT_Blacklist *br)
 {
+  GNUNET_assert (br->th == NULL);
   br->th =
       GNUNET_CLIENT_notify_transmit_ready (br->client,
                                            sizeof (struct BlacklistMessage),
@@ -255,6 +259,9 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
   ret = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_Blacklist));
   ret->client = client;
   ret->cfg = cfg;
+  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),
@@ -275,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);
 }