[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22082 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22082 - gnunet/src/transport |
Date: |
Mon, 18 Jun 2012 17:33:04 +0200 |
Author: wachs
Date: 2012-06-18 17:33:04 +0200 (Mon, 18 Jun 2012)
New Revision: 22082
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
- fixing assertion in scheduling_api.c:1222
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2012-06-18 15:00:12 UTC
(rev 22081)
+++ gnunet/src/transport/gnunet-service-transport.c 2012-06-18 15:33:04 UTC
(rev 22082)
@@ -179,6 +179,7 @@
htonl ((uint32_t) GST_neighbour_get_latency (peer).rel_value);
memcpy (&ap[ats_count + 1], message, ntohs (message->size));
+ GNUNET_ATS_address_add (GST_ats, address, session, ap, ats_count + 1);
GNUNET_ATS_address_update (GST_ats, address, session, ap, ats_count + 1);
GST_clients_broadcast (&im->header, GNUNET_YES);
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-06-18
15:00:12 UTC (rev 22081)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-06-18
15:33:04 UTC (rev 22082)
@@ -2015,6 +2015,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received CONNECT message from peer `%s'\n",
GNUNET_i2s (peer));
+
if (ntohs (message->size) != sizeof (struct SessionConnectMessage))
{
GNUNET_break_op (0);
@@ -2030,6 +2031,7 @@
n = setup_neighbour (peer);
n->send_connect_ack = 1;
n->connect_ack_timestamp = ts;
+
switch (n->state)
{
case S_NOT_CONNECTED:
@@ -2143,8 +2145,21 @@
GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
return;
}
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS tells us to switch to address '%s' session %p for peer `%s'
in state %s\n",
+ (address->address_length != 0) ? GST_plugins_a2s (address):
"<inbound>",
+ session,
+ GNUNET_i2s (peer),
+ print_state (n->state));
+
if (NULL == session)
+ {
session = papi->get_session (papi->cls, address);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Obtained new session for peer `%s' and address '%s': %p\n",
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
session);
+ }
if (NULL == session)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2153,12 +2168,6 @@
GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ATS tells us to switch to address '%s' session %p for peer
`%s'\n",
- (address->address_length != 0) ? GST_plugins_a2s (address):
"<inbound>",
- session,
- GNUNET_i2s (peer));
-
switch (n->state)
{
case S_NOT_CONNECTED:
@@ -2564,6 +2573,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received CONNECT_ACK message from peer `%s'\n",
GNUNET_i2s (peer));
+
if (ntohs (message->size) != sizeof (struct SessionConnectMessage))
{
GNUNET_break_op (0);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22082 - gnunet/src/transport,
gnunet <=