[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31899 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31899 - gnunet/src/transport |
Date: |
Tue, 14 Jan 2014 14:07:46 +0100 |
Author: wachs
Date: 2014-01-14 14:07:46 +0100 (Tue, 14 Jan 2014)
New Revision: 31899
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/plugin_transport_udp.c
Log:
improved checking for direction
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2014-01-14 13:07:25 UTC
(rev 31898)
+++ gnunet/src/transport/gnunet-service-transport.c 2014-01-14 13:07:46 UTC
(rev 31899)
@@ -621,7 +621,6 @@
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 @@
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);
}
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2014-01-14
13:07:25 UTC (rev 31898)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2014-01-14
13:07:46 UTC (rev 31899)
@@ -2292,25 +2292,29 @@
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)
{
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2014-01-14 13:07:25 UTC (rev
31898)
+++ gnunet/src/transport/plugin_transport_udp.c 2014-01-14 13:07:46 UTC (rev
31899)
@@ -1444,14 +1444,6 @@
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 @@
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(
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31899 - gnunet/src/transport,
gnunet <=