improved checking for direction

3 files changed, 22 insertions, 31 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 0f24892bd..d52d6ab69 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -621,7 +621,6 @@ plugin_env_session_start (void *cls, struct GNUNET_HELLO_Address *address,
     struct Session *session, const struct GNUNET_ATS_Information *ats,
     uint32_t ats_count)
 {
-  int inbound;
   if (NULL == address)
   {
     GNUNET_break(0);
@@ -633,15 +632,11 @@ plugin_env_session_start (void *cls, struct GNUNET_HELLO_Address *address,
     return;
   }
 
-  if (GNUNET_HELLO_ADDRESS_INFO_INBOUND
-      == (address->local_info & GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-    inbound = GNUNET_YES;
-  else
-    inbound = GNUNET_NO;
-
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
       "Notification from plugin `%s' about new %ssession %p from peer `%s' address `%s'\n",
-      address->transport_name, (GNUNET_YES == inbound) ? "inbound " : "",
+      address->transport_name,
+      GNUNET_HELLO_address_check_option (address,
+          GNUNET_HELLO_ADDRESS_INFO_INBOUND) ? "inbound " : "",
       session, GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
   GST_ats_add_address (address, session, ats, ats_count);
 }
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 0cb719f02..2090c71b5 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -2292,25 +2292,29 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
     GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
     return;
   }
-  if ((NULL == session) && (0 == address->address_length))
+  if ((NULL == session) &&
+      (GNUNET_HELLO_address_check_option (address, GNUNET_HELLO_ADDRESS_INFO_INBOUND)))
   {
-    GNUNET_break (0);
-    if (strlen (address->transport_name) > 0)
-      GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
+    /* This is a inbound address and we do not have a session to use! */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Inbound address without session `%s'! Destroying address...\n",
+                GST_plugins_a2s (address));
+    GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
     return;
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "ATS tells us to switch to %s address '%s' session %p for "
-              "peer `%s' in state %s/%d (quota in/out %u %u )\n",
-              (GNUNET_HELLO_ADDRESS_INFO_INBOUND ==  (GNUNET_HELLO_ADDRESS_INFO_INBOUND & address->local_info)) ? "inbound" : "",
-              GST_plugins_a2s (address),
-              session,
-              GNUNET_i2s (peer),
-              GNUNET_TRANSPORT_p2s (n->state),
-              n->send_connect_ack,
-              ntohl (bandwidth_in.value__),
-              ntohl (bandwidth_out.value__));
+    "ATS tells us to switch to %s address '%s' session %p for "
+    "peer `%s' in state %s/%d (quota in/out %u %u )\n",
+    GNUNET_HELLO_address_check_option (address,
+        GNUNET_HELLO_ADDRESS_INFO_INBOUND) ? "inbound" : "",
+    GST_plugins_a2s (address),
+    session,
+    GNUNET_i2s (peer),
+    GNUNET_TRANSPORT_p2s (n->state),
+    n->send_connect_ack,
+    ntohl (bandwidth_in.value__),
+    ntohl (bandwidth_out.value__));
 
   if (NULL == session)
   {
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 8f847b0eb..d5aef62ce 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -1444,14 +1444,6 @@ udp_plugin_lookup_session (void *cls,
   return NULL ;
 }
 
-static int
-udp_address_is_inbound (const struct GNUNET_HELLO_Address *address)
-{
-  if (GNUNET_HELLO_ADDRESS_INFO_INBOUND == (address->local_info & GNUNET_HELLO_ADDRESS_INFO_INBOUND))
-    return GNUNET_YES;
-  else
-   return GNUNET_NO;
-}
 
 static struct Session *
 udp_plugin_create_session (void *cls,
@@ -1495,7 +1487,7 @@ udp_plugin_create_session (void *cls,
     return NULL ; /* protocol not supported or address invalid */
   LOG(GNUNET_ERROR_TYPE_ERROR,
       "Creating new %s session %p for peer `%s' address `%s'\n",
-      (GNUNET_YES == udp_address_is_inbound(address)) ? "inbound" : "outbound",
+      GNUNET_HELLO_address_check_option (address, GNUNET_HELLO_ADDRESS_INFO_INBOUND) ? "inbound" : "outbound",
       s, GNUNET_i2s (&address->peer),
       udp_address_to_string(NULL,address->address,address->address_length));
   GNUNET_assert(