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

[gnunet]

Author: grothoff
Date: 2015-01-25 22:08:37 +0100 (Sun, 25 Jan 2015)
New Revision: 34994

Modified:
   gnunet/src/transport/plugin_transport_udp.c
Log:
-indentation

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2015-01-25 21:08:22 UTC (rev 
34993)
+++ gnunet/src/transport/plugin_transport_udp.c 2015-01-25 21:08:37 UTC (rev 
34994)
@@ -1327,10 +1327,13 @@
   struct UDP_MessageWrapper *next;
   struct FindReceiveContext frc;
 
-  GNUNET_assert(GNUNET_YES != s->in_destroy);
-  LOG(GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' address ended\n", s,
+  GNUNET_assert (GNUNET_YES != s->in_destroy);
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Session %p to peer `%s' address ended\n", s,
       GNUNET_i2s (&s->target),
-      udp_address_to_string (NULL, s->address->address, 
s->address->address_length));
+      udp_address_to_string (NULL,
+                             s->address->address,
+                             s->address->address_length));
   /* stop timeout task */
   if (NULL != s->timeout_task)
   {
@@ -1405,10 +1408,10 @@
     }
   }
 
-  GNUNET_assert(GNUNET_YES ==
-                GNUNET_CONTAINER_multipeermap_remove (plugin->sessions,
-                                                      &s->target,
-                                                      s));
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multipeermap_remove (plugin->sessions,
+                                                       &s->target,
+                                                       s));
   GNUNET_STATISTICS_set (plugin->env->stats,
                          "# UDP sessions active",
                          GNUNET_CONTAINER_multipeermap_size (plugin->sessions),
@@ -2335,7 +2338,8 @@
   address = GNUNET_HELLO_address_allocate ( &msg->sender, PLUGIN_NAME,
                                             arg, args,
                                             GNUNET_HELLO_ADDRESS_INFO_INBOUND);
-  if (NULL == (s = udp_plugin_lookup_session (plugin, address)))
+  if ( (NULL == (s = udp_plugin_lookup_session (plugin, address))) &&
+       (GNUNET_YES != s->in_destroy) )
   {
     s = udp_plugin_create_session (plugin, address);
     plugin->env->session_start (NULL, address, s, NULL, 0);
@@ -2354,9 +2358,12 @@
   si.arg = arg;
   si.args = args;
   s->rc++;
-  GNUNET_SERVER_mst_receive (plugin->mst, &si, (const char *) &msg[1],
-      ntohs (msg->header.size) - sizeof(struct UDPMessage), GNUNET_YES,
-      GNUNET_NO);
+  GNUNET_SERVER_mst_receive (plugin->mst,
+                             &si,
+                             (const char *) &msg[1],
+                             ntohs (msg->header.size) - sizeof(struct 
UDPMessage),
+                             GNUNET_YES,
+                             GNUNET_NO);
   s->rc--;
   if ((0 == s->rc) && (GNUNET_YES == s->in_destroy))
     free_session (s);
@@ -3614,12 +3621,12 @@
     return NULL;
   }
   stop_broadcast (plugin);
-  if (plugin->select_task != NULL )
+  if (plugin->select_task != NULL)
   {
     GNUNET_SCHEDULER_cancel (plugin->select_task);
     plugin->select_task = NULL;
   }
-  if (plugin->select_task_v6 != NULL )
+  if (plugin->select_task_v6 != NULL)
   {
     GNUNET_SCHEDULER_cancel (plugin->select_task_v6);
     plugin->select_task_v6 = NULL;