Using regex for exit/vpn

[oweals/gnunet.git] / src / peerinfo / peerinfo_api_notify.c

diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index 9c75b18288f5a3942ab51615351c1307a4b7c55d..b9e83c9e75344629f771fbc6371a4d977d07da3a 100644 (file)
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -30,6 +30,8 @@
 #include "gnunet_time_lib.h"
 #include "peerinfo.h"
 
+#define LOG(kind,...) GNUNET_log_from (kind, "nse-api",__VA_ARGS__)
+
 /**
  * Context for the info handler.
  */
@@ -131,7 +133,7 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
 
   if (msg == NULL)
   {
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
     reconnect (nc, NULL);
     return;
   }
@@ -140,7 +142,7 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_PEERINFO_INFO))
   {
     GNUNET_break (0);
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
     nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
     request_notifications (nc);
     return;
@@ -153,17 +155,15 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
     if (ms != sizeof (struct InfoMessage) + GNUNET_HELLO_size (hello))
     {
       GNUNET_break (0);
-      GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (nc->client);
       nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
       request_notifications (nc);
       return;
     }
   }
-#if DEBUG_PEERINFO
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Received information about peer `%s' from peerinfo database\n",
-              GNUNET_i2s (&im->peer));
-#endif
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received information about peer `%s' from peerinfo database\n",
+       GNUNET_i2s (&im->peer));
   nc->callback (nc->callback_cls, &im->peer, hello, NULL);
   receive_notifications (nc);
 }
@@ -200,7 +200,7 @@ transmit_notify_request (void *cls, size_t size, void *buf)
   nc->init = NULL;
   if (buf == NULL)
   {
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
     nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
     request_notifications (nc);
     return 0;
@@ -253,8 +253,8 @@ GNUNET_PEERINFO_notify (const struct GNUNET_CONFIGURATION_Handle *cfg,
   client = GNUNET_CLIENT_connect ("peerinfo", cfg);
   if (client == NULL)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Could not connect to `%s' service.\n"), "peerinfo");
+    LOG (GNUNET_ERROR_TYPE_WARNING, _("Could not connect to `%s' service.\n"),
+         "peerinfo");
     return NULL;
   }
   nc = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_NotifyContext));
@@ -281,7 +281,7 @@ GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc)
     nc->init = NULL;
   }
   if (NULL != nc->client)
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
   if (GNUNET_SCHEDULER_NO_TASK != nc->task)
     GNUNET_SCHEDULER_cancel (nc->task);
   GNUNET_free (nc);