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

[gnunet]

Author: wachs
Date: 2011-11-23 16:10:10 +0100 (Wed, 23 Nov 2011)
New Revision: 18280

Modified:
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/template_cfg_peer1.conf
   gnunet/src/transport/template_cfg_peer2.conf
   gnunet/src/transport/test_transport_api_udp_peer1.conf
   gnunet/src/transport/test_transport_api_udp_peer2.conf
Log:
fix shutdown order + disable broadcast in testcase


Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-11-23 15:07:47 UTC (rev 
18279)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-11-23 15:10:10 UTC (rev 
18280)
@@ -2335,16 +2335,6 @@
     GNUNET_SCHEDULER_cancel (plugin->select_task);
     plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
   }
-  if (plugin->sockv4 != NULL)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv4));
-    plugin->sockv4 = NULL;
-  }
-  if (plugin->sockv6 != NULL)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv6));
-    plugin->sockv6 = NULL;
-  }
 
   if (plugin->broadcast_ipv4)
   {
@@ -2377,10 +2367,6 @@
     if ( GNUNET_NETWORK_socket_setsockopt( plugin->sockv6, IPPROTO_IPV6, 
IPV6_LEAVE_GROUP, (char*) &multicastRequest, sizeof(multicastRequest)) == 0 )
     {
       LOG (GNUNET_ERROR_TYPE_DEBUG, "IPv6 Broadcasting stopped\n");
-
-      plugin->send_ipv6_broadcast_task =
-        GNUNET_SCHEDULER_add_now (&udp_ipv6_broadcast_send, plugin);
-      plugin->broadcast_ipv6 = GNUNET_YES;
     }
     else
       GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR, setsockopt);
@@ -2394,6 +2380,18 @@
       GNUNET_SERVER_mst_destroy (plugin->broadcast_ipv6_mst);
   }
 
+
+  if (plugin->sockv4 != NULL)
+  {
+    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv4));
+    plugin->sockv4 = NULL;
+  }
+  if (plugin->sockv6 != NULL)
+  {
+    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->sockv6));
+    plugin->sockv6 = NULL;
+  }
+
   GNUNET_SERVER_mst_destroy (plugin->mst);
   GNUNET_NETWORK_fdset_destroy (plugin->rs);
 

Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf        2011-11-23 15:07:47 UTC 
(rev 18279)
+++ gnunet/src/transport/template_cfg_peer1.conf        2011-11-23 15:10:10 UTC 
(rev 18280)
@@ -14,6 +14,9 @@
 PORT = 12000
 TIMEOUT = 5 s
 
+[transport-udp]
+BROADCAST = NO
+
 [arm]
 PORT = 12005
 DEFAULTSERVICES = transport
@@ -32,6 +35,7 @@
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [transport]
+PREFIX = valgrind --leak-check=full
 PORT = 12001
 #DEBUG = YES
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock

Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf        2011-11-23 15:07:47 UTC 
(rev 18279)
+++ gnunet/src/transport/template_cfg_peer2.conf        2011-11-23 15:10:10 UTC 
(rev 18280)
@@ -14,6 +14,9 @@
 PORT = 12100
 TIMEOUT = 5 s
 
+[transport-udp]
+BROADCAST = NO
+
 [arm]
 PORT = 12014
 DEFAULTSERVICES = transport
@@ -33,6 +36,7 @@
 TRUST = $SERVICEHOME/data/credit/
 
 [transport]
+PREFIX = valgrind --leak-check=full
 PORT = 12010
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 

Modified: gnunet/src/transport/test_transport_api_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer1.conf      2011-11-23 
15:07:47 UTC (rev 18279)
+++ gnunet/src/transport/test_transport_api_udp_peer1.conf      2011-11-23 
15:10:10 UTC (rev 18280)
@@ -5,7 +5,7 @@
 
 [transport-udp]
 PORT = 12040
-BROADCAST = YES
+BROADCAST = NO
 BROADCAST_INTERVAL = 30000
 MAX_BPS = 50000000
 

Modified: gnunet/src/transport/test_transport_api_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer2.conf      2011-11-23 
15:07:47 UTC (rev 18279)
+++ gnunet/src/transport/test_transport_api_udp_peer2.conf      2011-11-23 
15:10:10 UTC (rev 18280)
@@ -5,6 +5,7 @@
 
 [transport-udp]
 PORT = 12050
+BROADCAST = NO
 MAX_BPS = 50000000
 
 [arm]