Check that you are not present in trail twice

[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 f6852ff0101553ba42ba1838db2d42d985eeea82..2d6dc5f065b5169ca34ce1277a407b5015e27ea6 100644 (file)
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -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"
 
@@ -61,7 +59,7 @@ struct GNUNET_TRANSPORT_Blacklist
   GNUNET_TRANSPORT_BlacklistCallback cb;
 
   /**
-   * Closure for 'cb'.
+   * Closure for @e cb.
    */
   void *cb_cls;
 
@@ -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);
 
 
 /**
@@ -96,12 +96,15 @@ static void 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)) ||
+  GNUNET_assert (NULL != br);
+  if ((NULL == msg) ||
+      (ntohs (msg->size) != sizeof (struct BlacklistMessage)) ||
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_QUERY))
   {
     reconnect (br);
@@ -130,18 +133,21 @@ receive (struct GNUNET_TRANSPORT_Blacklist *br)
 /**
  * Transmit the blacklist initialization request to the service.
  *
- * @param cls closure (struct GNUNET_TRANSPORT_Blacklist*)
- * @param size number of bytes available in buf
+ * @param cls closure with `struct GNUNET_TRANSPORT_Blacklist *`
+ * @param size number of bytes available in @a buf
  * @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @return number of bytes written to @a 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;
 
-  if (buf == NULL)
+  br->th = NULL;
+  if (NULL == buf)
   {
     reconnect (br);
     return 0;
@@ -162,10 +168,10 @@ transmit_blacklist_init (void *cls, size_t size, void *buf)
 static void
 reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
 {
-  if (br->client != NULL)
-    GNUNET_CLIENT_disconnect (br->client, GNUNET_NO);
+  if (NULL != br->client)
+    GNUNET_CLIENT_disconnect (br->client);
   br->client = GNUNET_CLIENT_connect ("transport", br->cfg);
-  GNUNET_assert (br->client != NULL);
+  GNUNET_assert (NULL != br->client);
   br->th =
       GNUNET_CLIENT_notify_transmit_ready (br->client,
                                            sizeof (struct GNUNET_MessageHeader),
@@ -178,18 +184,21 @@ reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
 /**
  * Transmit the blacklist response to the service.
  *
- * @param cls closure (struct GNUNET_TRANSPORT_Blacklist*)
- * @param size number of bytes available in buf
+ * @param cls closure with `struct GNUNET_TRANSPORT_Blacklist *`
+ * @param size number of bytes available in @a buf
  * @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @return number of bytes written to @a 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;
 
-  if (buf == NULL)
+  br->th = NULL;
+  if (NULL == buf)
   {
     reconnect (br);
     return 0;
@@ -199,6 +208,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,13 +222,14 @@ transmit_blacklist_reply (void *cls, size_t size, void *buf)
 static void
 reply (struct GNUNET_TRANSPORT_Blacklist *br)
 {
+  GNUNET_assert (NULL == br->th);
   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)
+  if (NULL == br->th)
   {
     reconnect (br);
     return;
@@ -237,12 +248,13 @@ reply (struct GNUNET_TRANSPORT_Blacklist *br)
  *
  * @param cfg configuration to use
  * @param cb callback to invoke to check if connections are allowed
- * @param cb_cls closure for cb
+ * @param cb_cls closure for @a cb
  * @return NULL on error, otherwise handle for cancellation
  */
 struct GNUNET_TRANSPORT_Blacklist *
 GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            GNUNET_TRANSPORT_BlacklistCallback cb, void *cb_cls)
+                            GNUNET_TRANSPORT_BlacklistCallback cb,
+                            void *cb_cls)
 {
   struct GNUNET_CLIENT_Connection *client;
   struct GNUNET_TRANSPORT_Blacklist *ret;
@@ -250,9 +262,11 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
   client = GNUNET_CLIENT_connect ("transport", cfg);
   if (NULL == client)
     return NULL;
-  ret = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_Blacklist));
+  ret = GNUNET_new (struct GNUNET_TRANSPORT_Blacklist);
   ret->client = client;
   ret->cfg = cfg;
+  ret->cb = cb;
+  ret->cb_cls = cb_cls;
   ret->th =
       GNUNET_CLIENT_notify_transmit_ready (client,
                                            sizeof (struct GNUNET_MessageHeader),
@@ -272,9 +286,12 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br)
 {
-  if (br->th != NULL)
+  if (NULL != br->th)
+  {
     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);
 }