#include "plugin_transport.h"
#include "transport.h"
-#define DEBUG_TCP GNUNET_NO
-#define DEBUG_TCP_NAT GNUNET_NO
+#define DEBUG_TCP GNUNET_YES
+#define DEBUG_TCP_NAT GNUNET_YES
/**
* How long until we give up on transmitting the welcome message?
*/
struct GNUNET_CONNECTION_Handle *lsock;
- /*
+ /**
* stdout pipe handle for the gnunet-nat-server process
*/
struct GNUNET_DISK_PipeHandle *server_stdout;
- /*
+ /**
* stdout file handle (for reading) for the gnunet-nat-server process
*/
const struct GNUNET_DISK_FileHandle *server_stdout_handle;
*/
char *internal_address;
+ /**
+ * Address given for us to bind to (ONLY).
+ */
+ char *bind_address;
+
/**
* List of our IP addresses.
*/
}
else
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
- _("Unexpected address length: %u\n"),
- addrlen);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unexpected address length: %u\n"),
+ addrlen);
GNUNET_break (0);
return NULL;
}
GNUNET_assert (client == NULL);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating new session for peer `%4s'\n",
GNUNET_i2s (target));
#endif
if (buf == NULL)
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout trying to transmit to peer `%4s', discarding message queue.\n",
GNUNET_i2s (&session->target));
#endif
session->pending_messages_tail,
pos);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to transmit %u byte message to `%4s'.\n",
pos->message_size,
GNUNET_i2s (&session->target));
GNUNET_assert (hd == NULL);
GNUNET_assert (tl == NULL);
#if DEBUG_TCP > 1
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp", "Transmitting %u bytes\n", ret);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting %u bytes\n", ret);
#endif
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
return;
if (NULL == (pm = session->pending_messages_head))
return;
+
session->transmit_handle
= GNUNET_SERVER_notify_transmit_ready (session->client,
pm->message_size,
struct PendingMessage *pm;
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Disconnecting from `%4s' at %s (session %p).\n",
GNUNET_i2s (&session->target),
(session->connect_addr != NULL) ?
else
prev->next = session->next;
session->plugin->env->session_end (session->plugin->env->cls,
- &session->target,
- session);
+ &session->target,
+ session);
/* clean up state */
if (session->transmit_handle != NULL)
{
while (NULL != (pm = session->pending_messages_head))
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
pm->transmit_cont != NULL
? "Could not deliver message to `%4s'.\n"
:
char *port_as_string;
pid_t pid;
const struct sockaddr *sa = (const struct sockaddr *)addr;
+
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("called run_gnunet_nat_client addrlen %d others are %d and %d\n"), addrlen, sizeof (struct sockaddr), sizeof (struct sockaddr_in));
#endif
GNUNET_asprintf(&port_as_string, "%d", plugin->adv_port);
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Running gnunet-nat-client with arguments: %s %s %d\n"), plugin->external_address, address_as_string, plugin->adv_port);
#endif
(addr == NULL) )
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to transmit to `%4s' without address and I have no existing connection (failing).\n",
GNUNET_i2s (target));
#endif
}
else
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Address of unexpected length: %u\n"),
addrlen);
GNUNET_break (0);
(GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &target->hashPubKey)))
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Found valid IPv4 NAT address!\n"));
#endif
session = create_session (plugin,
GNUNET_assert(GNUNET_CONTAINER_multihashmap_put(plugin->nat_wait_conns, &target->hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) == GNUNET_OK);
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Created NAT WAIT connection to `%4s' at `%s'\n",
GNUNET_i2s (target),
GNUNET_a2s (sb, sbs));
#endif
- run_gnunet_nat_client(plugin, sb, sbs);
+ run_gnunet_nat_client (plugin, sb, sbs);
return 0;
}
else if ((plugin->allow_nat == GNUNET_YES) && (is_natd == GNUNET_YES) && (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &target->hashPubKey)))
return -1;
}
sa = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched,
- af, sb, sbs,
- GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
+ af, sb, sbs);
if (sa == NULL)
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to create connection to `%4s' at `%s'\n",
GNUNET_i2s (target),
GNUNET_a2s (sb, sbs));
return -1;
}
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to transmit to `%4s', creating fresh session using address `%s'.\n",
GNUNET_i2s (target),
GNUNET_a2s (sb, sbs));
session->pending_messages_tail,
pm);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to transmit %u bytes to `%s', added message to list.\n",
msgbuf_size,
GNUNET_i2s (target));
struct PendingMessage *pm;
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to cancel session with `%4s'\n",
GNUNET_i2s (target));
#endif
if ( (plugin->behind_nat == GNUNET_YES) && (in_port == 0) )
return GNUNET_OK;
if ( (plugin->only_nat_addresses == GNUNET_YES) &&
- (plugin->behind_nat == GNUNET_YES) &&
- (in_port != 0) )
+ (plugin->behind_nat == GNUNET_YES) )
{
return GNUNET_SYSERR; /* odd case... */
}
const struct sockaddr_in6 *s6;
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "received tcp NAT probe\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received tcp NAT probe\n");
#endif
/* We have received a TCP NAT probe, meaning we (hopefully) initiated
* a connection to this peer by running gnunet-nat-client. This peer
if (ntohs(message->size) != sizeof(struct TCP_NAT_ProbeMessage))
{
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "Bad size fo tcp NAT probe, expected %d got %d.\n", sizeof(struct TCP_NAT_ProbeMessage), ntohs(message->size));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bad size for tcp NAT probe, expected %d got %d.\n", sizeof(struct TCP_NAT_ProbeMessage), ntohs(message->size));
#endif
GNUNET_break_op(0);
return;
if (GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey) == GNUNET_YES)
{
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "Found session for NAT probe!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found session for NAT probe!\n");
#endif
session = GNUNET_CONTAINER_multihashmap_get(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey);
GNUNET_assert(session != NULL);
GNUNET_SERVER_client_keep (client);
session->client = client;
session->last_activity = GNUNET_TIME_absolute_get ();
+ /* FIXME: Should this be inbound or outbound?
+ * I think it should be outbound because we technically
+ * initiated it... But something goes wrong somewhere. */
+ /* session->inbound = GNUNET_YES; */
+ session->inbound = GNUNET_YES;
if (GNUNET_OK ==
GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found address `%s' for incoming connection %p\n",
GNUNET_a2s (vaddr, alen),
client);
#endif
- if (alen == sizeof (struct sockaddr_in))
+ if (((const struct sockaddr *)vaddr)->sa_family == AF_INET)
{
s4 = vaddr;
t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
session->connect_addr = t4;
session->connect_alen = sizeof (struct IPv4TcpAddress);
}
- else if (alen == sizeof (struct sockaddr_in6))
+ else if (((const struct sockaddr *)vaddr)->sa_family == AF_INET6)
{
s6 = vaddr;
t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
session->connect_addr = t6;
session->connect_alen = sizeof (struct IPv6TcpAddress);
}
-
- session->connect_addr = GNUNET_malloc (alen);
- memcpy (session->connect_addr,
- vaddr,
- alen);
- session->connect_alen = alen;
+ else
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Bad address for incoming connection!\n");
+#endif
+ }
GNUNET_free (vaddr);
}
else
{
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "Did NOT find session for NAT probe!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Did NOT find session for NAT probe!\n");
#endif
}
+
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
const struct sockaddr_in *s4;
const struct sockaddr_in6 *s6;
-
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received %s message from a `%4s/%p'.\n",
"WELCOME",
GNUNET_i2s (&wm->clientIdentity), client);
GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found address `%s' for incoming connection %p\n",
GNUNET_a2s (vaddr, alen),
client);
else
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Did not obtain TCP socket address for incoming connection\n");
#endif
}
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating new session %p for connection %p\n",
session, client);
#endif
}
session->last_activity = GNUNET_TIME_absolute_get ();
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Passing %u bytes of type %u from `%4s' to transport service.\n",
(unsigned int) ntohs (message->size),
(unsigned int) ntohs (message->type),
if (session == NULL)
return; /* unknown, nothing to do */
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Destroying session of `%4s' with %s (%p) due to network-level disconnect.\n",
GNUNET_i2s (&session->target),
(session->connect_addr != NULL) ?
void *arg;
uint16_t args;
void *arg_nat;
+ char buf[INET_ADDRSTRLEN];
af = addr->sa_family;
arg_nat = NULL;
if (af == AF_INET)
{
t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+ GNUNET_assert(NULL != inet_ntop(AF_INET, &t4.ipv4_addr, &buf[0], INET_ADDRSTRLEN));
+ if ((plugin->bind_address != NULL) && (0 != strcmp(buf, plugin->bind_address)))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Not notifying transport of address %s\n", "TCP", GNUNET_a2s (addr, addrlen));
+ return GNUNET_OK;
+ }
add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
if ((plugin->behind_nat == GNUNET_YES) && (plugin->only_nat_addresses == GNUNET_YES))
t4.t_port = htons(0);
}
else if (af == AF_INET6)
{
- if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
+ if ((IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) || (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg, "transport-tcp", "disablev6")))
{
/* skip link local addresses */
return GNUNET_OK;
GNUNET_break (0);
return GNUNET_OK;
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO |
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO |
GNUNET_ERROR_TYPE_BULK,
- "tcp",
_("Found address `%s' (%s)\n"),
GNUNET_a2s (addr, addrlen), name);
if (arg_nat != NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO |
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO |
GNUNET_ERROR_TYPE_BULK,
- "tcp",
_("Found address `%s' (%s)\n"),
GNUNET_a2s (addr, addrlen), name);
plugin->env->notify_address (plugin->env->cls,
if (bytes < 1)
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Finished reading from server stdout with code: %d\n"), bytes);
#endif
return;
return;
}
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("nat-server-read read: %s port %d\n"), &mybuf, port);
#endif
if (inet_pton(AF_INET, &mybuf[0], &in_addr.sin_addr) != 1)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("nat-server-read malformed address\n"), &mybuf, port);
plugin->server_read_task =
* that wants to connect to us! Send a message to establish a connection.
*/
sock = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched, AF_INET, (struct sockaddr *)&in_addr,
- sizeof(in_addr), GNUNET_SERVER_MAX_MESSAGE_SIZE - 1);
+ sizeof(in_addr));
+
+
if (sock == NULL)
{
plugin->server_read_task =
}
else
{
- tcp_probe_ctx = GNUNET_malloc(sizeof(struct TCPProbeContext));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sending TCP probe message!\n"), &mybuf, port);
+ tcp_probe_ctx = GNUNET_malloc(sizeof(struct TCPProbeContext));
tcp_probe_ctx->message.header.size = htons(sizeof(struct TCP_NAT_ProbeMessage));
tcp_probe_ctx->message.header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE);
memcpy(&tcp_probe_ctx->message.clientIdentity, plugin->env->my_identity, sizeof(struct GNUNET_PeerIdentity));
}
+ /*GNUNET_SERVER_connect_socket(plugin->server, sock);*/
plugin->server_read_task =
GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
GNUNET_TIME_UNIT_FOREVER_REL,
return GNUNET_SYSERR;
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting gnunet-nat-server process cmd: %s %s\n", "gnunet-nat-server", plugin->internal_address);
#endif
/* Start the server process */
if (plugin->server_pid == GNUNET_SYSERR)
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to start gnunet-nat-server process\n");
#endif
return GNUNET_SYSERR;
service = GNUNET_SERVICE_start ("transport-tcp", env->sched, env->cfg);
if (service == NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
- "tcp",
- _
- ("Failed to start service for `%s' transport plugin.\n"),
- "tcp");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to start service for `%s' transport plugin.\n"),
+ "tcp");
return NULL;
}
else
{
behind_nat = GNUNET_NO;
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "tcp", "Configuration specified you are behind a NAT, but gnunet-nat-server is not installed properly (suid bit not set)!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Configuration specified you are behind a NAT, but gnunet-nat-server is not installed properly (suid bit not set)!\n");
}
}
else
else
{
allow_nat = GNUNET_NO;
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "tcp", "Configuration specified you want to connect to NAT'd peers, but gnunet-nat-client is not installed properly (suid bit not set)!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Configuration specified you want to connect to NAT'd peers, but gnunet-nat-client is not installed properly (suid bit not set)!\n");
}
}
else
"EXTERNAL_ADDRESS",
&external_address)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Require EXTERNAL_ADDRESS for service `%s' in configuration (either BEHIND_NAT or ALLOW_NAT set to YES)!\n"),
"transport-tcp");
if ((external_address != NULL) && (inet_pton(AF_INET, external_address, &in_addr.sin_addr) != 1))
{
- GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "udp", "Malformed EXTERNAL_ADDRESS %s given in configuration!\n", external_address);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Malformed EXTERNAL_ADDRESS %s given in configuration!\n", external_address);
}
internal_address = NULL;
"INTERNAL_ADDRESS",
&internal_address)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
- _
- ("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
- "transport-tcp");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
+ "transport-tcp");
GNUNET_SERVICE_stop (service);
GNUNET_free_non_null(external_address);
return NULL;
if ((internal_address != NULL) && (inet_pton(AF_INET, internal_address, &in_addr.sin_addr) != 1))
{
- GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "udp", "Malformed INTERNAL_ADDRESS %s given in configuration!\n", internal_address);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Malformed INTERNAL_ADDRESS %s given in configuration!\n", internal_address);
}
aport = 0;
"ADVERTISED-PORT",
&aport)) && (aport > 65535)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Require valid port number for service `%s' in configuration!\n"),
"transport-tcp");
plugin->handlers[i].callback_cls = plugin;
GNUNET_SERVER_add_handlers (plugin->server, plugin->handlers);
- if (behind_nat == GNUNET_YES)
+ if (plugin->behind_nat == GNUNET_YES)
{
if (GNUNET_YES != tcp_transport_start_nat_server(plugin))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+
_
("Failed to start %s required for NAT in %s!\n"),
"gnunet-nat-server"
GNUNET_free_non_null(external_address);
GNUNET_free_non_null(internal_address);
GNUNET_SERVICE_stop (service);
+ GNUNET_free (api);
return NULL;
}
}
GNUNET_assert(plugin->nat_wait_conns != NULL);
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "tcp", _("TCP transport listening on port %llu\n"), bport);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("TCP transport listening on port %llu\n"), bport);
if (aport != bport)
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("TCP transport advertises itself as being on port %llu\n"),
aport);
GNUNET_SERVER_disconnect_notify (plugin->server,
&disconnect_notify,
plugin);
+ GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-tcp", "BINDTO", &plugin->bind_address);
+
if (plugin->behind_nat == GNUNET_NO)
{
GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
if ((plugin->behind_nat == GNUNET_YES) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1))
{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying transport of address %s:0\n", plugin->external_address);
t4.t_port = htons(0);
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
plugin->env->notify_address (plugin->env->cls,
"tcp",
&t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1))
{
t4.t_port = htons(plugin->adv_port);
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
plugin->env->notify_address (plugin->env->cls,
"tcp",
&t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
lal);
GNUNET_free (lal);
}
+
+ if (plugin->behind_nat == GNUNET_YES)
+ {
+ if (0 != PLIBC_KILL (plugin->server_pid, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_OS_process_wait (plugin->server_pid);
+ }
+ GNUNET_free_non_null(plugin->bind_address);
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
projects / oweals / gnunet.git / blobdiff