[GNUnet-SVN] r21535 - in gnunet/src: core transport

[gnunet]

Author: grothoff
Date: 2012-05-16 17:43:30 +0200 (Wed, 16 May 2012)
New Revision: 21535

Modified:
   gnunet/src/core/test_core_api_reliability.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
   gnunet/src/transport/plugin_transport_udp.c
Log:
-do switch statement cases in order of enum

Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2012-05-16 15:39:07 UTC (rev 
21534)
+++ gnunet/src/core/test_core_api_reliability.c 2012-05-16 15:43:30 UTC (rev 
21535)
@@ -33,8 +33,6 @@
 #include "gnunet_transport_service.h"
 #include <gauger.h>
 
-#define VERBOSE GNUNET_NO
-
 #define START_ARM GNUNET_YES
 
 /**
@@ -89,11 +87,7 @@
 static int32_t tr_n;
 
 
-#if VERBOSE
 #define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u 
at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
 
 struct TestMessage
 {
@@ -113,9 +107,11 @@
   return sizeof (struct TestMessage) + (ret % 60000);
 }
 
+
 static void
 process_hello (void *cls, const struct GNUNET_MessageHeader *message);
 
+
 static void
 terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -183,6 +179,7 @@
   GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
 }
 
+
 static size_t
 transmit_ready (void *cls, size_t size, void *buf)
 {
@@ -210,10 +207,8 @@
   cbuf = buf;
   do
   {
-#if VERBOSE
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending message %u of size %u at offset %u\n", tr_n, s, ret);
-#endif
     hdr.header.size = htons (s);
     hdr.header.type = htons (MTYPE);
     hdr.num = htonl (tr_n);
@@ -237,7 +232,6 @@
 }
 
 
-
 static void
 connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_ATS_Information *atsi,
@@ -289,10 +283,8 @@
                 const struct GNUNET_ATS_Information *atsi,
                 unsigned int atsi_count)
 {
-#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
-#endif
   return GNUNET_OK;
 }
 
@@ -303,11 +295,9 @@
                  const struct GNUNET_ATS_Information *atsi,
                  unsigned int atsi_count)
 {
-#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Core notifies about outbound data for `%4s'.\n",
               GNUNET_i2s (other));
-#endif
   return GNUNET_OK;
 }
 
@@ -315,6 +305,7 @@
 static size_t
 transmit_ready (void *cls, size_t size, void *buf);
 
+
 static int
 process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
                const struct GNUNET_MessageHeader *message,
@@ -347,10 +338,8 @@
     err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
     return GNUNET_SYSERR;
   }
-#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
               ntohl (hdr->num), ntohs (message->size));
-#endif
   n++;
   if (0 == (n % (TOTAL_MSGS / 100)))
     FPRINTF (stderr, "%s",  ".");
@@ -378,7 +367,6 @@
 };
 
 
-
 static void
 init_notify (void *cls, struct GNUNET_CORE_Handle *server,
              const struct GNUNET_PeerIdentity *my_identity)
@@ -435,7 +423,6 @@
 }
 
 
-
 static void
 setup_peer (struct PeerContext *p, const char *cfgname)
 {
@@ -444,9 +431,6 @@
   p->arm_proc =
     GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
-#if VERBOSE
-                               "-L", "DEBUG",
-#endif
                                "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
@@ -494,9 +478,6 @@
   char *const argv[] = { "test-core-api-reliability",
     "-c",
     "test_core_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -511,17 +492,14 @@
   return ok;
 }
 
+
 int
 main (int argc, char *argv[])
 {
   int ret;
 
   GNUNET_log_setup ("test-core-api",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
   ret = check ();
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-05-16 
15:39:07 UTC (rev 21534)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2012-05-16 
15:43:30 UTC (rev 21535)
@@ -2173,8 +2173,8 @@
                     n->connect_ack_timestamp,
                     address, session, ats, ats_count);    
     break;
+  case S_CONNECT_RECV_BLACKLIST:
   case S_CONNECT_RECV_ACK:
-  case S_CONNECT_RECV_BLACKLIST:
     /* ATS asks us to switch while we were trying to connect; switch to new
        address and check blacklist again */
     set_address (&n->primary_address,

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2012-05-16 15:39:07 UTC (rev 
21534)
+++ gnunet/src/transport/plugin_transport_udp.c 2012-05-16 15:43:30 UTC (rev 
21535)
@@ -2154,7 +2154,6 @@
   struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
   struct GNUNET_TRANSPORT_PluginFunctions *api;
   struct Plugin *plugin;
-
   unsigned long long port;
   unsigned long long aport;
   unsigned long long broadcast;
@@ -2163,10 +2162,8 @@
   char * bind4_address;
   char * bind6_address;
   struct GNUNET_TIME_Relative interval;
-
   struct sockaddr_in serverAddrv4;
   struct sockaddr_in6 serverAddrv6;
-
   int res;
 
   if (NULL == env->receive)
@@ -2210,7 +2207,6 @@
   else
     enable_v6 = GNUNET_YES;
 
-
   /* Addresses */
   memset (&serverAddrv6, 0, sizeof (serverAddrv6));
   memset (&serverAddrv4, 0, sizeof (serverAddrv4));
@@ -2247,7 +2243,6 @@
     }
   }
 
-
   /* Enable neighbour discovery */
   broadcast = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, "transport-udp",
                                             "BROADCAST");
@@ -2272,8 +2267,6 @@
 
   GNUNET_BANDWIDTH_tracker_init (&plugin->tracker,
                                  GNUNET_BANDWIDTH_value_init 
((uint32_t)udp_max_bps), 30);
-
-
   plugin->sessions = GNUNET_CONTAINER_multihashmap_create (10);
   plugin->defrag_ctxs = GNUNET_CONTAINER_heap_create 
(GNUNET_CONTAINER_HEAP_ORDER_MIN);
   plugin->mst = GNUNET_SERVER_mst_create (&process_inbound_tokenized_messages, 
plugin);