#include "gnunet_util_lib.h"
#include "gnunet_resolver_service.h"
#include "gnunet_nat_lib.h"
+#include "nat.h"
-#define DEBUG_NAT GNUNET_NO
+#define LOG(kind,...) GNUNET_log_from (kind, "nat", __VA_ARGS__)
/**
* How often do we scan for changes in our IP address from our local
unsigned int num_local_addrs;
/**
- * The our external address (according to config, UPnP may disagree...)
+ * Our external address (according to config, UPnP may disagree...),
+ * in dotted decimal notation, IPv4-only. Or NULL if not known.
*/
char *external_address;
*/
int use_localaddresses;
+ /**
+ * Should we return local addresses to clients
+ */
+ int return_localaddress;
+
/**
* Should we do a DNS lookup of our hostname to find out our own IP?
*/
lal->source = src;
GNUNET_CONTAINER_DLL_insert (h->lal_head, h->lal_tail, lal);
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Adding address `%s' from source %d\n", GNUNET_a2s (arg,
- arg_size),
- src);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding address `%s' from source %d\n",
+ GNUNET_a2s (arg, arg_size), src);
#endif
if (NULL != h->address_callback)
h->address_callback (h->callback_cls, GNUNET_YES, arg, arg_size);
* @param name name of the interface
* @param isDefault do we think this may be our default interface
* @param addr address of the interface
+ * @param broadcast_addr the broadcast address (can be NULL for unknown or unassigned)
+ * @param netmask the network mask (can be NULL for unknown or unassigned))
* @param addrlen number of bytes in addr
* @return GNUNET_OK to continue iterating
*/
static int
process_interfaces (void *cls, const char *name, int isDefault,
- const struct sockaddr *addr, socklen_t addrlen)
+ const struct sockaddr *addr,
+ const struct sockaddr *broadcast_addr,
+ const struct sockaddr *netmask, socklen_t addrlen)
{
struct GNUNET_NAT_Handle *h = cls;
const struct sockaddr_in *s4;
case AF_INET:
s4 = (struct sockaddr_in *) addr;
ip = &s4->sin_addr;
+
+ /* Check if address is in 127.0.0.0/8 */
+ uint32_t address = ntohl ((uint32_t) (s4->sin_addr.s_addr));
+ uint32_t value = (address & 0xFF000000) ^ 0x7F000000;
+
+ if ((h->return_localaddress == GNUNET_NO) && (value == 0))
+ {
+ return GNUNET_OK;
+ }
if (GNUNET_YES == h->use_localaddresses)
+ {
add_ip_to_address_list (h, LAL_INTERFACE_ADDRESS, &s4->sin_addr,
sizeof (struct in_addr));
+ }
break;
case AF_INET6:
s6 = (struct sockaddr_in6 *) addr;
/* skip link local addresses */
return GNUNET_OK;
}
+ if ((h->return_localaddress == GNUNET_NO) &&
+ (IN6_IS_ADDR_LOOPBACK (&((struct sockaddr_in6 *) addr)->sin6_addr)))
+ {
+ return GNUNET_OK;
+ }
ip = &s6->sin6_addr;
if (GNUNET_YES == h->use_localaddresses)
+ {
add_ip_to_address_list (h, LAL_INTERFACE_ADDRESS, &s6->sin6_addr,
sizeof (struct in6_addr));
+ }
break;
default:
GNUNET_break (0);
if (bytes < 1)
{
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Finished reading from server stdout with code: %d\n",
- bytes);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished reading from server stdout with code: %d\n", bytes);
#endif
if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill");
GNUNET_OS_process_wait (h->server_proc);
GNUNET_OS_process_close (h->server_proc);
h->server_proc = NULL;
(-1 == inet_pton (AF_INET, mybuf, &sin_addr.sin_addr)))
{
/* should we restart gnunet-helper-nat-server? */
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "nat",
- _
- ("gnunet-helper-nat-server generated malformed address `%s'\n"),
- mybuf);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "nat",
+ _("gnunet-helper-nat-server generated malformed address `%s'\n"),
+ mybuf);
h->server_read_task =
GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
h->server_stdout_handle,
}
sin_addr.sin_port = htons ((uint16_t) port);
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "gnunet-helper-nat-server read: %s:%d\n", mybuf, port);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "gnunet-helper-nat-server read: %s:%d\n", mybuf,
+ port);
#endif
h->reversal_callback (h->callback_cls, (const struct sockaddr *) &sin_addr,
sizeof (sin_addr));
(h->internal_address != NULL) &&
(NULL !=
(h->server_stdout =
- GNUNET_DISK_pipe (GNUNET_YES, GNUNET_NO, GNUNET_YES))))
+ GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES))))
{
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat" "Starting %s at `%s'\n",
- "gnunet-helper-nat-server", h->internal_address);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting `%s' at `%s'\n",
+ "gnunet-helper-nat-server", h->internal_address);
#endif
/* Start the server process */
h->server_proc =
- GNUNET_OS_start_process (NULL, h->server_stdout,
+ GNUNET_OS_start_process (GNUNET_NO, NULL, h->server_stdout,
"gnunet-helper-nat-server",
"gnunet-helper-nat-server",
h->internal_address, NULL);
if (h->server_proc == NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "nat",
- _("Failed to start %s\n"), "gnunet-helper-nat-server");
+ LOG (GNUNET_ERROR_TYPE_WARNING, "nat", _("Failed to start %s\n"),
+ "gnunet-helper-nat-server");
GNUNET_DISK_pipe_close (h->server_stdout);
h->server_stdout = NULL;
}
unsigned int i;
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- "Registered with NAT service at port %u with %u IP bound local addresses\n",
- (unsigned int) adv_port, num_addrs);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Registered with NAT service at port %u with %u IP bound local addresses\n",
+ (unsigned int) adv_port, num_addrs);
#endif
h = GNUNET_malloc (sizeof (struct GNUNET_NAT_Handle));
h->server_retry_delay = GNUNET_TIME_UNIT_SECONDS;
if ((h->internal_address != NULL) &&
(inet_pton (AF_INET, h->internal_address, &in_addr) != 1))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "nat",
- _("Malformed %s `%s' given in configuration!\n"),
- "INTERNAL_ADDRESS", h->internal_address);
+ LOG (GNUNET_ERROR_TYPE_WARNING, "nat",
+ _("Malformed %s `%s' given in configuration!\n"), "INTERNAL_ADDRESS",
+ h->internal_address);
GNUNET_free (h->internal_address);
h->internal_address = NULL;
}
"EXTERNAL_ADDRESS",
&h->external_address);
}
- if ((h->external_address != NULL) &&
- (inet_pton (AF_INET, h->external_address, &in_addr) != 1))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "nat",
- _("Malformed %s `%s' given in configuration!\n"),
- "EXTERNAL_ADDRESS", h->external_address);
- GNUNET_free (h->external_address);
- h->external_address = NULL;
- }
h->behind_nat =
GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT");
h->nat_punched =
GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "PUNCHED_NAT");
h->enable_nat_client =
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "ENABLE_NAT_CLIENT");
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "ENABLE_ICMP_CLIENT");
h->enable_nat_server =
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "ENABLE_NAT_SERVER");
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "ENABLE_ICMP_SERVER");
h->enable_upnp =
GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "ENABLE_UPNP");
h->use_localaddresses =
GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "USE_LOCALADDR");
+ h->return_localaddress =
+ GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat",
+ "RETURN_LOCAL_ADDRESSES");
+
h->use_hostname =
GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "USE_HOSTNAME");
h->disable_ipv6 =
GNUNET_OS_check_helper_binary ("gnunet-helper-nat-server")))
{
h->enable_nat_server = GNUNET_NO;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Configuration requires `%s', but binary is not installed properly (SUID bit not set). Option disabled.\n"),
- "gnunet-helper-nat-server");
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Configuration requires `%s', but binary is not installed properly (SUID bit not set). Option disabled.\n"),
+ "gnunet-helper-nat-server");
}
if ((GNUNET_YES == h->enable_nat_client) &&
(GNUNET_YES !=
GNUNET_OS_check_helper_binary ("gnunet-helper-nat-client")))
{
h->enable_nat_client = GNUNET_NO;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Configuration requires `%s', but binary is not installed properly (SUID bit not set). Option disabled.\n"),
- "gnunet-helper-nat-client");
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Configuration requires `%s', but binary is not installed properly (SUID bit not set). Option disabled.\n"),
+ "gnunet-helper-nat-client");
}
start_gnunet_nat_server (h);
if (NULL != h->server_proc)
{
if (0 != GNUNET_OS_process_kill (h->server_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "kill");
GNUNET_OS_process_wait (h->server_proc);
GNUNET_OS_process_close (h->server_proc);
h->server_proc = NULL;
* gnunet-helper-nat-client to send dummy ICMP responses to cause
* that peer to connect to us (connection reversal).
*
- * @param h NAT handle for us (largely used for configuration)
- * @param sa the address of the peer (IPv4-only)
+ * @return GNUNET_SYSERR on error, GNUNET_NO if nat client is disabled,
+ * GNUNET_OK otherwise
*/
-void
+int
GNUNET_NAT_run_client (struct GNUNET_NAT_Handle *h,
const struct sockaddr_in *sa)
+
+
{
char inet4[INET_ADDRSTRLEN];
char port_as_string[6];
struct GNUNET_OS_Process *proc;
if (GNUNET_YES != h->enable_nat_client)
- return; /* not permitted / possible */
+ return GNUNET_NO; /* not permitted / possible */
if (h->internal_address == NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "nat",
- _
- ("Internal IP address not known, cannot use ICMP NAT traversal method\n"));
- return;
+ LOG (GNUNET_ERROR_TYPE_WARNING, "nat",
+ _
+ ("Internal IP address not known, cannot use ICMP NAT traversal method\n"));
+ return GNUNET_SYSERR;
}
GNUNET_assert (sa->sin_family == AF_INET);
if (NULL == inet_ntop (AF_INET, &sa->sin_addr, inet4, INET_ADDRSTRLEN))
{
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
- return;
+ GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING, "nat", "inet_ntop");
+ return GNUNET_SYSERR;
}
GNUNET_snprintf (port_as_string, sizeof (port_as_string), "%d", h->adv_port);
#if DEBUG_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "nat",
- _("Running gnunet-helper-nat-client %s %s %u\n"),
- h->internal_address, inet4, (unsigned int) h->adv_port);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ _("Running gnunet-helper-nat-client %s %s %u\n"), h->internal_address,
+ inet4, (unsigned int) h->adv_port);
#endif
proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-helper-nat-client",
+ GNUNET_OS_start_process (GNUNET_NO,
+ NULL, NULL, "gnunet-helper-nat-client",
"gnunet-helper-nat-client", h->internal_address,
inet4, port_as_string, NULL);
if (NULL == proc)
- return;
+ return GNUNET_SYSERR;
/* we know that the gnunet-helper-nat-client will terminate virtually
* instantly */
GNUNET_OS_process_wait (proc);
GNUNET_OS_process_close (proc);
+ return GNUNET_OK;
}
}
pos = pos->next;
}
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Asked to validate one of my addresses and validation failed!\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Asked to validate one of my addresses and validation failed!\n");
return GNUNET_NO;
}
projects / oweals / gnunet.git / blobdiff