[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35965 - in gnunet: contrib m4 src/consensus src/dns src/in
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r35965 - in gnunet: contrib m4 src/consensus src/dns src/integration-tests src/nat |
|
Date: |
Sun, 21 Jun 2015 20:14:58 +0200 |
Author: amatus
Date: 2015-06-21 20:14:58 +0200 (Sun, 21 Jun 2015)
New Revision: 35965
Modified:
gnunet/contrib/gnunet_pyexpect.py.in
gnunet/contrib/terminate.py.in
gnunet/m4/ac_define_dir.m4
gnunet/src/consensus/consensus-simulation.py
gnunet/src/dns/Makefile.am
gnunet/src/integration-tests/gnunet_pyexpect.py.in
gnunet/src/nat/test_stun.c
gnunet/src/nat/test_stun.h
Log:
dos2unix
Modified: gnunet/contrib/gnunet_pyexpect.py.in
===================================================================
--- gnunet/contrib/gnunet_pyexpect.py.in 2015-06-21 18:02:37 UTC (rev
35964)
+++ gnunet/contrib/gnunet_pyexpect.py.in 2015-06-21 18:14:58 UTC (rev
35965)
@@ -1,83 +1,83 @@
address@hidden@
-# This file is part of GNUnet.
-# (C) 2010 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
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-# GNUnet is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Testcase for gnunet-peerinfo
-from __future__ import print_function
-import os
-import re
-import subprocess
-import sys
-import shutil
-import time
-
-class pexpect (object):
- def __init__ (self):
- super (pexpect, self).__init__ ()
-
- def spawn (self, stdin, arglist, *pargs, **kwargs):
- env = kwargs.pop ('env', None)
- if env is None:
- env = os.environ.copy ()
- # This messes up some testcases, disable log redirection
- env.pop ('GNUNET_FORCE_LOGFILE', None)
- self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs)
- if self.proc is None:
- print ("Failed to spawn a process {0}".format (arglist))
- sys.exit (1)
- if stdin is not None:
- self.stdo, self.stde = self.proc.communicate (stdin)
- else:
- self.stdo, self.stde = self.proc.communicate ()
- return self.proc
-
- def expect (self, s, r, flags=0):
- stream = self.stdo if s == 'stdout' else self.stde
- if isinstance (r, str):
- if r == "EOF":
- if len (stream) == 0:
- return True
- else:
- print ("Failed to find `{1}' in {0}, which is `{2}' ({3})".format
(s, r, stream, len (stream)))
- sys.exit (2)
- raise ValueError ("Argument `r' should be an instance of re.RegexObject
or a special string, but is `{0}'".format (r))
- m = r.search (stream.decode(), flags)
- if not m:
- print ("Failed to find `{1}' in {0}, which is is `{2}'".format (s,
r.pattern, stream))
- sys.exit (2)
- stream = stream[m.end ():]
- if s == 'stdout':
- self.stdo = stream
- else:
- self.stde = stream
- return m
-
- def read (self, s, size=-1):
- stream = self.stdo if s == 'stdout' else self.stde
- result = ""
- if size < 0:
- result = stream
- new_stream = ""
- else:
- result = stream[0:size]
- new_stream = stream[size:]
- if s == 'stdout':
- self.stdo = new_stream
- else:
- self.stde = new_stream
- return result
address@hidden@
+# This file is part of GNUnet.
+# (C) 2010 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
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# 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., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# Testcase for gnunet-peerinfo
+from __future__ import print_function
+import os
+import re
+import subprocess
+import sys
+import shutil
+import time
+
+class pexpect (object):
+ def __init__ (self):
+ super (pexpect, self).__init__ ()
+
+ def spawn (self, stdin, arglist, *pargs, **kwargs):
+ env = kwargs.pop ('env', None)
+ if env is None:
+ env = os.environ.copy ()
+ # This messes up some testcases, disable log redirection
+ env.pop ('GNUNET_FORCE_LOGFILE', None)
+ self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs)
+ if self.proc is None:
+ print ("Failed to spawn a process {0}".format (arglist))
+ sys.exit (1)
+ if stdin is not None:
+ self.stdo, self.stde = self.proc.communicate (stdin)
+ else:
+ self.stdo, self.stde = self.proc.communicate ()
+ return self.proc
+
+ def expect (self, s, r, flags=0):
+ stream = self.stdo if s == 'stdout' else self.stde
+ if isinstance (r, str):
+ if r == "EOF":
+ if len (stream) == 0:
+ return True
+ else:
+ print ("Failed to find `{1}' in {0}, which is `{2}' ({3})".format
(s, r, stream, len (stream)))
+ sys.exit (2)
+ raise ValueError ("Argument `r' should be an instance of re.RegexObject
or a special string, but is `{0}'".format (r))
+ m = r.search (stream.decode(), flags)
+ if not m:
+ print ("Failed to find `{1}' in {0}, which is is `{2}'".format (s,
r.pattern, stream))
+ sys.exit (2)
+ stream = stream[m.end ():]
+ if s == 'stdout':
+ self.stdo = stream
+ else:
+ self.stde = stream
+ return m
+
+ def read (self, s, size=-1):
+ stream = self.stdo if s == 'stdout' else self.stde
+ result = ""
+ if size < 0:
+ result = stream
+ new_stream = ""
+ else:
+ result = stream[0:size]
+ new_stream = stream[size:]
+ if s == 'stdout':
+ self.stdo = new_stream
+ else:
+ self.stde = new_stream
+ return result
Modified: gnunet/contrib/terminate.py.in
===================================================================
--- gnunet/contrib/terminate.py.in 2015-06-21 18:02:37 UTC (rev 35964)
+++ gnunet/contrib/terminate.py.in 2015-06-21 18:14:58 UTC (rev 35965)
@@ -20,45 +20,45 @@
# Utility module that implements safe process termination for W32.
# For other platforms it's equivalent to Popen.kill ()
# Requires pywin32 on W32.
-
-import sys
-import os
-import subprocess
-if os.name == 'nt':
- import win32api
- import win32process
-
-class dummyobj (object):
- pass
-
-def safe_terminate_process_by_pid (pid, code):
- if os.name == 'nt':
- p = dummyobj ()
- p._handle = win32api.OpenProcess (2 | 1024 | 8 | 32 | 16, 0, pid)
- result = safe_terminate_process (p, code)
- win32api.CloseHandle (p._handle)
- return result
- else:
- return os.kill (int (pid), SIGKILL)
-
-def safe_terminate_process (proc, code):
- if os.name == 'nt':
- cp = win32api.GetCurrentProcess ()
- result = False
- dupproc = win32api.DuplicateHandle (cp, proc._handle, cp, 2 | 1024 | 8 |
32 | 16, 0, 0)
- try:
- exitcode = win32process.GetExitCodeProcess (dupproc)
- if exitcode == 0x103:
- kernel32 = win32api.GetModuleHandle ("kernel32")
- exitprocess = win32api.GetProcAddress (kernel32, "ExitProcess")
- th, tid = win32process.CreateRemoteThread (dupproc, None, 0,
exitprocess, code, 0)
- win32api.CloseHandle (th)
- result = True
- else:
- result = True
- # except failed to get exit code? failed to get module handle?
- finally:
- win32api.CloseHandle (dupproc)
- return result
- else:
- return proc.kill ()
+
+import sys
+import os
+import subprocess
+if os.name == 'nt':
+ import win32api
+ import win32process
+
+class dummyobj (object):
+ pass
+
+def safe_terminate_process_by_pid (pid, code):
+ if os.name == 'nt':
+ p = dummyobj ()
+ p._handle = win32api.OpenProcess (2 | 1024 | 8 | 32 | 16, 0, pid)
+ result = safe_terminate_process (p, code)
+ win32api.CloseHandle (p._handle)
+ return result
+ else:
+ return os.kill (int (pid), SIGKILL)
+
+def safe_terminate_process (proc, code):
+ if os.name == 'nt':
+ cp = win32api.GetCurrentProcess ()
+ result = False
+ dupproc = win32api.DuplicateHandle (cp, proc._handle, cp, 2 | 1024 | 8 |
32 | 16, 0, 0)
+ try:
+ exitcode = win32process.GetExitCodeProcess (dupproc)
+ if exitcode == 0x103:
+ kernel32 = win32api.GetModuleHandle ("kernel32")
+ exitprocess = win32api.GetProcAddress (kernel32, "ExitProcess")
+ th, tid = win32process.CreateRemoteThread (dupproc, None, 0,
exitprocess, code, 0)
+ win32api.CloseHandle (th)
+ result = True
+ else:
+ result = True
+ # except failed to get exit code? failed to get module handle?
+ finally:
+ win32api.CloseHandle (dupproc)
+ return result
+ else:
+ return proc.kill ()
Modified: gnunet/m4/ac_define_dir.m4
===================================================================
--- gnunet/m4/ac_define_dir.m4 2015-06-21 18:02:37 UTC (rev 35964)
+++ gnunet/m4/ac_define_dir.m4 2015-06-21 18:14:58 UTC (rev 35965)
@@ -1,35 +1,35 @@
-dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-dnl
-dnl This macro _AC_DEFINEs VARNAME to the expansion of the DIR
-dnl variable, taking care of fixing up ${prefix} and such.
-dnl
-dnl VARNAME is offered as both a C preprocessor symbol, and an output
-dnl variable.
-dnl
-dnl Note that the 3 argument form is only supported with autoconf 2.13
-dnl and later (i.e. only where _AC_DEFINE supports 3 arguments).
-dnl
-dnl Examples:
-dnl
-dnl AC_DEFINE_DIR(DATADIR, datadir)
-dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
-dnl
-dnl @category Misc
-dnl @author Stepan Kasal <address@hidden>
-dnl @author Andreas Schwab <address@hidden>
-dnl @author Guido Draheim <address@hidden>
-dnl @author Alexandre Oliva
-dnl @version 2005-01-17
-dnl @license AllPermissive
-
-AC_DEFUN([AC_DEFINE_DIR], [
- prefix_NONE=
- exec_prefix_NONE=
- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
- eval ac_define_dir="\"[$]$2\""
- AC_SUBST($1, "$ac_define_dir")
- AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
- test "$prefix_NONE" && prefix=NONE
- test "$exec_prefix_NONE" && exec_prefix=NONE
-])
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro _AC_DEFINEs VARNAME to the expansion of the DIR
+dnl variable, taking care of fixing up ${prefix} and such.
+dnl
+dnl VARNAME is offered as both a C preprocessor symbol, and an output
+dnl variable.
+dnl
+dnl Note that the 3 argument form is only supported with autoconf 2.13
+dnl and later (i.e. only where _AC_DEFINE supports 3 arguments).
+dnl
+dnl Examples:
+dnl
+dnl AC_DEFINE_DIR(DATADIR, datadir)
+dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries])
+dnl
+dnl @category Misc
+dnl @author Stepan Kasal <address@hidden>
+dnl @author Andreas Schwab <address@hidden>
+dnl @author Guido Draheim <address@hidden>
+dnl @author Alexandre Oliva
+dnl @version 2005-01-17
+dnl @license AllPermissive
+
+AC_DEFUN([AC_DEFINE_DIR], [
+ prefix_NONE=
+ exec_prefix_NONE=
+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+ eval ac_define_dir="\"[$]$2\""
+ AC_SUBST($1, "$ac_define_dir")
+ AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+ test "$prefix_NONE" && prefix=NONE
+ test "$exec_prefix_NONE" && exec_prefix=NONE
+])
Modified: gnunet/src/consensus/consensus-simulation.py
===================================================================
--- gnunet/src/consensus/consensus-simulation.py 2015-06-21 18:02:37 UTC
(rev 35964)
+++ gnunet/src/consensus/consensus-simulation.py 2015-06-21 18:14:58 UTC
(rev 35965)
@@ -1,103 +1,103 @@
-#!/usr/bin/python
-# This file is part of GNUnet
-# (C) 2013 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
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-# GNUnet is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-import argparse
-import random
-from math import ceil,log,floor
-
-def bsc(n):
- """ count the bits set in n"""
- l = n.bit_length()
- c = 0
- x = 1
- for _ in range(0, l):
- if n & x:
- c = c + 1
- x = x << 1
- return c
-
-def simulate(k, n, verbose):
- assert k < n
- largest_arc = int(2**ceil(log(n, 2))) / 2
- num_ghosts = (2 * largest_arc) - n
- if verbose:
- print "we have", num_ghosts, "ghost peers"
- # n.b. all peers with idx<k are evil
- peers = range(n)
- info = [1 << x for x in xrange(n)]
- def done_p():
- for x in xrange(k, n):
- if bsc(info[x]) < n-k:
- return False
- return True
- rounds = 0
- while not done_p():
- if verbose:
- print "-- round --"
- arc = 1
- while arc <= largest_arc:
- if verbose:
- print "-- subround --"
- new_info = [x for x in info]
- for peer_physical in xrange(n):
- peer_logical = peers[peer_physical]
- peer_type = None
- partner_logical = (peer_logical + arc) % n
- partner_physical = peers.index(partner_logical)
- if peer_physical < k or partner_physical < k:
- if verbose:
- print "bad peer in connection", peer_physical, "--",
partner_physical
- continue
- if peer_logical & arc == 0:
- # we are outgoing
- if verbose:
- print peer_physical, "connects to", partner_physical
- peer_type = "outgoing"
- if peer_logical < num_ghosts:
- # we have a ghost, check if the peer who connects
- # to our ghost is actually outgoing
- ghost_partner_logical = (peer_logical - arc) % n
- if ghost_partner_logical & arc == 0:
- peer_type = peer_type + ", ghost incoming"
- new_info[peer_physical] = new_info[peer_physical] |
info[peer_physical] | info[partner_physical]
- new_info[partner_physical] = new_info[partner_physical] |
info[peer_physical] | info[partner_physical]
- else:
- peer_type = "incoming"
- if verbose > 1:
- print "type of", str(peer_physical) + ":", peer_type
- info = new_info
- arc = arc << 1;
- rounds = rounds + 1
- random.shuffle(peers)
- return rounds
-
-if __name__ == "__main__":
- parser = argparse.ArgumentParser()
- parser.add_argument("k", metavar="k", type=int, help="#(bad peers)")
- parser.add_argument("n", metavar="n", type=int, help="#(all peers)")
- parser.add_argument("r", metavar="r", type=int, help="#(rounds)")
- parser.add_argument('--verbose', '-v', action='count')
-
- args = parser.parse_args()
- sum = 0.0;
- for n in xrange (0, args.r):
- sum += simulate(args.k, args.n, args.verbose)
- print sum / args.r;
-
-
+#!/usr/bin/python
+# This file is part of GNUnet
+# (C) 2013 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
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# 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., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import argparse
+import random
+from math import ceil,log,floor
+
+def bsc(n):
+ """ count the bits set in n"""
+ l = n.bit_length()
+ c = 0
+ x = 1
+ for _ in range(0, l):
+ if n & x:
+ c = c + 1
+ x = x << 1
+ return c
+
+def simulate(k, n, verbose):
+ assert k < n
+ largest_arc = int(2**ceil(log(n, 2))) / 2
+ num_ghosts = (2 * largest_arc) - n
+ if verbose:
+ print "we have", num_ghosts, "ghost peers"
+ # n.b. all peers with idx<k are evil
+ peers = range(n)
+ info = [1 << x for x in xrange(n)]
+ def done_p():
+ for x in xrange(k, n):
+ if bsc(info[x]) < n-k:
+ return False
+ return True
+ rounds = 0
+ while not done_p():
+ if verbose:
+ print "-- round --"
+ arc = 1
+ while arc <= largest_arc:
+ if verbose:
+ print "-- subround --"
+ new_info = [x for x in info]
+ for peer_physical in xrange(n):
+ peer_logical = peers[peer_physical]
+ peer_type = None
+ partner_logical = (peer_logical + arc) % n
+ partner_physical = peers.index(partner_logical)
+ if peer_physical < k or partner_physical < k:
+ if verbose:
+ print "bad peer in connection", peer_physical, "--",
partner_physical
+ continue
+ if peer_logical & arc == 0:
+ # we are outgoing
+ if verbose:
+ print peer_physical, "connects to", partner_physical
+ peer_type = "outgoing"
+ if peer_logical < num_ghosts:
+ # we have a ghost, check if the peer who connects
+ # to our ghost is actually outgoing
+ ghost_partner_logical = (peer_logical - arc) % n
+ if ghost_partner_logical & arc == 0:
+ peer_type = peer_type + ", ghost incoming"
+ new_info[peer_physical] = new_info[peer_physical] |
info[peer_physical] | info[partner_physical]
+ new_info[partner_physical] = new_info[partner_physical] |
info[peer_physical] | info[partner_physical]
+ else:
+ peer_type = "incoming"
+ if verbose > 1:
+ print "type of", str(peer_physical) + ":", peer_type
+ info = new_info
+ arc = arc << 1;
+ rounds = rounds + 1
+ random.shuffle(peers)
+ return rounds
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser()
+ parser.add_argument("k", metavar="k", type=int, help="#(bad peers)")
+ parser.add_argument("n", metavar="n", type=int, help="#(all peers)")
+ parser.add_argument("r", metavar="r", type=int, help="#(rounds)")
+ parser.add_argument('--verbose', '-v', action='count')
+
+ args = parser.parse_args()
+ sum = 0.0;
+ for n in xrange (0, args.r):
+ sum += simulate(args.k, args.n, args.verbose)
+ print sum / args.r;
+
+
Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am 2015-06-21 18:02:37 UTC (rev 35964)
+++ gnunet/src/dns/Makefile.am 2015-06-21 18:14:58 UTC (rev 35965)
@@ -1,126 +1,126 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
-
-if USE_COVERAGE
- AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
- dns.conf
-
-if LINUX
-HIJACKBIN = gnunet-helper-dns
-install-exec-hook:
- $(top_srcdir)/src/dns/install-dns-helper.sh $(libexecdir)
$(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
-else
-install-exec-hook:
-endif
-
-lib_LTLIBRARIES = \
- libgnunetdnsparser.la \
- libgnunetdnsstub.la \
- libgnunetdns.la
-
-libexec_PROGRAMS = \
- gnunet-service-dns $(HIJACKBIN)
-
-noinst_PROGRAMS = \
- gnunet-dns-monitor gnunet-dns-redirector
-
-plugin_LTLIBRARIES = \
- libgnunet_plugin_block_dns.la
-
-if LINUX
-check_SCRIPTS = \
- test_gnunet_dns.sh
-endif
-
-check_PROGRAMS = \
- test_hexcoder
-
-gnunet_helper_dns_SOURCES = \
- gnunet-helper-dns.c
-
-
-gnunet_dns_monitor_SOURCES = \
- gnunet-dns-monitor.c
-gnunet_dns_monitor_LDADD = \
- libgnunetdnsparser.la \
- libgnunetdns.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-gnunet_dns_redirector_SOURCES = \
- gnunet-dns-redirector.c
-gnunet_dns_redirector_LDADD = \
- libgnunetdnsparser.la \
- libgnunetdns.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c
-gnunet_service_dns_LDADD = \
- libgnunetdnsstub.la \
- $(top_builddir)/src/tun/libgnunettun.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-libgnunetdnsparser_la_SOURCES = \
- dnsparser.c
-libgnunetdnsparser_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
- -lidn
-libgnunetdnsparser_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 1:0:1
-
-libgnunetdnsstub_la_SOURCES = \
- dnsstub.c
-libgnunetdnsstub_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-libgnunetdnsstub_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-libgnunetdns_la_SOURCES = \
- dns_api.c dns.h
-libgnunetdns_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-libgnunetdns_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 0:0:0
-
-libgnunet_plugin_block_dns_la_SOURCES = \
- plugin_block_dns.c
-libgnunet_plugin_block_dns_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
-libgnunet_plugin_block_dns_la_LDFLAGS = \
- $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
-
-
-if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
-TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-endif
-
-EXTRA_DIST = \
- $(check_SCRIPTS)
-
-
-test_hexcoder_SOURCES = \
- test_hexcoder.c
-test_hexcoder_LDADD = \
- libgnunetdnsparser.la \
- $(top_builddir)/src/util/libgnunetutil.la
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+endif
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+pkgcfg_DATA = \
+ dns.conf
+
+if LINUX
+HIJACKBIN = gnunet-helper-dns
+install-exec-hook:
+ $(top_srcdir)/src/dns/install-dns-helper.sh $(libexecdir)
$(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
+else
+install-exec-hook:
+endif
+
+lib_LTLIBRARIES = \
+ libgnunetdnsparser.la \
+ libgnunetdnsstub.la \
+ libgnunetdns.la
+
+libexec_PROGRAMS = \
+ gnunet-service-dns $(HIJACKBIN)
+
+noinst_PROGRAMS = \
+ gnunet-dns-monitor gnunet-dns-redirector
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_block_dns.la
+
+if LINUX
+check_SCRIPTS = \
+ test_gnunet_dns.sh
+endif
+
+check_PROGRAMS = \
+ test_hexcoder
+
+gnunet_helper_dns_SOURCES = \
+ gnunet-helper-dns.c
+
+
+gnunet_dns_monitor_SOURCES = \
+ gnunet-dns-monitor.c
+gnunet_dns_monitor_LDADD = \
+ libgnunetdnsparser.la \
+ libgnunetdns.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_dns_redirector_SOURCES = \
+ gnunet-dns-redirector.c
+gnunet_dns_redirector_LDADD = \
+ libgnunetdnsparser.la \
+ libgnunetdns.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_service_dns_SOURCES = \
+ gnunet-service-dns.c
+gnunet_service_dns_LDADD = \
+ libgnunetdnsstub.la \
+ $(top_builddir)/src/tun/libgnunettun.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+libgnunetdnsparser_la_SOURCES = \
+ dnsparser.c
+libgnunetdnsparser_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
+ -lidn
+libgnunetdnsparser_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 1:0:1
+
+libgnunetdnsstub_la_SOURCES = \
+ dnsstub.c
+libgnunetdnsstub_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetdnsstub_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+libgnunetdns_la_SOURCES = \
+ dns_api.c dns.h
+libgnunetdns_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
+libgnunetdns_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+libgnunet_plugin_block_dns_la_SOURCES = \
+ plugin_block_dns.c
+libgnunet_plugin_block_dns_la_LIBADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_block_dns_la_LDFLAGS = \
+ $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
+
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
+endif
+
+EXTRA_DIST = \
+ $(check_SCRIPTS)
+
+
+test_hexcoder_SOURCES = \
+ test_hexcoder.c
+test_hexcoder_LDADD = \
+ libgnunetdnsparser.la \
+ $(top_builddir)/src/util/libgnunetutil.la
Modified: gnunet/src/integration-tests/gnunet_pyexpect.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_pyexpect.py.in 2015-06-21 18:02:37 UTC
(rev 35964)
+++ gnunet/src/integration-tests/gnunet_pyexpect.py.in 2015-06-21 18:14:58 UTC
(rev 35965)
@@ -1,83 +1,83 @@
address@hidden@
-# This file is part of GNUnet.
-# (C) 2010 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
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-# GNUnet is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-# Testcase for gnunet-peerinfo
-from __future__ import print_function
-import os
-import re
-import subprocess
-import sys
-import shutil
-import time
-
-class pexpect (object):
- def __init__ (self):
- super (pexpect, self).__init__ ()
-
- def spawn (self, stdin, arglist, *pargs, **kwargs):
- env = kwargs.pop ('env', None)
- if env is None:
- env = os.environ.copy ()
- # This messes up some testcases, disable log redirection
- env.pop ('GNUNET_FORCE_LOGFILE', None)
- self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs)
- if self.proc is None:
- print ("Failed to spawn a process {0}".format (arglist))
- sys.exit (1)
- if stdin is not None:
- self.stdo, self.stde = self.proc.communicate (stdin)
- else:
- self.stdo, self.stde = self.proc.communicate ()
- return self.proc
-
- def expect (self, s, r, flags=0):
- stream = self.stdo if s == 'stdout' else self.stde
- if isinstance (r, str):
- if r == "EOF":
- if len (stream) == 0:
- return True
- else:
- print ("Failed to find `{1}' in {0}, which is `{2}' ({3})".format
(s, r, stream, len (stream)))
- sys.exit (2)
- raise ValueError ("Argument `r' should be an instance of re.RegexObject
or a special string, but is `{0}'".format (r))
- m = r.search (stream, flags)
- if not m:
- print ("Failed to find `{1}' in {0}, which is is `{2}'".format (s,
r.pattern, stream))
- sys.exit (2)
- stream = stream[m.end ():]
- if s == 'stdout':
- self.stdo = stream
- else:
- self.stde = stream
- return m
-
- def read (self, s, size=-1):
- stream = self.stdo if s == 'stdout' else self.stde
- result = ""
- if size < 0:
- result = stream
- new_stream = ""
- else:
- result = stream[0:size]
- new_stream = stream[size:]
- if s == 'stdout':
- self.stdo = new_stream
- else:
- self.stde = new_stream
- return result
address@hidden@
+# This file is part of GNUnet.
+# (C) 2010 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
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# 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., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+# Testcase for gnunet-peerinfo
+from __future__ import print_function
+import os
+import re
+import subprocess
+import sys
+import shutil
+import time
+
+class pexpect (object):
+ def __init__ (self):
+ super (pexpect, self).__init__ ()
+
+ def spawn (self, stdin, arglist, *pargs, **kwargs):
+ env = kwargs.pop ('env', None)
+ if env is None:
+ env = os.environ.copy ()
+ # This messes up some testcases, disable log redirection
+ env.pop ('GNUNET_FORCE_LOGFILE', None)
+ self.proc = subprocess.Popen (arglist, *pargs, env=env, **kwargs)
+ if self.proc is None:
+ print ("Failed to spawn a process {0}".format (arglist))
+ sys.exit (1)
+ if stdin is not None:
+ self.stdo, self.stde = self.proc.communicate (stdin)
+ else:
+ self.stdo, self.stde = self.proc.communicate ()
+ return self.proc
+
+ def expect (self, s, r, flags=0):
+ stream = self.stdo if s == 'stdout' else self.stde
+ if isinstance (r, str):
+ if r == "EOF":
+ if len (stream) == 0:
+ return True
+ else:
+ print ("Failed to find `{1}' in {0}, which is `{2}' ({3})".format
(s, r, stream, len (stream)))
+ sys.exit (2)
+ raise ValueError ("Argument `r' should be an instance of re.RegexObject
or a special string, but is `{0}'".format (r))
+ m = r.search (stream, flags)
+ if not m:
+ print ("Failed to find `{1}' in {0}, which is is `{2}'".format (s,
r.pattern, stream))
+ sys.exit (2)
+ stream = stream[m.end ():]
+ if s == 'stdout':
+ self.stdo = stream
+ else:
+ self.stde = stream
+ return m
+
+ def read (self, s, size=-1):
+ stream = self.stdo if s == 'stdout' else self.stde
+ result = ""
+ if size < 0:
+ result = stream
+ new_stream = ""
+ else:
+ result = stream[0:size]
+ new_stream = stream[size:]
+ if s == 'stdout':
+ self.stdo = new_stream
+ else:
+ self.stde = new_stream
+ return result
Modified: gnunet/src/nat/test_stun.c
===================================================================
--- gnunet/src/nat/test_stun.c 2015-06-21 18:02:37 UTC (rev 35964)
+++ gnunet/src/nat/test_stun.c 2015-06-21 18:14:58 UTC (rev 35965)
@@ -1,514 +1,514 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2009, 2015 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * Testcase for STUN server resolution
- *
- * @file nat/test_stun.c
- * @brief Testcase for STUN library
- * @author Bruno Souza Cabral
- * @autor Mark Spencer (Original code borrowed from Asterisk)
- *
- */
-
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_nat_lib.h"
-
-
-#include "test_stun.h"
-
-
-/**
- * The port the test service is running on (default 7895)
- */
-static unsigned long port = 7895;
-
-static int ret = 1;
-
-/**
- * The listen socket of the service for IPv4
- */
-static struct GNUNET_NETWORK_Handle *lsock4;
-
-
-/**
- * The listen task ID for IPv4
- */
-static struct GNUNET_SCHEDULER_Task * ltask4;
-
-
-static char *stun_server = STUN_SERVER;
-static int stun_port = STUN_PORT;
-
-static int stun_debug = 1;
-
-
-struct stun_strings {
- const int value;
- const char *name;
-};
-
-
-static inline int stun_msg2class(int msg)
-{
- return ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
-}
-
-static inline int stun_msg2method(int msg)
-{
- return (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
-}
-
-static inline int stun_msg2type(int class, int method)
-{
- return ((class & 1) << 4) | ((class & 2) << 7) |
- (method & 0x000f) | ((method & 0x0070) << 1) | ((method & 0x0f800)
<< 2);
-}
-
-/* helper function to print message names */
-static const char *stun_msg2str(int msg)
-{
- static const struct stun_strings classes[] = {
- { STUN_REQUEST, "Request" },
- { STUN_INDICATION, "Indication" },
- { STUN_RESPONSE, "Response" },
- { STUN_ERROR_RESPONSE, "Error Response" },
- { 0, NULL }
-};
- static const struct stun_strings methods[] = {
- { STUN_BINDING, "Binding" },
- { 0, NULL }
-};
- static char result[32];
- const char *class = NULL, *method = NULL;
- int i, value;
-
- value = stun_msg2class(msg);
- for (i = 0; classes[i].name; i++) {
- class = classes[i].name;
- if (classes[i].value == value)
- break;
- }
- value = stun_msg2method(msg);
- for (i = 0; methods[i].name; i++) {
- method = methods[i].name;
- if (methods[i].value == value)
- break;
- }
- snprintf(result, sizeof(result), "%s %s",
- method ? : "Unknown Method",
- class ? : "Unknown Class Message");
- return result;
-}
-
-/* helper function to print attribute names */
-static const char *stun_attr2str(int msg)
-{
- static const struct stun_strings attrs[] = {
- { STUN_MAPPED_ADDRESS, "Mapped Address" },
- { STUN_RESPONSE_ADDRESS, "Response Address" },
- { STUN_CHANGE_ADDRESS, "Change Address" },
- { STUN_SOURCE_ADDRESS, "Source Address" },
- { STUN_CHANGED_ADDRESS, "Changed Address" },
- { STUN_USERNAME, "Username" },
- { STUN_PASSWORD, "Password" },
- { STUN_MESSAGE_INTEGRITY, "Message Integrity" },
- { STUN_ERROR_CODE, "Error Code" },
- { STUN_UNKNOWN_ATTRIBUTES, "Unknown Attributes" },
- { STUN_REFLECTED_FROM, "Reflected From" },
- { STUN_REALM, "Realm" },
- { STUN_NONCE, "Nonce" },
- { STUN_XOR_MAPPED_ADDRESS, "XOR Mapped Address" },
- { STUN_MS_VERSION, "MS Version" },
- { STUN_MS_XOR_MAPPED_ADDRESS, "MS XOR Mapped Address" },
- { STUN_SOFTWARE, "Software" },
- { STUN_ALTERNATE_SERVER, "Alternate Server" },
- { STUN_FINGERPRINT, "Fingerprint" },
- { 0, NULL }
-};
- int i;
-
- for (i = 0; attrs[i].name; i++) {
- if (attrs[i].value == msg)
- return attrs[i].name;
- }
- return "Unknown Attribute";
-}
-
-/* here we store credentials extracted from a message */
-struct stun_state {
- unsigned short attr;
-};
-
-static int stun_process_attr(struct stun_state *state, struct stun_attr *attr)
-{
- if (stun_debug)
- fprintf(stderr, "Found STUN Attribute %s (%04x), length %d\n",
- stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr),
ntohs(attr->len));
- switch (ntohs(attr->attr)) {
- case STUN_MAPPED_ADDRESS:
- case STUN_XOR_MAPPED_ADDRESS:
- case STUN_MS_XOR_MAPPED_ADDRESS:
- break;
- default:
- if (stun_debug)
- fprintf(stderr, "Ignoring STUN Attribute %s (%04x), length %d\n",
- stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr),
ntohs(attr->len));
- }
- return 0;
-}
-
-/* append a string to an STUN message */
-static void append_attr_string(struct stun_attr **attr, int attrval, const
char *s, int *len, int *left)
-{
- int str_length = strlen(s);
- int attr_length = str_length + ((~(str_length - 1)) & 0x3);
- int size = sizeof(**attr) + attr_length;
- if (*left > size) {
- (*attr)->attr = htons(attrval);
- (*attr)->len = htons(attr_length);
- memcpy((*attr)->value, s, str_length);
- memset((*attr)->value + str_length, 0, attr_length - str_length);
- (*attr) = (struct stun_attr *)((*attr)->value + attr_length);
- *len += size;
- *left -= size;
- }
-}
-
-
-/* helper function to generate a random request id */
-static void stun_req_id(struct stun_header *req)
-{
- int x;
- srand(time(0));
- req->magic = htonl(STUN_MAGIC_COOKIE);
- for (x = 0; x < 3; x++)
- req->id.id[x] = rand();
-}
-
-/* callback type to be invoked on stun responses. */
-typedef int (stun_cb_f)(struct stun_state *st, struct stun_attr *attr, void
*arg, unsigned int magic);
-
-/* handle an incoming STUN message.
- *
- * Do some basic sanity checks on packet size and content,
- * try to extract a bit of information, and possibly reply.
- * At the moment this only processes BIND requests, and returns
- * the externally visible address of the request.
- * If a callback is specified, invoke it with the attribute.
- */
-static int stun_handle_packet(unsigned char *data, size_t len, stun_cb_f
*stun_cb, void *arg)
-{
- struct stun_header *hdr = (struct stun_header *)data;
- struct stun_attr *attr;
- struct stun_state st;
- int ret = STUN_IGNORE;
- int x;
-
- /* On entry, 'len' is the length of the udp payload. After the
- * initial checks it becomes the size of unprocessed options,
- * while 'data' is advanced accordingly.
- */
- if (len < sizeof(struct stun_header)) {
- fprintf(stderr, "Runt STUN packet (only %d, wanting at least %d)\n",
(int) len, (int) sizeof(struct stun_header));
- return -1;
- }
- len -= sizeof(struct stun_header);
- data += sizeof(struct stun_header);
- x = ntohs(hdr->msglen); /* len as advertised in the message */
- if (stun_debug)
- fprintf(stderr, "STUN Packet, msg %s (%04x), length: %d\n",
stun_msg2str(ntohs(hdr->msgtype)), ntohs(hdr->msgtype), x);
- if (x > len) {
- fprintf(stderr, "Scrambled STUN packet length (got %d, expecting
%d)\n", x, (int)len);
- } else
- len = x;
- memset(&st,0, sizeof(st));
-
- while (len) {
- if (len < sizeof(struct stun_attr)) {
- fprintf(stderr, "Runt Attribute (got %d, expecting %d)\n",
(int)len, (int) sizeof(struct stun_attr));
- break;
- }
- attr = (struct stun_attr *)data;
-
- /* compute total attribute length */
- x = ntohs(attr->len) + sizeof(struct stun_attr);
- if (x > len) {
- fprintf(stderr, "Inconsistent Attribute (length %d exceeds
remaining msg len %d)\n", x, (int)len);
- break;
- }
- if (stun_cb)
- stun_cb(&st, attr, arg, hdr->magic);
- if (stun_process_attr(&st, attr)) {
- fprintf(stderr, "Failed to handle attribute %s (%04x)\n",
stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr));
- break;
- }
- /* Clear attribute id: in case previous entry was a string,
- * this will act as the terminator for the string.
- */
- attr->attr = 0;
- data += x;
- len -= x;
- }
- /* Null terminate any string.
- * XXX NOTE, we write past the size of the buffer passed by the
- * caller, so this is potentially dangerous. The only thing that
- * saves us is that usually we read the incoming message in a
- * much larger buffer
- */
- *data = '\0';
-
- return ret;
-}
-
-/* Extract the STUN_MAPPED_ADDRESS from the stun response.
- * This is used as a callback for stun_handle_response
- * when called from stun_request.
- */
-static int stun_get_mapped(struct stun_state *st, struct stun_attr *attr, void
*arg, unsigned int magic)
-{
- struct stun_addr *returned_addr = (struct stun_addr *)(attr + 1);
- struct sockaddr_in *sa = (struct sockaddr_in *)arg;
- unsigned short type = ntohs(attr->attr);
-
- switch (type) {
- case STUN_MAPPED_ADDRESS:
- if (st->attr == STUN_XOR_MAPPED_ADDRESS ||
- st->attr == STUN_MS_XOR_MAPPED_ADDRESS)
- return 1;
- magic = 0;
- break;
- case STUN_MS_XOR_MAPPED_ADDRESS:
- if (st->attr == STUN_XOR_MAPPED_ADDRESS)
- return 1;
- break;
- case STUN_XOR_MAPPED_ADDRESS:
- break;
- default:
- return 1;
- }
- if (ntohs(attr->len) < 8 && returned_addr->family != 1)
- return 1;
-
- st->attr = type;
- sa->sin_port = returned_addr->port ^ htons(ntohl(magic) >> 16);
- sa->sin_addr.s_addr = returned_addr->addr ^ magic;
- return 0;
-}
-
-/* Generic STUN request
- * Send a generic stun request to the server specified,
- * possibly waiting for a reply and filling the 'reply' field with
- * the externally visible address.
-
- * \param s the socket used to send the request
- * \return 0 on success, other values on error.
- */
-int stun_request(struct GNUNET_NETWORK_Handle * sock)
-{
- struct stun_header *req;
- unsigned char reqdata[1024];
- int reqlen, reqleft;
- struct stun_attr *attr;
-
-
-
-
- struct sockaddr_in server;
- struct hostent *hostinfo = gethostbyname(stun_server);
- if (!hostinfo) {
- fprintf(stderr, "Error resolving host %s\n", stun_server);
- return -1;
- }
- memset(&server,0, sizeof(server));
- server.sin_family = AF_INET;
- server.sin_addr = *(struct in_addr*) hostinfo->h_addr;
- server.sin_port = htons(stun_port);
-
-
-
- req = (struct stun_header *)reqdata;
- stun_req_id(req);
- reqlen = 0;
- reqleft = sizeof(reqdata) - sizeof(struct stun_header);
- req->msgtype = 0;
- req->msglen = 0;
- attr = (struct stun_attr *)req->ies;
-
- append_attr_string(&attr, STUN_SOFTWARE, PACKAGE " v" VERSION_PACKAGE,
&reqlen, &reqleft);
- req->msglen = htons(reqlen);
- req->msgtype = htons(stun_msg2type(STUN_REQUEST, STUN_BINDING));
-
-
- if (-1 == GNUNET_NETWORK_socket_sendto (sock, req, ntohs(req->msglen) +
sizeof(*req),
- (const struct sockaddr *) &server, sizeof
(server)))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "sendto");
- }
-
- return -1;
-}
-
-static void print_answer(struct sockaddr_in* answer)
-{
- printf("External IP is: %s , with port %d\n",
inet_ntoa(answer->sin_addr), ntohs(answer->sin_port));
-}
-
-
-/**
- * Activity on our incoming socket. Read data from the
- * incoming connection.
- *
- * @param cls
- * @param tc scheduler context
- */
-static void
-do_udp_read (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- //struct GNUNET_NAT_Test *tst = cls;
- unsigned char reply_buf[1024];
- ssize_t rlen;
- struct sockaddr_in answer;
-
-
- if ((0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
- (GNUNET_NETWORK_fdset_isset (tc->read_ready,
- lsock4)))
- {
- rlen = GNUNET_NETWORK_socket_recv (lsock4, reply_buf, sizeof
(reply_buf));
- printf("Recivied something of size %d", rlen);
-
- //Lets handle the packet
- memset(&answer, 0, sizeof(struct sockaddr_in));
- stun_handle_packet(reply_buf, rlen, stun_get_mapped, &answer);
- //Print the anser
- //TODO: Delete the object
- ret = 0;
- print_answer(&answer);
-
-
- }
-}
-
-
-/**
- * Create an IPv4 listen socket bound to our port.
- *
- * @return NULL on error
- */
-static struct GNUNET_NETWORK_Handle *
- bind_v4 ()
-{
- struct GNUNET_NETWORK_Handle *ls;
- struct sockaddr_in sa4;
- int eno;
-
- memset (&sa4, 0, sizeof (sa4));
- sa4.sin_family = AF_INET;
- sa4.sin_port = htons (port);
-#if HAVE_SOCKADDR_IN_SIN_LEN
- sa4.sin_len = sizeof (sa4);
-#endif
- ls = GNUNET_NETWORK_socket_create (AF_INET,
- SOCK_DGRAM,
- 0);
- if (NULL == ls)
- return NULL;
- if (GNUNET_OK !=
- GNUNET_NETWORK_socket_bind (ls, (const struct sockaddr *) &sa4,
- sizeof (sa4)))
- {
- eno = errno;
- GNUNET_NETWORK_socket_close (ls);
- errno = eno;
- return NULL;
- }
- return ls;
-}
-
-
-
-/**
- * Main function run with scheduler.
- */
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-
-
- //Lets create the socket
- lsock4 = bind_v4 ();
- if (NULL == lsock4)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
- }
- else
- {
- printf("Binded, now will call add_read\n");
- //Lets call our function now when it accepts
- ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
- lsock4, &do_udp_read, NULL);
-
- }
- if(NULL == lsock4 )
- {
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Service listens on port %u\n",
- port);
- printf("Start main event\n");
- stun_request(lsock4);
- //Main event
- //main_task = GNUNET_SCHEDULER_add_delayed (timeout, &do_timeout, nh);
-
-}
-
-
-int
-main (int argc, char *const argv[])
-{
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- char *const argv_prog[] = {
- "test-stun",
- NULL
- };
- GNUNET_log_setup ("test-stun",
- "WARNING",
- NULL);
-
- GNUNET_PROGRAM_run (1, argv_prog, "test-stun", "nohelp", options, &run,
NULL);
-
- return ret;
-}
-
-/* end of test_nat.c */
+/*
+ This file is part of GNUnet.
+ Copyright (C) 2009, 2015 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
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * Testcase for STUN server resolution
+ *
+ * @file nat/test_stun.c
+ * @brief Testcase for STUN library
+ * @author Bruno Souza Cabral
+ * @autor Mark Spencer (Original code borrowed from Asterisk)
+ *
+ */
+
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_program_lib.h"
+#include "gnunet_scheduler_lib.h"
+#include "gnunet_nat_lib.h"
+
+
+#include "test_stun.h"
+
+
+/**
+ * The port the test service is running on (default 7895)
+ */
+static unsigned long port = 7895;
+
+static int ret = 1;
+
+/**
+ * The listen socket of the service for IPv4
+ */
+static struct GNUNET_NETWORK_Handle *lsock4;
+
+
+/**
+ * The listen task ID for IPv4
+ */
+static struct GNUNET_SCHEDULER_Task * ltask4;
+
+
+static char *stun_server = STUN_SERVER;
+static int stun_port = STUN_PORT;
+
+static int stun_debug = 1;
+
+
+struct stun_strings {
+ const int value;
+ const char *name;
+};
+
+
+static inline int stun_msg2class(int msg)
+{
+ return ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
+}
+
+static inline int stun_msg2method(int msg)
+{
+ return (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
+}
+
+static inline int stun_msg2type(int class, int method)
+{
+ return ((class & 1) << 4) | ((class & 2) << 7) |
+ (method & 0x000f) | ((method & 0x0070) << 1) | ((method & 0x0f800)
<< 2);
+}
+
+/* helper function to print message names */
+static const char *stun_msg2str(int msg)
+{
+ static const struct stun_strings classes[] = {
+ { STUN_REQUEST, "Request" },
+ { STUN_INDICATION, "Indication" },
+ { STUN_RESPONSE, "Response" },
+ { STUN_ERROR_RESPONSE, "Error Response" },
+ { 0, NULL }
+};
+ static const struct stun_strings methods[] = {
+ { STUN_BINDING, "Binding" },
+ { 0, NULL }
+};
+ static char result[32];
+ const char *class = NULL, *method = NULL;
+ int i, value;
+
+ value = stun_msg2class(msg);
+ for (i = 0; classes[i].name; i++) {
+ class = classes[i].name;
+ if (classes[i].value == value)
+ break;
+ }
+ value = stun_msg2method(msg);
+ for (i = 0; methods[i].name; i++) {
+ method = methods[i].name;
+ if (methods[i].value == value)
+ break;
+ }
+ snprintf(result, sizeof(result), "%s %s",
+ method ? : "Unknown Method",
+ class ? : "Unknown Class Message");
+ return result;
+}
+
+/* helper function to print attribute names */
+static const char *stun_attr2str(int msg)
+{
+ static const struct stun_strings attrs[] = {
+ { STUN_MAPPED_ADDRESS, "Mapped Address" },
+ { STUN_RESPONSE_ADDRESS, "Response Address" },
+ { STUN_CHANGE_ADDRESS, "Change Address" },
+ { STUN_SOURCE_ADDRESS, "Source Address" },
+ { STUN_CHANGED_ADDRESS, "Changed Address" },
+ { STUN_USERNAME, "Username" },
+ { STUN_PASSWORD, "Password" },
+ { STUN_MESSAGE_INTEGRITY, "Message Integrity" },
+ { STUN_ERROR_CODE, "Error Code" },
+ { STUN_UNKNOWN_ATTRIBUTES, "Unknown Attributes" },
+ { STUN_REFLECTED_FROM, "Reflected From" },
+ { STUN_REALM, "Realm" },
+ { STUN_NONCE, "Nonce" },
+ { STUN_XOR_MAPPED_ADDRESS, "XOR Mapped Address" },
+ { STUN_MS_VERSION, "MS Version" },
+ { STUN_MS_XOR_MAPPED_ADDRESS, "MS XOR Mapped Address" },
+ { STUN_SOFTWARE, "Software" },
+ { STUN_ALTERNATE_SERVER, "Alternate Server" },
+ { STUN_FINGERPRINT, "Fingerprint" },
+ { 0, NULL }
+};
+ int i;
+
+ for (i = 0; attrs[i].name; i++) {
+ if (attrs[i].value == msg)
+ return attrs[i].name;
+ }
+ return "Unknown Attribute";
+}
+
+/* here we store credentials extracted from a message */
+struct stun_state {
+ unsigned short attr;
+};
+
+static int stun_process_attr(struct stun_state *state, struct stun_attr *attr)
+{
+ if (stun_debug)
+ fprintf(stderr, "Found STUN Attribute %s (%04x), length %d\n",
+ stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr),
ntohs(attr->len));
+ switch (ntohs(attr->attr)) {
+ case STUN_MAPPED_ADDRESS:
+ case STUN_XOR_MAPPED_ADDRESS:
+ case STUN_MS_XOR_MAPPED_ADDRESS:
+ break;
+ default:
+ if (stun_debug)
+ fprintf(stderr, "Ignoring STUN Attribute %s (%04x), length %d\n",
+ stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr),
ntohs(attr->len));
+ }
+ return 0;
+}
+
+/* append a string to an STUN message */
+static void append_attr_string(struct stun_attr **attr, int attrval, const
char *s, int *len, int *left)
+{
+ int str_length = strlen(s);
+ int attr_length = str_length + ((~(str_length - 1)) & 0x3);
+ int size = sizeof(**attr) + attr_length;
+ if (*left > size) {
+ (*attr)->attr = htons(attrval);
+ (*attr)->len = htons(attr_length);
+ memcpy((*attr)->value, s, str_length);
+ memset((*attr)->value + str_length, 0, attr_length - str_length);
+ (*attr) = (struct stun_attr *)((*attr)->value + attr_length);
+ *len += size;
+ *left -= size;
+ }
+}
+
+
+/* helper function to generate a random request id */
+static void stun_req_id(struct stun_header *req)
+{
+ int x;
+ srand(time(0));
+ req->magic = htonl(STUN_MAGIC_COOKIE);
+ for (x = 0; x < 3; x++)
+ req->id.id[x] = rand();
+}
+
+/* callback type to be invoked on stun responses. */
+typedef int (stun_cb_f)(struct stun_state *st, struct stun_attr *attr, void
*arg, unsigned int magic);
+
+/* handle an incoming STUN message.
+ *
+ * Do some basic sanity checks on packet size and content,
+ * try to extract a bit of information, and possibly reply.
+ * At the moment this only processes BIND requests, and returns
+ * the externally visible address of the request.
+ * If a callback is specified, invoke it with the attribute.
+ */
+static int stun_handle_packet(unsigned char *data, size_t len, stun_cb_f
*stun_cb, void *arg)
+{
+ struct stun_header *hdr = (struct stun_header *)data;
+ struct stun_attr *attr;
+ struct stun_state st;
+ int ret = STUN_IGNORE;
+ int x;
+
+ /* On entry, 'len' is the length of the udp payload. After the
+ * initial checks it becomes the size of unprocessed options,
+ * while 'data' is advanced accordingly.
+ */
+ if (len < sizeof(struct stun_header)) {
+ fprintf(stderr, "Runt STUN packet (only %d, wanting at least %d)\n",
(int) len, (int) sizeof(struct stun_header));
+ return -1;
+ }
+ len -= sizeof(struct stun_header);
+ data += sizeof(struct stun_header);
+ x = ntohs(hdr->msglen); /* len as advertised in the message */
+ if (stun_debug)
+ fprintf(stderr, "STUN Packet, msg %s (%04x), length: %d\n",
stun_msg2str(ntohs(hdr->msgtype)), ntohs(hdr->msgtype), x);
+ if (x > len) {
+ fprintf(stderr, "Scrambled STUN packet length (got %d, expecting
%d)\n", x, (int)len);
+ } else
+ len = x;
+ memset(&st,0, sizeof(st));
+
+ while (len) {
+ if (len < sizeof(struct stun_attr)) {
+ fprintf(stderr, "Runt Attribute (got %d, expecting %d)\n",
(int)len, (int) sizeof(struct stun_attr));
+ break;
+ }
+ attr = (struct stun_attr *)data;
+
+ /* compute total attribute length */
+ x = ntohs(attr->len) + sizeof(struct stun_attr);
+ if (x > len) {
+ fprintf(stderr, "Inconsistent Attribute (length %d exceeds
remaining msg len %d)\n", x, (int)len);
+ break;
+ }
+ if (stun_cb)
+ stun_cb(&st, attr, arg, hdr->magic);
+ if (stun_process_attr(&st, attr)) {
+ fprintf(stderr, "Failed to handle attribute %s (%04x)\n",
stun_attr2str(ntohs(attr->attr)), ntohs(attr->attr));
+ break;
+ }
+ /* Clear attribute id: in case previous entry was a string,
+ * this will act as the terminator for the string.
+ */
+ attr->attr = 0;
+ data += x;
+ len -= x;
+ }
+ /* Null terminate any string.
+ * XXX NOTE, we write past the size of the buffer passed by the
+ * caller, so this is potentially dangerous. The only thing that
+ * saves us is that usually we read the incoming message in a
+ * much larger buffer
+ */
+ *data = '\0';
+
+ return ret;
+}
+
+/* Extract the STUN_MAPPED_ADDRESS from the stun response.
+ * This is used as a callback for stun_handle_response
+ * when called from stun_request.
+ */
+static int stun_get_mapped(struct stun_state *st, struct stun_attr *attr, void
*arg, unsigned int magic)
+{
+ struct stun_addr *returned_addr = (struct stun_addr *)(attr + 1);
+ struct sockaddr_in *sa = (struct sockaddr_in *)arg;
+ unsigned short type = ntohs(attr->attr);
+
+ switch (type) {
+ case STUN_MAPPED_ADDRESS:
+ if (st->attr == STUN_XOR_MAPPED_ADDRESS ||
+ st->attr == STUN_MS_XOR_MAPPED_ADDRESS)
+ return 1;
+ magic = 0;
+ break;
+ case STUN_MS_XOR_MAPPED_ADDRESS:
+ if (st->attr == STUN_XOR_MAPPED_ADDRESS)
+ return 1;
+ break;
+ case STUN_XOR_MAPPED_ADDRESS:
+ break;
+ default:
+ return 1;
+ }
+ if (ntohs(attr->len) < 8 && returned_addr->family != 1)
+ return 1;
+
+ st->attr = type;
+ sa->sin_port = returned_addr->port ^ htons(ntohl(magic) >> 16);
+ sa->sin_addr.s_addr = returned_addr->addr ^ magic;
+ return 0;
+}
+
+/* Generic STUN request
+ * Send a generic stun request to the server specified,
+ * possibly waiting for a reply and filling the 'reply' field with
+ * the externally visible address.
+
+ * \param s the socket used to send the request
+ * \return 0 on success, other values on error.
+ */
+int stun_request(struct GNUNET_NETWORK_Handle * sock)
+{
+ struct stun_header *req;
+ unsigned char reqdata[1024];
+ int reqlen, reqleft;
+ struct stun_attr *attr;
+
+
+
+
+ struct sockaddr_in server;
+ struct hostent *hostinfo = gethostbyname(stun_server);
+ if (!hostinfo) {
+ fprintf(stderr, "Error resolving host %s\n", stun_server);
+ return -1;
+ }
+ memset(&server,0, sizeof(server));
+ server.sin_family = AF_INET;
+ server.sin_addr = *(struct in_addr*) hostinfo->h_addr;
+ server.sin_port = htons(stun_port);
+
+
+
+ req = (struct stun_header *)reqdata;
+ stun_req_id(req);
+ reqlen = 0;
+ reqleft = sizeof(reqdata) - sizeof(struct stun_header);
+ req->msgtype = 0;
+ req->msglen = 0;
+ attr = (struct stun_attr *)req->ies;
+
+ append_attr_string(&attr, STUN_SOFTWARE, PACKAGE " v" VERSION_PACKAGE,
&reqlen, &reqleft);
+ req->msglen = htons(reqlen);
+ req->msgtype = htons(stun_msg2type(STUN_REQUEST, STUN_BINDING));
+
+
+ if (-1 == GNUNET_NETWORK_socket_sendto (sock, req, ntohs(req->msglen) +
sizeof(*req),
+ (const struct sockaddr *) &server, sizeof
(server)))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "sendto");
+ }
+
+ return -1;
+}
+
+static void print_answer(struct sockaddr_in* answer)
+{
+ printf("External IP is: %s , with port %d\n",
inet_ntoa(answer->sin_addr), ntohs(answer->sin_port));
+}
+
+
+/**
+ * Activity on our incoming socket. Read data from the
+ * incoming connection.
+ *
+ * @param cls
+ * @param tc scheduler context
+ */
+static void
+do_udp_read (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ //struct GNUNET_NAT_Test *tst = cls;
+ unsigned char reply_buf[1024];
+ ssize_t rlen;
+ struct sockaddr_in answer;
+
+
+ if ((0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
+ (GNUNET_NETWORK_fdset_isset (tc->read_ready,
+ lsock4)))
+ {
+ rlen = GNUNET_NETWORK_socket_recv (lsock4, reply_buf, sizeof
(reply_buf));
+ printf("Recivied something of size %d", rlen);
+
+ //Lets handle the packet
+ memset(&answer, 0, sizeof(struct sockaddr_in));
+ stun_handle_packet(reply_buf, rlen, stun_get_mapped, &answer);
+ //Print the anser
+ //TODO: Delete the object
+ ret = 0;
+ print_answer(&answer);
+
+
+ }
+}
+
+
+/**
+ * Create an IPv4 listen socket bound to our port.
+ *
+ * @return NULL on error
+ */
+static struct GNUNET_NETWORK_Handle *
+ bind_v4 ()
+{
+ struct GNUNET_NETWORK_Handle *ls;
+ struct sockaddr_in sa4;
+ int eno;
+
+ memset (&sa4, 0, sizeof (sa4));
+ sa4.sin_family = AF_INET;
+ sa4.sin_port = htons (port);
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ sa4.sin_len = sizeof (sa4);
+#endif
+ ls = GNUNET_NETWORK_socket_create (AF_INET,
+ SOCK_DGRAM,
+ 0);
+ if (NULL == ls)
+ return NULL;
+ if (GNUNET_OK !=
+ GNUNET_NETWORK_socket_bind (ls, (const struct sockaddr *) &sa4,
+ sizeof (sa4)))
+ {
+ eno = errno;
+ GNUNET_NETWORK_socket_close (ls);
+ errno = eno;
+ return NULL;
+ }
+ return ls;
+}
+
+
+
+/**
+ * Main function run with scheduler.
+ */
+
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+
+
+ //Lets create the socket
+ lsock4 = bind_v4 ();
+ if (NULL == lsock4)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
+ }
+ else
+ {
+ printf("Binded, now will call add_read\n");
+ //Lets call our function now when it accepts
+ ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
+ lsock4, &do_udp_read, NULL);
+
+ }
+ if(NULL == lsock4 )
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Service listens on port %u\n",
+ port);
+ printf("Start main event\n");
+ stun_request(lsock4);
+ //Main event
+ //main_task = GNUNET_SCHEDULER_add_delayed (timeout, &do_timeout, nh);
+
+}
+
+
+int
+main (int argc, char *const argv[])
+{
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ char *const argv_prog[] = {
+ "test-stun",
+ NULL
+ };
+ GNUNET_log_setup ("test-stun",
+ "WARNING",
+ NULL);
+
+ GNUNET_PROGRAM_run (1, argv_prog, "test-stun", "nohelp", options, &run,
NULL);
+
+ return ret;
+}
+
+/* end of test_nat.c */
Modified: gnunet/src/nat/test_stun.h
===================================================================
--- gnunet/src/nat/test_stun.h 2015-06-21 18:02:37 UTC (rev 35964)
+++ gnunet/src/nat/test_stun.h 2015-06-21 18:14:58 UTC (rev 35965)
@@ -1,108 +1,108 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2009, 2015 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * Testcase for STUN server resolution
- *
- * @file nat/test_stun.h
- * @brief Testcase for STUN library
- * @author Bruno Souza Cabral
- * @autor Mark Spencer (Original code borrowed from Asterisk)
- *
- */
-
-#define PACKAGE "gnunet"
-#define VERSION_PACKAGE "0.4"
-
-#define STUN_SERVER "stun.services.mozilla.com"
-#define STUN_PORT 3478
-#define STUN_COUNT 3
-#define STUN_RTO 500 /* ms */
-#define STUN_MRC 3
-
-typedef struct { unsigned int id[3]; } __attribute__((packed)) stun_trans_id;
-
-struct stun_header {
- unsigned short msgtype;
- unsigned short msglen;
- unsigned int magic;
- stun_trans_id id;
- unsigned char ies[0];
-} __attribute__((packed));
-
-struct stun_attr {
- unsigned short attr;
- unsigned short len;
- unsigned char value[0];
-} __attribute__((packed));
-
-/*
- * The format normally used for addresses carried by STUN messages.
- */
-struct stun_addr {
- unsigned char unused;
- unsigned char family;
- unsigned short port;
- unsigned int addr;
-} __attribute__((packed));
-
-#define STUN_IGNORE (0)
-#define STUN_ACCEPT (1)
-
-#define STUN_MAGIC_COOKIE 0x2112A442
-
-/* STUN message classes */
-#define STUN_REQUEST 0x0000
-#define STUN_INDICATION 0x0001
-#define STUN_RESPONSE 0x0002
-#define STUN_ERROR_RESPONSE 0x0003
-
-/* STUN message methods */
-#define STUN_BINDING 0x0001
-#define STUN_SHARED_SECRET 0x0002
-#define STUN_ALLOCATE 0x0003
-#define STUN_REFRESH 0x0004
-#define STUN_SEND 0x0006
-#define STUN_DATA 0x0007
-#define STUN_CREATE_PERMISSION 0x0008
-#define STUN_CHANNEL_BIND 0x0009
-
-/* Basic attribute types in stun messages.
- * Messages can also contain custom attributes (codes above 0x7fff)
- */
-#define STUN_MAPPED_ADDRESS 0x0001
-#define STUN_RESPONSE_ADDRESS 0x0002
-#define STUN_CHANGE_ADDRESS 0x0003
-#define STUN_SOURCE_ADDRESS 0x0004
-#define STUN_CHANGED_ADDRESS 0x0005
-#define STUN_USERNAME 0x0006
-#define STUN_PASSWORD 0x0007
-#define STUN_MESSAGE_INTEGRITY 0x0008
-#define STUN_ERROR_CODE 0x0009
-#define STUN_UNKNOWN_ATTRIBUTES 0x000a
-#define STUN_REFLECTED_FROM 0x000b
-#define STUN_REALM 0x0014
-#define STUN_NONCE 0x0015
-#define STUN_XOR_MAPPED_ADDRESS 0x0020
-#define STUN_MS_VERSION 0x8008
-#define STUN_MS_XOR_MAPPED_ADDRESS 0x8020
-#define STUN_SOFTWARE 0x8022
-#define STUN_ALTERNATE_SERVER 0x8023
-#define STUN_FINGERPRINT 0x8028
+/*
+ This file is part of GNUnet.
+ Copyright (C) 2009, 2015 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
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * Testcase for STUN server resolution
+ *
+ * @file nat/test_stun.h
+ * @brief Testcase for STUN library
+ * @author Bruno Souza Cabral
+ * @autor Mark Spencer (Original code borrowed from Asterisk)
+ *
+ */
+
+#define PACKAGE "gnunet"
+#define VERSION_PACKAGE "0.4"
+
+#define STUN_SERVER "stun.services.mozilla.com"
+#define STUN_PORT 3478
+#define STUN_COUNT 3
+#define STUN_RTO 500 /* ms */
+#define STUN_MRC 3
+
+typedef struct { unsigned int id[3]; } __attribute__((packed)) stun_trans_id;
+
+struct stun_header {
+ unsigned short msgtype;
+ unsigned short msglen;
+ unsigned int magic;
+ stun_trans_id id;
+ unsigned char ies[0];
+} __attribute__((packed));
+
+struct stun_attr {
+ unsigned short attr;
+ unsigned short len;
+ unsigned char value[0];
+} __attribute__((packed));
+
+/*
+ * The format normally used for addresses carried by STUN messages.
+ */
+struct stun_addr {
+ unsigned char unused;
+ unsigned char family;
+ unsigned short port;
+ unsigned int addr;
+} __attribute__((packed));
+
+#define STUN_IGNORE (0)
+#define STUN_ACCEPT (1)
+
+#define STUN_MAGIC_COOKIE 0x2112A442
+
+/* STUN message classes */
+#define STUN_REQUEST 0x0000
+#define STUN_INDICATION 0x0001
+#define STUN_RESPONSE 0x0002
+#define STUN_ERROR_RESPONSE 0x0003
+
+/* STUN message methods */
+#define STUN_BINDING 0x0001
+#define STUN_SHARED_SECRET 0x0002
+#define STUN_ALLOCATE 0x0003
+#define STUN_REFRESH 0x0004
+#define STUN_SEND 0x0006
+#define STUN_DATA 0x0007
+#define STUN_CREATE_PERMISSION 0x0008
+#define STUN_CHANNEL_BIND 0x0009
+
+/* Basic attribute types in stun messages.
+ * Messages can also contain custom attributes (codes above 0x7fff)
+ */
+#define STUN_MAPPED_ADDRESS 0x0001
+#define STUN_RESPONSE_ADDRESS 0x0002
+#define STUN_CHANGE_ADDRESS 0x0003
+#define STUN_SOURCE_ADDRESS 0x0004
+#define STUN_CHANGED_ADDRESS 0x0005
+#define STUN_USERNAME 0x0006
+#define STUN_PASSWORD 0x0007
+#define STUN_MESSAGE_INTEGRITY 0x0008
+#define STUN_ERROR_CODE 0x0009
+#define STUN_UNKNOWN_ATTRIBUTES 0x000a
+#define STUN_REFLECTED_FROM 0x000b
+#define STUN_REALM 0x0014
+#define STUN_NONCE 0x0015
+#define STUN_XOR_MAPPED_ADDRESS 0x0020
+#define STUN_MS_VERSION 0x8008
+#define STUN_MS_XOR_MAPPED_ADDRESS 0x8020
+#define STUN_SOFTWARE 0x8022
+#define STUN_ALTERNATE_SERVER 0x8023
+#define STUN_FINGERPRINT 0x8028
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35965 - in gnunet: contrib m4 src/consensus src/dns src/integration-tests src/nat,
gnunet <=