[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10407 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r10407 - gnunet/src/transport |
|
Date: |
Mon, 22 Feb 2010 15:32:24 +0100 |
Author: nevans
Date: 2010-02-22 15:32:24 +0100 (Mon, 22 Feb 2010)
New Revision: 10407
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_udp_nat.c
gnunet/src/transport/test_transport_api.c
gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
Log:
nat stuff... works on my machine
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2010-02-22 13:58:37 UTC (rev 10406)
+++ gnunet/src/transport/Makefile.am 2010-02-22 14:32:24 UTC (rev 10407)
@@ -62,12 +62,12 @@
$(GN_LIBINTL)
-
plugin_LTLIBRARIES = \
libgnunet_plugin_transport_tcp.la \
libgnunet_plugin_transport_udp.la \
+ libgnunet_plugin_transport_udp_nat.la \
libgnunet_plugin_transport_template.la
-# TODO: add udp, http, nat, etc.
+# TODO: add http, nat, etc.
libgnunet_plugin_transport_tcp_la_SOURCES = \
plugin_transport_tcp.c
@@ -94,9 +94,19 @@
libgnunet_plugin_transport_udp_la_LDFLAGS = \
$(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_transport_udp_nat_la_SOURCES = \
+ plugin_transport_udp_nat.c
+libgnunet_plugin_transport_udp_nat_la_LIBADD = \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_transport_udp_nat_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
check_PROGRAMS = \
test_transport_api_tcp \
- test_transport_api_udp
+ test_transport_api_udp \
+ test_transport_api_udp_nat
# TODO: add tests for http, nat, etc.
TESTS = $(check_PROGRAMS)
@@ -112,6 +122,12 @@
test_transport_api_udp_LDADD = \
$(top_builddir)/src/transport/libgnunettransport.la \
$(top_builddir)/src/util/libgnunetutil.la
+
+test_transport_api_udp_nat_SOURCES = \
+ test_transport_api.c
+test_transport_api_udp_nat_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
EXTRA_DIST = \
test_transport_api_data.conf \
Modified: gnunet/src/transport/plugin_transport_udp_nat.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_nat.c 2010-02-22 13:58:37 UTC
(rev 10406)
+++ gnunet/src/transport/plugin_transport_udp_nat.c 2010-02-22 14:32:24 UTC
(rev 10407)
@@ -76,12 +76,12 @@
*
* FIXME: make this value dynamic, specified by configuration
*/
-#define UDP_NAT_LISTEN_PORTS 1
+#define UDP_NAT_LISTEN_PORTS 257
/*
* Starting port for listening and sending, eventually a config value
*/
-#define UDP_NAT_STARTING_PORT 24857
+#define UDP_NAT_STARTING_PORT 22086
/**
* UDP Message-Packet header.
@@ -329,6 +329,11 @@
uint16_t starting_port;
/**
+ * Starting port for sending out crazy messages
+ */
+ uint32_t random_starting_port;
+
+ /**
* How many ports should we be using?
*/
uint16_t num_ports;
@@ -376,12 +381,22 @@
};
+
+struct UDP_Sock_Info
+{
+ /* The network handle */
+ struct GNUNET_NETWORK_Handle *desc;
+
+ /* The port we bound to */
+ int port;
+};
+
/* *********** globals ************* */
/**
* the socket that we transmit all data with
*/
-static struct GNUNET_NETWORK_Handle *udp_nat_socks[UDP_NAT_LISTEN_PORTS];
+static struct UDP_Sock_Info *udp_nat_socks[UDP_NAT_LISTEN_PORTS];
/**
@@ -423,9 +438,9 @@
for (i = 0; i < plugin->num_ports; i++)
{
- ok = GNUNET_NETWORK_socket_close (udp_nat_socks[i]);
+ ok = GNUNET_NETWORK_socket_close (udp_nat_socks[i]->desc);
if (ok == GNUNET_OK)
- udp_nat_socks[i] = NULL;
+ udp_nat_socks[i]->desc = NULL;
ret += ok;
}
@@ -514,10 +529,6 @@
message = GNUNET_malloc (sizeof (struct UDPMessage) + msgbuf_size);
ssize = sizeof (struct UDPMessage) + msgbuf_size;
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("In udp_nat_send, ssize is %d, sending message to %s\n"),
ssize, GNUNET_a2s((const struct sockaddr *)addr, addrlen));
-#endif
message->header.size = htons (ssize);
message->header.type = htons (0);
memcpy (&message->sender, plugin->env->my_identity,
@@ -536,10 +547,6 @@
cont (cont_cls, target, GNUNET_SYSERR);
else
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("Successfully sent message, calling transmit
continuation!\n"));
-#endif
cont (cont_cls, target, GNUNET_OK);
}
}
@@ -634,8 +641,10 @@
* udp sock (or address, or index of udp sock array...)
*/
sent = 0;
+#if DISTINGUISH
if (plugin->behind_nat == GNUNET_NO)
{
+#endif
peer_session = find_session(plugin, target);
if (peer_session == NULL) /* We have a new peer to add */
{
@@ -690,11 +699,13 @@
peer_session->messages = temp_message;
}
}
+#if DISTINGUISH
}
else /* We are behind a NAT, so we can just send the message as is */
{
sent = udp_nat_real_send(cls, udp_nat_socks[0], target, msgbuf,
msgbuf_size, priority, timeout, addr, addrlen, cont, cont_cls);
}
+#endif
return sent;
}
@@ -796,23 +807,23 @@
message = GNUNET_malloc(sizeof(struct UDP_NAT_ProbeMessage));
message->header.size = htons(sizeof(struct UDP_NAT_ProbeMessage));
message->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE);
- //message->port = htons(probe->index + plugin->starting_port);
- probe->sock_addr.sin_port = htons(probe->index + plugin->starting_port);
+ /* Try the agreed upon port first, then go in order starting with our
randomly chosen port */
+ if (probe->index == 0)
+ probe->sock_addr.sin_port = htons(plugin->starting_port);
+ else
+ probe->sock_addr.sin_port = htons
(GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /*
Find a non-root port */
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
- _("Sending a probe on port %d\n"),
ntohs(probe->sock_addr.sin_port));
+ _("Sending a probe to port %d\n"),
ntohs(probe->sock_addr.sin_port));
#endif
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("about to send probe, ssize is %d, sending message to
%s\n"), ntohs(message->header.size), GNUNET_a2s((const struct sockaddr
*)&probe->sock_addr, sizeof(probe->sock_addr)));
-#endif
- sent = udp_nat_real_send(plugin, udp_nat_socks[probe->index], NULL, (char
*)message, ntohs(message->header.size), 0, GNUNET_TIME_relative_get_unit(),
&probe->sock_addr, sizeof(probe->sock_addr), &udp_probe_continuation, probe);
-
if (probe->index + 1 < plugin->num_ports)
probe->index += 1;
else
probe->index = 0;
+ sent = udp_nat_real_send(plugin, udp_nat_socks[probe->index]->desc, NULL,
(char *)message, ntohs(message->header.size), 0,
GNUNET_TIME_relative_get_unit(), &probe->sock_addr, sizeof(probe->sock_addr),
&udp_probe_continuation, probe);
+
+ GNUNET_free(message);
}
@@ -836,14 +847,19 @@
if (result == GNUNET_OK)
{
+ if (probe->index == 0)
+ {
#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
- _("Successfully sent a probe\n"));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
+ _("Scheduling next probe for 10000 milliseconds\n"));
#endif
- if (probe->index == 0)
- probe->task = GNUNET_SCHEDULER_add_delayed(plugin->env->sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 5000),
&send_udp_probe_message, probe);
+ probe->task = GNUNET_SCHEDULER_add_delayed(plugin->env->sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 10000),
&send_udp_probe_message, probe);
+ }
+
else
- probe->task = GNUNET_SCHEDULER_add_delayed(plugin->env->sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 500),
&send_udp_probe_message, probe);
+ {
+ probe->task = GNUNET_SCHEDULER_add_delayed(plugin->env->sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 50),
&send_udp_probe_message, probe);
+ }
}
else /* Destroy the probe context? */
{
@@ -916,7 +932,7 @@
_("nat-server-read read: %s\n"), &mybuf);
#endif
- /* Schedule sending of messages to peer on each open port */
+ /* Schedule sending of messages to peer on random ports */
temp_probe = find_probe(plugin, &mybuf[0]);
if (temp_probe == NULL)
@@ -947,7 +963,7 @@
*
*/
static void
-udp_nat_demultiplexer(struct Plugin *plugin, struct GNUNET_PeerIdentity
*sender, const struct GNUNET_MessageHeader *currhdr, struct sockaddr_storage
*sender_addr, socklen_t fromlen, int receiving_port)
+udp_nat_demultiplexer(struct Plugin *plugin, struct GNUNET_PeerIdentity
*sender, const struct GNUNET_MessageHeader *currhdr, struct sockaddr_storage
*sender_addr, socklen_t fromlen, struct UDP_Sock_Info *sockinfo)
{
struct UDP_NAT_ProbeMessageReply *outgoing_probe_reply;
struct UDP_NAT_ProbeMessageConfirmation *outgoing_probe_confirmation;
@@ -962,6 +978,15 @@
struct MessageQueue *pending_message_temp;
int sent;
+ if (memcmp(sender, plugin->env->my_identity, sizeof(struct
GNUNET_PeerIdentity)) == 0)
+ {
+#if DEBUG_UDP_NAT
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
+ _("Received a message from myself, dropping!!!\n"));
+#endif
+ return;
+ }
+
switch (ntohs(currhdr->type))
{
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE:
@@ -973,13 +998,13 @@
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
- _("Received a probe from port %d, sent_from port %d\n"),
receiving_port, ((struct sockaddr_in *)sender_addr)->sin_port);
+ _("Received a probe on listen port %d, sent_from port
%d\n"), sockinfo->port, ntohs(((struct sockaddr_in *)sender_addr)->sin_port));
#endif
- sent = udp_nat_real_send(plugin, udp_nat_socks[0], NULL, (char
*)outgoing_probe_reply, ntohs(outgoing_probe_reply->header.size), 0,
GNUNET_TIME_relative_get_unit(), sender_addr, fromlen, &dummy_continuation,
NULL);
+ sent = udp_nat_real_send(plugin, sockinfo->desc, NULL, (char
*)outgoing_probe_reply, ntohs(outgoing_probe_reply->header.size), 0,
GNUNET_TIME_relative_get_unit(), sender_addr, fromlen, &dummy_continuation,
NULL);
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
- _("Sent %d byes of PROBE REPLY\n"), sent);
+ _("Sent PROBE REPLY to port %d on outgoing port %d\n"),
ntohs(((struct sockaddr_in *)sender_addr)->sin_port), sockinfo->port);
#endif
break;
@@ -987,8 +1012,8 @@
/* Check for existing probe, check ports returned, send confirmation if
all is well */
incoming_probe_reply = (struct UDP_NAT_ProbeMessageReply *)currhdr;
#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp-nat",
- _("Received a probe reply with ss_family %d!\n"),
sender_addr->ss_family);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
+ _("Received PROBE REPLY from port %d on incoming port
%d\n"), ntohs(((struct sockaddr_in *)sender_addr)->sin_port), sockinfo->port);
#endif
/* FIXME: use nonce, then IPv6 replies could work I think... */
if (sender_addr->ss_family == AF_INET)
@@ -1000,12 +1025,12 @@
{
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
- _("Sending confirmation that were were
reached!\n"));
+ _("Sending confirmation that we were
reached!\n"));
#endif
outgoing_probe_confirmation = GNUNET_malloc(sizeof(struct
UDP_NAT_ProbeMessageConfirmation));
outgoing_probe_confirmation->header.size = htons(sizeof(struct
UDP_NAT_ProbeMessageConfirmation));
outgoing_probe_confirmation->header.type =
htons(GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM);
- sent = udp_nat_real_send(plugin, udp_nat_socks[receiving_port -
plugin->starting_port], NULL, (char *)outgoing_probe_confirmation,
ntohs(outgoing_probe_confirmation->header.size), 0,
GNUNET_TIME_relative_get_unit(), sender_addr, fromlen, &dummy_continuation,
NULL);
+ sent = udp_nat_real_send(plugin, sockinfo->desc, NULL, (char
*)outgoing_probe_confirmation, ntohs(outgoing_probe_confirmation->header.size),
0, GNUNET_TIME_relative_get_unit(), sender_addr, fromlen, &dummy_continuation,
NULL);
if (outgoing_probe->task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel(plugin->env->sched,
outgoing_probe->task);
@@ -1032,14 +1057,28 @@
if (peer_session == NULL) /* Shouldn't this NOT happen? */
{
#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp-nat",
- _("Received a probe confirmation, but don't
remember this peer!\n"));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat",
+ _("Peer not in list, adding (THIS MAY BE A MISTAKE)
%s\n"), GNUNET_i2s(sender));
#endif
+ peer_session = GNUNET_malloc(sizeof(struct PeerSession));
+ peer_session->connect_addr = GNUNET_malloc(fromlen);
+ memcpy(peer_session->connect_addr, sender_addr, fromlen);
+ peer_session->connect_alen = fromlen;
+ peer_session->plugin = plugin;
+ peer_session->sock = sockinfo->desc;
+ memcpy(&peer_session->target, sender, sizeof(struct
GNUNET_PeerIdentity));
+ peer_session->expecting_welcome = GNUNET_NO;
+
+ peer_session->next = plugin->sessions;
+ plugin->sessions = peer_session;
+
+ peer_session->messages = NULL;
}
else if (peer_session->expecting_welcome == GNUNET_YES)
{
peer_session->expecting_welcome = GNUNET_NO;
- peer_session->sock = udp_nat_socks[receiving_port -
plugin->starting_port]; /* This may matter, not sure right now... */
+ /* FIXME: There is no way to find this based on receiving port at
the moment! */
+ peer_session->sock = sockinfo->desc; /* This may matter, not sure
right now... */
((struct sockaddr_in *)peer_session->connect_addr)->sin_port =
((struct sockaddr_in *) sender_addr)->sin_port;
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp-nat",
@@ -1052,13 +1091,23 @@
_("Received a probe confirmation, sending queued
messages.\n"));
#endif
pending_message = peer_session->messages;
+ int count = 0;
while (pending_message != NULL)
{
- udp_nat_real_send(plugin, peer_session->sock,
&peer_session->target, pending_message->msgbuf, pending_message->msgbuf_size,
0, GNUNET_TIME_relative_get_unit(), peer_session->connect_addr,
peer_session->connect_alen, &dummy_continuation, NULL);
+#if DEBUG_UDP_NAT
+ GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp-nat",
+ _("sending queued message %d\n"), count);
+#endif
+ udp_nat_real_send(plugin, peer_session->sock,
&peer_session->target, pending_message->msgbuf, pending_message->msgbuf_size,
0, GNUNET_TIME_relative_get_unit(), peer_session->connect_addr,
peer_session->connect_alen, pending_message->cont, pending_message->cont_cls);
pending_message_temp = pending_message;
pending_message = pending_message->next;
GNUNET_free(pending_message_temp->msgbuf);
GNUNET_free(pending_message_temp);
+#if DEBUG_UDP_NAT
+ GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp-nat",
+ _("finished sending queued message %d\n"),
count);
+#endif
+ count++;
}
}
@@ -1116,16 +1165,16 @@
for (i = 0; i < plugin->num_ports; i++)
{
- buflen = GNUNET_NETWORK_socket_recvfrom_amount (udp_nat_socks[i]);
+ buflen = GNUNET_NETWORK_socket_recvfrom_amount (udp_nat_socks[i]->desc);
if (buflen == GNUNET_NO)
- break;
+ continue;
buf = GNUNET_malloc (buflen);
fromlen = sizeof (addr);
memset (&addr, 0, fromlen);
ret =
- GNUNET_NETWORK_socket_recvfrom (udp_nat_socks[i], buf, buflen,
+ GNUNET_NETWORK_socket_recvfrom (udp_nat_socks[i]->desc, buf, buflen,
(struct sockaddr *) &addr, &fromlen);
#if DEBUG_UDP_NAT
@@ -1137,7 +1186,7 @@
if (ret <= 0)
{
GNUNET_free (buf);
- break;
+ continue;
}
msg = (struct UDPMessage *) buf;
@@ -1149,7 +1198,7 @@
if (ntohs (msg->header.size) < sizeof (struct UDPMessage))
{
GNUNET_free (buf);
- break;
+ continue;
}
hdr = (const struct GNUNET_MessageHeader *) &msg[1];
msgbuf = (char *)&msg[1];
@@ -1168,8 +1217,12 @@
("processing msg %d: type %d, size %d at offset
%d\n"),
count, ntohs(currhdr->type), ntohs(currhdr->size),
offset);
#endif
- udp_nat_demultiplexer(plugin, sender, currhdr, &addr, fromlen,
plugin->starting_port + i);
-
+ udp_nat_demultiplexer(plugin, sender, currhdr, &addr, fromlen,
udp_nat_socks[i]);
+#if DEBUG_UDP_NAT
+ GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
+ ("processing done msg %d: type %d, size %d at
offset %d\n"),
+ count, ntohs(currhdr->type), ntohs(currhdr->size),
offset);
+#endif
offset += ntohs(currhdr->size);
count++;
}
@@ -1239,7 +1292,8 @@
/* Open all our sockets for reading/writing */
for (i = 0; i < plugin->num_ports; i++)
{
- udp_nat_socks[i] = NULL;
+ udp_nat_socks[i] = GNUNET_malloc(sizeof(struct UDP_Sock_Info));
+ udp_nat_socks[i]->desc = NULL;
#if IPV6
if (GNUNET_YES !=
GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "GNUNETD",
@@ -1260,10 +1314,10 @@
}
}
#endif
- if (NULL == udp_nat_socks[i])
+ if (NULL == udp_nat_socks[i]->desc)
{
- udp_nat_socks[i] = GNUNET_NETWORK_socket_create (PF_INET,
SOCK_DGRAM, 17);
- if (NULL == udp_nat_socks[i])
+ udp_nat_socks[i]->desc = GNUNET_NETWORK_socket_create (PF_INET,
SOCK_DGRAM, 17);
+ if (NULL == udp_nat_socks[i]->desc)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp-nat", "socket");
return sockets_created;
@@ -1279,29 +1333,30 @@
if (i == 0)
serverAddrv4.sin_port = htons (plugin->starting_port);
else
- serverAddrv4.sin_port = htons
(GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 64537) + 1000); /* Find a
non-root port */
+ serverAddrv4.sin_port = htons
(GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /*
Find a non-root port */
addrlen = sizeof (serverAddrv4);
serverAddr = (struct sockaddr *) &serverAddrv4;
}
}
- if (udp_nat_socks[i] != NULL)
+ if (udp_nat_socks[i]->desc != NULL)
{
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"udp_nat",
"Binding to port %d\n",
ntohs(serverAddrv4.sin_port));
#endif
- while (GNUNET_NETWORK_socket_bind (udp_nat_socks[i], serverAddr,
addrlen) !=
+ while (GNUNET_NETWORK_socket_bind (udp_nat_socks[i]->desc,
serverAddr, addrlen) !=
GNUNET_OK)
{
- serverAddrv4.sin_port = htons
(GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 64537) + 1000); /* Find a
non-root port */
+ serverAddrv4.sin_port = htons
(GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /*
Find a good, non-root port */
#if DEBUG_UDP_NAT
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"udp_nat",
"Binding failed, trying new port %d\n",
ntohs(serverAddrv4.sin_port));
#endif
}
+ udp_nat_socks[i]->port = ntohs(serverAddrv4.sin_port);
sockets_created++;
}
}
@@ -1312,7 +1367,7 @@
for (i = 0; i < plugin->num_ports; i++)
{
- GNUNET_NETWORK_fdset_set (plugin->rs, udp_nat_socks[i]);
+ GNUNET_NETWORK_fdset_set (plugin->rs, udp_nat_socks[i]->desc);
}
plugin->select_task =
@@ -1336,8 +1391,10 @@
static uint16_t
check_port (struct Plugin *plugin, uint16_t in_port)
{
- int i;
+ /* FIXME: remember what ports we are using to better respond to this */
+ return in_port;
+ /*
for (i = plugin->starting_port; i < plugin->num_ports +
plugin->starting_port; i++)
{
if (in_port == i)
@@ -1346,6 +1403,7 @@
return GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
plugin->num_ports) + plugin->starting_port;
+ */
}
@@ -1552,7 +1610,7 @@
GNUNET_CONFIGURATION_get_value_string (env->cfg,
"transport-udp-nat",
- "STARTING_PORT",
+ "PORT",
&starting_port);
mtu = 1240;
@@ -1587,6 +1645,8 @@
plugin->service = service;
+ plugin->random_starting_port =
GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000;
+
/* FIXME: do the two calls below periodically again and
not just once (since the info we get might change...) */
GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2010-02-22 13:58:37 UTC (rev
10406)
+++ gnunet/src/transport/test_transport_api.c 2010-02-22 14:32:24 UTC (rev
10407)
@@ -36,7 +36,7 @@
#include "gnunet_transport_service.h"
#include "transport.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define VERBOSE_ARM GNUNET_NO
@@ -335,20 +335,83 @@
return ok;
}
+
+static char *
+get_path_from_PATH ()
+{
+ char *path;
+ char *pos;
+ char *end;
+ char *buf;
+ const char *p;
+
+ p = getenv ("PATH");
+ if (p == NULL)
+ return NULL;
+ path = GNUNET_strdup (p); /* because we write on it */
+ buf = GNUNET_malloc (strlen (path) + 20);
+ pos = path;
+
+ while (NULL != (end = strchr (pos, ':')))
+ {
+ *end = '\0';
+ sprintf (buf, "%s/%s", pos, "gnunet-nat-server");
+ if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+ {
+ pos = GNUNET_strdup (buf);
+ GNUNET_free (buf);
+ GNUNET_free (path);
+ return pos;
+ }
+ pos = end + 1;
+ }
+ sprintf (buf, "%s/%s", pos, "gnunet-nat-server");
+ if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
+ {
+ pos = GNUNET_strdup (buf);
+ GNUNET_free (buf);
+ GNUNET_free (path);
+ return pos;
+ }
+ GNUNET_free (buf);
+ GNUNET_free (path);
+ return NULL;
+}
+
+
+static int check_gnunet_nat_server()
+{
+ struct stat statbuf;
+
+ stat(get_path_from_PATH(), &statbuf);
+ if ((statbuf.st_mode & S_ISUID) && (statbuf.st_uid == 0))
+ {
+ return GNUNET_YES;
+ }
+ else
+ {
+ return GNUNET_NO;
+ }
+}
+
int
main (int argc, char *argv[])
{
int ret;
-
+#ifdef MINGW
+ return GNUNET_SYSERR;
+#endif
if (strstr(argv[0], "tcp") != NULL)
{
-
is_tcp = GNUNET_YES;
}
else if (strstr(argv[0], "udp_nat") != NULL)
{
- fprintf(stderr, "this is a udp_nat test!\n");
is_udp_nat = GNUNET_YES;
+ if (check_gnunet_nat_server() == GNUNET_NO)
+ {
+ return GNUNET_SYSERR;
+ }
}
else if (strstr(argv[0], "udp") != NULL)
{
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2010-02-22
13:58:37 UTC (rev 10406)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2010-02-22
14:32:24 UTC (rev 10407)
@@ -1,8 +1,9 @@
[transport-udp-nat]
PORT = 12368
-BEHIND_NAT = NO
+BEHIND_NAT = YES
EXTERNAL_ADDRESS = 127.0.0.1
-STARTING_PORT = 22222
+STARTING_PORT = 40000
+RANDOM_START_PORT = 50000
[fs]
ALLOW_SHUTDOWN = YES
@@ -64,18 +65,18 @@
[transport]
PLUGINS = udp_nat
-DEBUG = YES
+#DEBUG = YES
ALLOW_SHUTDOWN = YES
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
-BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
+BINARY = gnunet-service-transport
CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
#PREFIX = valgrind --track-origins=yes --leak-check=full
--log-file=valgrind_udp_peer1.log
-PREFIX = xterm -e xterm -T transport -e gdb --args
+#PREFIX = xterm -e xterm -T transport -e gdb --args
[peerinfo]
TRUST = $SERVICEHOME/data/credit/
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2010-02-22
13:58:37 UTC (rev 10406)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2010-02-22
14:32:24 UTC (rev 10407)
@@ -2,7 +2,8 @@
PORT = 22368
BEHIND_NAT = YES
EXTERNAL_ADDRESS = 127.0.0.1
-STARTING_PORT = 22222
+STARTING_PORT = 50000
+RANDOM_START_PORT = 40000
[fs]
ALLOW_SHUTDOWN = YES
@@ -64,18 +65,18 @@
[transport]
PLUGINS = udp_nat
-DEBUG = YES
+#DEBUG = YES
PREFIX =
ALLOW_SHUTDOWN = YES
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
-BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
+BINARY = gnunet-service-transport
CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 22365
-PREFIX = xterm -e xterm -T transport -e gdb --args
+#PREFIX = xterm -e xterm -T transport -e gdb --args
[peerinfo]
TRUST = $SERVICEHOME/data/credit/
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10407 - gnunet/src/transport,
gnunet <=