[GNUnet-SVN] r13456 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2010-10-29 15:12:04 +0200 (Fri, 29 Oct 2010)
New Revision: 13456

Added:
   gnunet/src/transport/test_quota_compliance_udp_peer1.conf
   gnunet/src/transport/test_quota_compliance_udp_peer2.conf
Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/test_quota_compliance.c
Log:
and quota compliance for udp


Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2010-10-29 12:44:17 UTC (rev 13455)
+++ gnunet/src/transport/Makefile.am    2010-10-29 13:12:04 UTC (rev 13456)
@@ -203,7 +203,8 @@
  $(HTTPS_REL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_http \
- test_quota_compliance_https
+ test_quota_compliance_https \
+ test_quota_compliance_udp
 # TODO: add tests for nat, etc.
 
 if !DISABLE_TEST_RUN
@@ -222,7 +223,8 @@
  $(HTTPS_REL_TEST) \
  test_quota_compliance_tcp \
  test_quota_compliance_http \
- test_quota_compliance_https
+ test_quota_compliance_https \
+ test_quota_compliance_udp
 endif
 
 test_transport_api_tcp_SOURCES = \
@@ -327,6 +329,12 @@
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_quota_compliance_udp_SOURCES = \
+ test_quota_compliance.c
+test_quota_compliance_udp_LDADD = \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 endif
 
 EXTRA_DIST = \

Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c        2010-10-29 12:44:17 UTC 
(rev 13455)
+++ gnunet/src/transport/test_quota_compliance.c        2010-10-29 13:12:04 UTC 
(rev 13456)
@@ -595,8 +595,8 @@
     }
   else if (is_udp)
     {
-      setup_peer (&p1, "test_quota_compliance_tcp_peer1.conf");
-      setup_peer (&p2, "test_quota_compliance_tcp_peer2.conf");
+      setup_peer (&p1, "test_quota_compliance_udp_peer1.conf");
+      setup_peer (&p2, "test_quota_compliance_udp_peer2.conf");
     }
   else if (is_tcp_nat)
     {

Added: gnunet/src/transport/test_quota_compliance_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer1.conf                   
        (rev 0)
+++ gnunet/src/transport/test_quota_compliance_udp_peer1.conf   2010-10-29 
13:12:04 UTC (rev 13456)
@@ -0,0 +1,104 @@
+[PATHS]
+SERVICEHOME = /tmp/test_quota_compliance_peer1/
+DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[hostlist]
+HTTP-PROXY = 
+SERVERS = http://gnunet.org:8080/
+OPTIONS = -b
+BINARY = gnunet-daemon-hostlist
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+HTTPPORT = 8080
+
+[topology]
+BINARY = gnunet-daemon-topology
+CONFIG = $DEFAULTCONFIG
+FRIENDS = $SERVICEHOME/friends
+TARGET-CONNECTION-COUNT = 16
+AUTOCONNECT = YES
+FRIENDS-ONLY = NO
+MINIMUM-FRIENDS = 0
+
+[core]
+AUTOSTART = NO
+
+[transport-udp]
+PORT = 4368
+
+
+[transport]
+plugins = udp
+#DEBUG = YES
+PREFIX = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+BINARY = gnunet-service-transport
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 4091
+UNIXPATH = 
/tmp/test_quota_compliance_peer1/test_quota_compliance_transport_peer1.sock
+
+[peerinfo]
+TRUST = $SERVICEHOME/data/credit/
+HOSTS = $SERVICEHOME/data/hosts/
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-peerinfo
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 4090
+UNIXPATH = 
/tmp/test_quota_compliance_peer1/test_quota_compliance_peerinfo_peer1.sock
+
+[resolver]
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-resolver
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 4089
+UNIXPATH = 
/tmp/test_quota_compliance_peer1/test_quota_compliance_resolver_peer1.sock
+
+[statistics]
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-statistics
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 4088
+UNIXPATH = 
/tmp/test_quota_compliance_peer1/test_quota_compliance_statistics_peer1.sock
+
+[arm]
+DEFAULTSERVICES = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-arm
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 4087
+UNIXPATH = 
/tmp/test_quota_compliance_peer1/test_quota_compliance_arm_peer1.sock
+
+[TESTING]
+WEAKRANDOM = YES
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+
+[dht]
+AUTOSTART = NO
+
+

Added: gnunet/src/transport/test_quota_compliance_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer2.conf                   
        (rev 0)
+++ gnunet/src/transport/test_quota_compliance_udp_peer2.conf   2010-10-29 
13:12:04 UTC (rev 13456)
@@ -0,0 +1,102 @@
+[PATHS]
+SERVICEHOME = /tmp/test_quota_compliance_peer2
+DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
+
+[transport-udp]
+PORT = 3368
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[hostlist]
+HTTP-PROXY = 
+SERVERS = http://gnunet.org:8080/
+OPTIONS = -b
+BINARY = gnunet-daemon-hostlist
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+HTTPPORT = 8080
+
+[topology]
+BINARY = gnunet-daemon-topology
+CONFIG = $DEFAULTCONFIG
+FRIENDS = $SERVICEHOME/friends
+TARGET-CONNECTION-COUNT = 16
+AUTOCONNECT = YES
+FRIENDS-ONLY = NO
+MINIMUM-FRIENDS = 0
+
+[core]
+AUTOSTART = NO
+
+[transport]
+plugins = udp
+#DEBUG = YES
+PREFIX = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+BINARY = gnunet-service-transport
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 3091
+UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_transport_peer2.sock
+
+[peerinfo]
+TRUST = $SERVICEHOME/data/credit/
+HOSTS = $SERVICEHOME/data/hosts/
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-peerinfo
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 3090
+UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_peerinfo_peer2.sock
+
+[resolver]
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-resolver
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 3089
+UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_resolver_peer2.sock
+
+[statistics]
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-statistics
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 3088
+UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_statistics_peer2.sock
+
+[arm]
+DEFAULTSERVICES = 
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-arm
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 3087
+UNIXPATH = 
/tmp/test_quota_compliance_peer2/test_quota_compliance_arm_peer2.sock
+
+[TESTING]
+WEAKRANDOM = YES
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+
+[dht]
+AUTOSTART = NO
+
+