projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
report skipped tests, doxygen fixes
[oweals/gnunet.git]
/
src
/
nat
/
gnunet-nat-server.c
diff --git
a/src/nat/gnunet-nat-server.c
b/src/nat/gnunet-nat-server.c
index 5e2390f352cd12295962aa75ef74c872a84c5ebd..66b5ee3dab7b46f02c11004ecf556581d8d3cabf 100644
(file)
--- a/
src/nat/gnunet-nat-server.c
+++ b/
src/nat/gnunet-nat-server.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-29,7
+29,6
@@
#include "gnunet_protocols.h"
#include "nat.h"
#include "gnunet_protocols.h"
#include "nat.h"
-#define DEBUG_NAT GNUNET_NO
/**
* Our server.
/**
* Our server.
@@
-56,12
+55,10
@@
try_anat (uint32_t dst_ipv4, uint16_t dport, int is_tcp)
struct GNUNET_NAT_Handle *h;
struct sockaddr_in sa;
struct GNUNET_NAT_Handle *h;
struct sockaddr_in sa;
-#if DEBUG_NAT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking for connection reversal with %x and code %u\n",
(unsigned int) dst_ipv4, (unsigned int) dport);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking for connection reversal with %x and code %u\n",
(unsigned int) dst_ipv4, (unsigned int) dport);
-#endif
- h = GNUNET_NAT_register (cfg, is_tcp, dport, 0, NULL, NULL, NULL, NULL, NULL);
+ h = GNUNET_NAT_register (cfg, is_tcp, dport, 0, NULL, NULL, NULL, NULL, NULL, NULL);
memset (&sa, 0, sizeof (sa));
sa.sin_family = AF_INET;
#if HAVE_SOCKADDR_IN_SIN_LEN
memset (&sa, 0, sizeof (sa));
sa.sin_family = AF_INET;
#if HAVE_SOCKADDR_IN_SIN_LEN
@@
-94,7
+91,7
@@
struct TcpContext
* Task called by the scheduler once we can do the TCP send
* (or once we failed to connect...).
*
* Task called by the scheduler once we can do the TCP send
* (or once we failed to connect...).
*
- * @param c
tx
the 'struct TcpContext'
+ * @param c
ls
the 'struct TcpContext'
* @param tc scheduler context
*/
static void
* @param tc scheduler context
*/
static void
@@
-108,9
+105,7
@@
tcp_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
if (-1 ==
GNUNET_NETWORK_socket_send (ctx->s, &ctx->data, sizeof (ctx->data)))
{
if (-1 ==
GNUNET_NETWORK_socket_send (ctx->s, &ctx->data, sizeof (ctx->data)))
{
-#if DEBUG_NAT
GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
-#endif
}
GNUNET_NETWORK_socket_shutdown (ctx->s, SHUT_RDWR);
}
}
GNUNET_NETWORK_socket_shutdown (ctx->s, SHUT_RDWR);
}
@@
-123,7
+118,7
@@
tcp_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* Try to send 'data' to the
* IP 'dst_ipv4' at port 'dport' via TCP.
*
* Try to send 'data' to the
* IP 'dst_ipv4' at port 'dport' via TCP.
*
- * @param dst_i
vp
4 target IP
+ * @param dst_i
pv
4 target IP
* @param dport target port
* @param data data to send
*/
* @param dport target port
* @param data data to send
*/
@@
-147,10
+142,8
@@
try_send_tcp (uint32_t dst_ipv4, uint16_t dport, uint16_t data)
#endif
sa.sin_addr.s_addr = dst_ipv4;
sa.sin_port = htons (dport);
#endif
sa.sin_addr.s_addr = dst_ipv4;
sa.sin_port = htons (dport);
-#if DEBUG_NAT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending TCP message to `%s'\n",
GNUNET_a2s ((struct sockaddr *) &sa, sizeof (sa)));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending TCP message to `%s'\n",
GNUNET_a2s ((struct sockaddr *) &sa, sizeof (sa)));
-#endif
if ((GNUNET_OK !=
GNUNET_NETWORK_socket_connect (s, (const struct sockaddr *) &sa,
sizeof (sa))) && (errno != EINPROGRESS))
if ((GNUNET_OK !=
GNUNET_NETWORK_socket_connect (s, (const struct sockaddr *) &sa,
sizeof (sa))) && (errno != EINPROGRESS))
@@
-159,7
+152,7
@@
try_send_tcp (uint32_t dst_ipv4, uint16_t dport, uint16_t data)
GNUNET_NETWORK_socket_close (s);
return;
}
GNUNET_NETWORK_socket_close (s);
return;
}
- ctx = GNUNET_
malloc (sizeof (struct TcpContext)
);
+ ctx = GNUNET_
new (struct TcpContext
);
ctx->s = s;
ctx->data = data;
GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_SECONDS, s, &tcp_send, ctx);
ctx->s = s;
ctx->data = data;
GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_SECONDS, s, &tcp_send, ctx);
@@
-170,7
+163,7
@@
try_send_tcp (uint32_t dst_ipv4, uint16_t dport, uint16_t data)
* Try to send 'data' to the
* IP 'dst_ipv4' at port 'dport' via UDP.
*
* Try to send 'data' to the
* IP 'dst_ipv4' at port 'dport' via UDP.
*
- * @param dst_i
vp
4 target IP
+ * @param dst_i
pv
4 target IP
* @param dport target port
* @param data data to send
*/
* @param dport target port
* @param data data to send
*/
@@
-193,10
+186,8
@@
try_send_udp (uint32_t dst_ipv4, uint16_t dport, uint16_t data)
#endif
sa.sin_addr.s_addr = dst_ipv4;
sa.sin_port = htons (dport);
#endif
sa.sin_addr.s_addr = dst_ipv4;
sa.sin_port = htons (dport);
-#if DEBUG_NAT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending UDP packet to `%s'\n",
GNUNET_a2s ((struct sockaddr *) &sa, sizeof (sa)));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending UDP packet to `%s'\n",
GNUNET_a2s ((struct sockaddr *) &sa, sizeof (sa)));
-#endif
if (-1 ==
GNUNET_NETWORK_socket_sendto (s, &data, sizeof (data),
(const struct sockaddr *) &sa, sizeof (sa)))
if (-1 ==
GNUNET_NETWORK_socket_sendto (s, &data, sizeof (data),
(const struct sockaddr *) &sa, sizeof (sa)))
@@
-220,9
+211,7
@@
test (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_NAT_TestMessage *tm;
uint16_t dport;
const struct GNUNET_NAT_TestMessage *tm;
uint16_t dport;
-#if DEBUG_NAT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received test request\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received test request\n");
-#endif
tm = (const struct GNUNET_NAT_TestMessage *) msg;
dport = ntohs (tm->dport);
if (0 == dport)
tm = (const struct GNUNET_NAT_TestMessage *) msg;
dport = ntohs (tm->dport);
if (0 == dport)
@@
-238,7
+227,7
@@
test (void *cls, struct GNUNET_SERVER_Client *client,
/**
* Task run during shutdown.
*
/**
* Task run during shutdown.
*
- * @param c
tx
unused
+ * @param c
ls
unused
* @param tc scheduler context
*/
static void
* @param tc scheduler context
*/
static void
@@
-285,7
+274,7
@@
run (void *cls, char *const *args, const char *cfgfile,
if ((args[0] == NULL) || (1 != SSCANF (args[0], "%u", &port)) || (0 == port)
|| (65536 <= port))
{
if ((args[0] == NULL) || (1 != SSCANF (args[0], "%u", &port)) || (0 == port)
|| (65536 <= port))
{
-
fprintf
(stderr,
+
FPRINTF
(stderr,
_
("Please pass valid port number as the first argument! (got `%s')\n"),
args[0]);
_
("Please pass valid port number as the first argument! (got `%s')\n"),
args[0]);
@@
-324,11
+313,18
@@
main (int argc, char *const argv[])
GNUNET_GETOPT_OPTION_END
};
GNUNET_GETOPT_OPTION_END
};
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
if (GNUNET_OK !=
GNUNET_PROGRAM_run (argc, argv, "gnunet-nat-server [options] PORT",
_("GNUnet NAT traversal test helper daemon"), options,
&run, NULL))
if (GNUNET_OK !=
GNUNET_PROGRAM_run (argc, argv, "gnunet-nat-server [options] PORT",
_("GNUnet NAT traversal test helper daemon"), options,
&run, NULL))
+ {
+ GNUNET_free ((void*) argv);
return 1;
return 1;
+ }
+ GNUNET_free ((void*) argv);
return 0;
}
return 0;
}