[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: migrate gnunet-nat-server t
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: migrate gnunet-nat-server to new NAT lib |
Date: |
Sat, 07 Jan 2017 16:36:43 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 659e270 migrate gnunet-nat-server to new NAT lib
659e270 is described below
commit 659e270f9e023112ca864065a22db5e484ba5ef6
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Jan 7 16:36:36 2017 +0100
migrate gnunet-nat-server to new NAT lib
---
src/nat-auto/Makefile.am | 2 +-
src/nat-auto/gnunet-nat-server.c | 39 +++++++++++++++++++++++++++------------
2 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/nat-auto/Makefile.am b/src/nat-auto/Makefile.am
index dbe9103..19695fa 100644
--- a/src/nat-auto/Makefile.am
+++ b/src/nat-auto/Makefile.am
@@ -18,7 +18,7 @@ libexec_PROGRAMS = \
gnunet_nat_server_SOURCES = \
gnunet-nat-server.c nat-auto.h
gnunet_nat_server_LDADD = \
- $(top_builddir)/src/nat/libgnunetnat.la \
+ $(top_builddir)/src/nat/libgnunetnatnew.la \
$(top_builddir)/src/util/libgnunetutil.la
gnunet_nat_auto_SOURCES = \
diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c
index d98a7a5..dd08f8d 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/nat-auto/gnunet-nat-server.c
@@ -25,7 +25,7 @@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_nat_lib.h"
+#include "gnunet_nat_service.h"
#include "gnunet_protocols.h"
#include "nat-auto.h"
@@ -54,24 +54,39 @@ try_anat (uint32_t dst_ipv4,
int is_tcp)
{
struct GNUNET_NAT_Handle *h;
- struct sockaddr_in sa;
+ struct sockaddr_in lsa;
+ struct sockaddr_in rsa;
+ socklen_t sa_len;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking for connection reversal with %x and code %u\n",
(unsigned int) dst_ipv4,
(unsigned int) dport);
- 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;
+ memset (&lsa, 0, sizeof (lsa));
+ lsa.sin_family = AF_INET;
#if HAVE_SOCKADDR_IN_SIN_LEN
- sa.sin_len = sizeof (sa);
+ lsa.sin_len = sizeof (sa);
#endif
- sa.sin_addr.s_addr = dst_ipv4;
- GNUNET_NAT_run_client (h, &sa);
+ lsa.sin_addr.s_addr = 0;
+ lsa.sin_port = htons (dport);
+ memset (&rsa, 0, sizeof (rsa));
+ rsa.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ rsa.sin_len = sizeof (sa);
+#endif
+ rsa.sin_addr.s_addr = dst_ipv4;
+ rsa.sin_port = htons (dport);
+ sa_len = sizeof (lsa);
+ h = GNUNET_NAT_register (cfg,
+ "none",
+ is_tcp ? IPPROTO_TCP : IPPROTO_UDP,
+ 1,
+ (const struct sockaddr **) &lsa,
+ &sa_len,
+ NULL, NULL, NULL);
+ GNUNET_NAT_request_reversal (h,
+ &lsa,
+ &rsa);
GNUNET_NAT_unregister (h);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: migrate gnunet-nat-server to new NAT lib,
gnunet <=