[GNUnet-SVN] r31566 - in gnunet/src: integration-tests/confs transport

[gnunet]

Author: wachs
Date: 2013-12-19 15:34:22 +0100 (Thu, 19 Dec 2013)
New Revision: 31566

Modified:
   gnunet/src/integration-tests/confs/test_defaults.conf
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/plugin_transport_udp.h
   gnunet/src/transport/test_transport_defaults.conf
   gnunet/src/transport/transport.conf.in
Log:
added function to disable receiving broadcasts to prevent buildbots from 
connecting to the network


Modified: gnunet/src/integration-tests/confs/test_defaults.conf
===================================================================
--- gnunet/src/integration-tests/confs/test_defaults.conf       2013-12-19 
14:22:54 UTC (rev 31565)
+++ gnunet/src/integration-tests/confs/test_defaults.conf       2013-12-19 
14:34:22 UTC (rev 31566)
@@ -9,6 +9,7 @@
 
 [transport-udp]
 BROADCAST = NO
+BROADCAST_RECEIVE = no
 USE_LOCALADDR = YES
 
 [nat]

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-12-19 14:22:54 UTC (rev 
31565)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-12-19 14:34:22 UTC (rev 
31566)
@@ -2515,6 +2515,7 @@
   switch (ntohs (msg->type))
   {
   case GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON:
+    if (GNUNET_YES == plugin->enable_broadcasting_receiving)
       udp_broadcast_receive (plugin, buf, size,
                            (const struct sockaddr *) &addr, fromlen);
     return;
@@ -3049,6 +3050,7 @@
   unsigned long long udp_max_bps;
   unsigned long long enable_v6;
   unsigned long long enable_broadcasting;
+  unsigned long long enable_broadcasting_recv;
   char * bind4_address;
   char * bind6_address;
   char * fancy_interval;
@@ -3147,6 +3149,11 @@
   if (enable_broadcasting == GNUNET_SYSERR)
     enable_broadcasting = GNUNET_NO;
 
+  enable_broadcasting_recv = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 
"transport-udp",
+                                            "BROADCAST_RECEIVE");
+  if (enable_broadcasting_recv == GNUNET_SYSERR)
+    enable_broadcasting_recv = GNUNET_YES;
+
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (env->cfg, 
"transport-udp",
                                            "BROADCAST_INTERVAL", 
&fancy_interval))
   {
@@ -3175,6 +3182,7 @@
   p->enable_ipv6 = enable_v6;
   p->enable_ipv4 = GNUNET_YES; /* default */
   p->enable_broadcasting = enable_broadcasting;
+  p->enable_broadcasting_receiving = enable_broadcasting_recv;
   p->env = env;
   p->sessions = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
   p->defrag_ctxs = GNUNET_CONTAINER_heap_create 
(GNUNET_CONTAINER_HEAP_ORDER_MIN);

Modified: gnunet/src/transport/plugin_transport_udp.h
===================================================================
--- gnunet/src/transport/plugin_transport_udp.h 2013-12-19 14:22:54 UTC (rev 
31565)
+++ gnunet/src/transport/plugin_transport_udp.h 2013-12-19 14:34:22 UTC (rev 
31566)
@@ -254,6 +254,11 @@
   int enable_broadcasting;
 
   /**
+   * Is receiving broadcasts enabled: GNUNET_YES or GNUNET_NO
+   */
+  int enable_broadcasting_receiving;
+
+  /**
    * Port we broadcasting on.
    */
   uint16_t broadcast_port;

Modified: gnunet/src/transport/test_transport_defaults.conf
===================================================================
--- gnunet/src/transport/test_transport_defaults.conf   2013-12-19 14:22:54 UTC 
(rev 31565)
+++ gnunet/src/transport/test_transport_defaults.conf   2013-12-19 14:34:22 UTC 
(rev 31566)
@@ -8,7 +8,7 @@
 DEFAULTSERVICES =
 
 [transport]
-# PREFIX = valgrind
+#PREFIX = valgrind -v --gen-suppressions=yes 
 
 [core]
 AUTOSTART = NO
@@ -54,3 +54,6 @@
 
 [TESTING]
 WEAKRANDOM = YES
+
+[transport-udp]
+BROADCAST_RECEIVE = no
\ No newline at end of file

Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in      2013-12-19 14:22:54 UTC (rev 
31565)
+++ gnunet/src/transport/transport.conf.in      2013-12-19 14:34:22 UTC (rev 
31566)
@@ -56,6 +56,7 @@
 # Use PORT = 0 to autodetect a port available
 PORT = 2086
 BROADCAST = YES
+BROADCAST_RECEIVE = YES
 BROADCAST_INTERVAL = 30 s
 MAX_BPS = 1000000
 TESTING_IGNORE_KEYS = ACCEPT_FROM;