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

[gnunet]

Author: wachs
Date: 2012-06-29 14:25:08 +0200 (Fri, 29 Jun 2012)
New Revision: 22378

Modified:
   gnunet/src/transport/plugin_transport_udp_broadcasting.c
   gnunet/src/transport/transport.conf.in
Log:
do not print error msg when we have no network connectivity

Modified: gnunet/src/transport/plugin_transport_udp_broadcasting.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_broadcasting.c    2012-06-29 
11:35:56 UTC (rev 22377)
+++ gnunet/src/transport/plugin_transport_udp_broadcasting.c    2012-06-29 
12:25:08 UTC (rev 22378)
@@ -268,7 +268,19 @@
                                       (const struct sockaddr *) addr,
                                       baddr->addrlen);
     if (sent == GNUNET_SYSERR)
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sendto");
+    {
+      if ((ENETUNREACH == errno) || (ENETDOWN == errno))
+      {
+        /* "Network unreachable" or "Network down"
+         *
+         * This indicates that we just do not have network connectivity
+         */
+        GNUNET_log (GNUNET_ERROR_TYPE_BULK | GNUNET_ERROR_TYPE_WARNING,
+            "Network connectivity is down, cannot send beacon!\n");
+      }
+      else
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sendto");
+    }
     else
     {
       LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -301,7 +313,20 @@
                                     &plugin->ipv6_multicast_address,
                                     sizeof (struct sockaddr_in6));
   if (sent == GNUNET_SYSERR)
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sendto");
+  {
+    if ((ENETUNREACH == errno) || (ENETDOWN == errno))
+    {
+      /* "Network unreachable" or "Network down"
+       *
+       * This indicates that this system is IPv6 enabled, but does not
+       * have a valid global IPv6 address assigned
+       */
+      GNUNET_log (GNUNET_ERROR_TYPE_BULK | GNUNET_ERROR_TYPE_WARNING,
+          "Network connectivity is down, cannot send beacon!\n");
+    }
+    else
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sendto");
+  }
   else
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in      2012-06-29 11:35:56 UTC (rev 
22377)
+++ gnunet/src/transport/transport.conf.in      2012-06-29 12:25:08 UTC (rev 
22378)
@@ -47,7 +47,7 @@
 [transport-udp]
 PORT = 2086
 BROADCAST = YES
-BROADCAST_INTERVAL = 30000
+BROADCAST_INTERVAL = 300
 MAX_BPS = 1000000
 
 [transport-http]