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

[gnunet]

Author: wachs
Date: 2013-10-07 13:17:02 +0200 (Mon, 07 Oct 2013)
New Revision: 29920

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/plugin_transport_udp.c
Log:
- fixing udp address handling for inbound sessions
- fixing some indentation 


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2013-10-07 09:49:04 UTC 
(rev 29919)
+++ gnunet/src/transport/gnunet-service-transport.c     2013-10-07 11:17:02 UTC 
(rev 29920)
@@ -532,52 +532,37 @@
  */
 
 static void
-plugin_env_session_start (void *cls,
-          const struct GNUNET_PeerIdentity *peer,
-          const char *plugin,
-          const void *address,
-          uint16_t address_len,
-          struct Session *session,
-          const struct GNUNET_ATS_Information *ats,
-          uint32_t ats_count)
+plugin_env_session_start (void *cls, const struct GNUNET_PeerIdentity *peer,
+    const char *plugin, const void *address, uint16_t address_len,
+    struct Session *session, const struct GNUNET_ATS_Information *ats,
+    uint32_t ats_count)
 {
-       struct GNUNET_HELLO_Address *addr;
-       if (NULL == peer)
-       {
-               GNUNET_break (0);
-               return;
-       }
-       if (NULL == plugin)
-       {
-               GNUNET_break (0);
-               return;
-       }
-       if ((address_len != 0) && (NULL == address))
-       {
-               GNUNET_break (0);
-               return;
-       }
-       if (NULL == session)
-       {
-               GNUNET_break (0);
-               return;
-       }
+  struct GNUNET_HELLO_Address *addr;
+  if (NULL == peer)
+  {
+    GNUNET_break(0);
+    return;
+  }
+  if (NULL == plugin)
+  {
+    GNUNET_break(0);
+    return;
+  }
+  if (NULL == session)
+  {
+    GNUNET_break(0);
+    return;
+  }
 
-       addr = GNUNET_HELLO_address_allocate (peer, plugin, address, 
address_len);
-       if (0 != address_len)
-       {
-               GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                               "Inbound session from plugin `%s' about new 
session %p from peer `%s' address `%s' does not have address length 0 but %u\n",
-                               plugin, session, GNUNET_i2s (peer), 
GST_plugins_a2s(addr), address_len);
-       }
-       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                       "Notification from plugin `%s' about new session %p 
from peer `%s' address `%s'\n",
-                       plugin, session, GNUNET_i2s (peer), 
GST_plugins_a2s(addr));
-       GST_ats_add_address (addr, session);
+  addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+      "Notification from plugin `%s' about new session %p from peer `%s' 
address `%s'\n",
+      plugin, session, GNUNET_i2s (peer), GST_plugins_a2s (addr));
+  GST_ats_add_address (addr, session);
 
-       if (0 < ats_count)
-               GST_ats_update_metrics (peer, addr, session, ats, ats_count);
-       GNUNET_free (addr);
+  if (0 < ats_count)
+    GST_ats_update_metrics (peer, addr, session, ats, ats_count);
+  GNUNET_free(addr);
 }
 
 /**

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-10-07 09:49:04 UTC (rev 
29919)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-10-07 11:17:02 UTC (rev 
29920)
@@ -578,11 +578,6 @@
     memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
     sb = &a4;
   }
-  else if (addrlen == 0)
-  {
-    GNUNET_snprintf (rbuf, sizeof (rbuf), "%s", 
TRANSPORT_SESSION_INBOUND_STRING);
-    return rbuf;
-  }
   else
   {
     return NULL;
@@ -825,12 +820,6 @@
     sb = &a4;
     sbs = sizeof (a4);
   }
-  else if (0 == addrlen)
-  {
-    asc (asc_cls, TRANSPORT_SESSION_INBOUND_STRING);
-    asc (asc_cls, NULL);
-    return;
-  }
   else
   {
     /* invalid address */
@@ -2051,9 +2040,7 @@
   {
     s = udp_plugin_create_session (plugin, address, GNUNET_YES);
     plugin->env->session_start (NULL, &address->peer, PLUGIN_NAME,
-                  (GNUNET_YES == s->inbound) ? NULL : address->address,
-                  (GNUNET_YES == s->inbound) ? 0 : address->address_length,
-            s, NULL, 0);
+                  address->address, address->address_length, s, NULL, 0);
   }
   GNUNET_free (address);
 
@@ -3118,13 +3105,13 @@
   p->defrag_ctxs = GNUNET_CONTAINER_heap_create 
(GNUNET_CONTAINER_HEAP_ORDER_MIN);
   p->mst = GNUNET_SERVER_mst_create (&process_inbound_tokenized_messages, p);
   GNUNET_BANDWIDTH_tracker_init (&p->tracker,
-                                 GNUNET_BANDWIDTH_value_init 
((uint32_t)udp_max_bps), 30);
+      GNUNET_BANDWIDTH_value_init ((uint32_t) udp_max_bps), 30);
   plugin = p;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
   res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &serverAddrv6 : NULL,
-                                                                               
(GNUNET_YES == have_bind4) ? &serverAddrv4 : NULL);
-  if ((res == 0) || ((p->sockv4 == NULL) && (p->sockv6 == NULL)))
+      (GNUNET_YES == have_bind4) ? &serverAddrv4 : NULL );
+  if ((res == 0) || ((p->sockv4 == NULL )&& (p->sockv6 == NULL)))
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
         _("Failed to create network sockets, plugin failed\n"));