[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17353 - gnunet/src/nat
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17353 - gnunet/src/nat |
Date: |
Mon, 10 Oct 2011 15:57:18 +0200 |
Author: grothoff
Date: 2011-10-10 15:57:17 +0200 (Mon, 10 Oct 2011)
New Revision: 17353
Modified:
gnunet/src/nat/nat_mini.c
gnunet/src/nat/nat_test.c
Log:
use LOG macro in nat.c
Modified: gnunet/src/nat/nat_mini.c
===================================================================
--- gnunet/src/nat/nat_mini.c 2011-10-10 13:55:15 UTC (rev 17352)
+++ gnunet/src/nat/nat_mini.c 2011-10-10 13:57:17 UTC (rev 17353)
@@ -28,6 +28,7 @@
#include "gnunet_nat_lib.h"
#include "nat.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "nat", __VA_ARGS__)
/**
* How long do we give upnpc to create a mapping?
@@ -163,8 +164,7 @@
{
struct GNUNET_NAT_ExternalHandle *eh;
- if (GNUNET_SYSERR ==
- GNUNET_OS_check_helper_binary ("external-ip"))
+ if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("external-ip"))
return NULL;
eh = GNUNET_malloc (sizeof (struct GNUNET_NAT_ExternalHandle));
eh->cb = cb;
@@ -525,7 +525,7 @@
if (NULL == line)
{
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat", "UPnP unmap done\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "UPnP unmap done\n");
#endif
GNUNET_OS_command_stop (mini->unmap_cmd);
mini->unmap_cmd = NULL;
@@ -578,9 +578,8 @@
GNUNET_snprintf (pstr, sizeof (pstr), "%u",
(unsigned int) ntohs (mini->current_addr.sin_port));
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Unmapping port %u with UPnP\n",
- ntohs (mini->current_addr.sin_port));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Unmapping port %u with UPnP\n",
+ ntohs (mini->current_addr.sin_port));
#endif
mini->unmap_cmd =
GNUNET_OS_command_run (&process_unmap_output, mini, UNMAP_TIMEOUT,
Modified: gnunet/src/nat/nat_test.c
===================================================================
--- gnunet/src/nat/nat_test.c 2011-10-10 13:55:15 UTC (rev 17352)
+++ gnunet/src/nat/nat_test.c 2011-10-10 13:57:17 UTC (rev 17353)
@@ -28,6 +28,7 @@
#include "gnunet_nat_lib.h"
#include "nat.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "nat", __VA_ARGS__)
/**
* Entry we keep for each incoming connection.
@@ -178,8 +179,8 @@
if (h->data != sa->sin_port)
{
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Received connection reversal request for wrong port\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received connection reversal request for wrong port\n");
#endif
return; /* wrong port */
}
@@ -213,14 +214,14 @@
tst->report (tst->report_cls, GNUNET_OK);
#if DEBUG_NAT
else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Received data mismatches expected value\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received data mismatches expected value\n");
#endif
}
#if DEBUG_NAT
else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Failed to receive data from inbound connection\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to receive data from inbound connection\n");
#endif
}
@@ -251,15 +252,14 @@
tst->report (tst->report_cls, GNUNET_OK);
#if DEBUG_NAT
else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "nat",
- "Received data mismatches expected value\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received data mismatches expected value\n");
#endif
}
#if DEBUG_NAT
else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Failed to receive data from inbound connection\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to receive data from inbound connection\n");
#endif
GNUNET_NETWORK_socket_close (na->sock);
GNUNET_free (na);
@@ -293,8 +293,8 @@
return; /* odd error */
}
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Got an inbound connection, waiting for data\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Got an inbound connection, waiting for data\n");
#endif
wl = GNUNET_malloc (sizeof (struct NatActivity));
wl->sock = s;
@@ -330,9 +330,8 @@
if (addrlen != sizeof (struct sockaddr_in))
return; /* ignore IPv6 here */
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Asking gnunet-nat-server to connect to `%s'\n",
- GNUNET_a2s (addr, addrlen));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Asking gnunet-nat-server to connect to
`%s'\n",
+ GNUNET_a2s (addr, addrlen));
#endif
sa = (const struct sockaddr_in *) addr;
msg.header.size = htons (sizeof (struct GNUNET_NAT_TestMessage));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17353 - gnunet/src/nat,
gnunet <=