diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-16 12:04:00 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-16 12:04:00 +0000 |
commit | 11b340c572f31cb0b79feaae96ee12a65f00eb8d (patch) | |
tree | 1c54a0fcb8c0e6554c78d717b9021d4b98d36a37 /src | |
parent | a989bc4d0a949656015e59685f616eecc3df0af6 (diff) | |
download | gnunet-11b340c572f31cb0b79feaae96ee12a65f00eb8d.tar.gz gnunet-11b340c572f31cb0b79feaae96ee12a65f00eb8d.zip |
-fix bogus assumption on my part
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 450da0637..dd8f5be6c 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1413,17 +1413,6 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | |||
1413 | cont (cont_cls, GNUNET_SYSERR); | 1413 | cont (cont_cls, GNUNET_SYSERR); |
1414 | return; | 1414 | return; |
1415 | } | 1415 | } |
1416 | if ((NULL == n->primary_address.session) && (NULL == n->primary_address.address)) | ||
1417 | { | ||
1418 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
1419 | "GST_neighbours_sent called in state %d\n", | ||
1420 | n->state); | ||
1421 | GNUNET_break (0); | ||
1422 | if (NULL != cont) | ||
1423 | cont (cont_cls, GNUNET_SYSERR); | ||
1424 | return; | ||
1425 | } | ||
1426 | |||
1427 | bytes_in_send_queue += msg_size; | 1416 | bytes_in_send_queue += msg_size; |
1428 | GNUNET_STATISTICS_set (GST_stats, | 1417 | GNUNET_STATISTICS_set (GST_stats, |
1429 | gettext_noop | 1418 | gettext_noop |
@@ -1437,7 +1426,8 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, const void *msg, | |||
1437 | mq->message_buf_size = msg_size; | 1426 | mq->message_buf_size = msg_size; |
1438 | mq->timeout = GNUNET_TIME_relative_to_absolute (timeout); | 1427 | mq->timeout = GNUNET_TIME_relative_to_absolute (timeout); |
1439 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, n->messages_tail, mq); | 1428 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, n->messages_tail, mq); |
1440 | if (NULL != n->is_active) | 1429 | if ( (NULL != n->is_active) || |
1430 | ( (NULL == n->primary_address.session) && (NULL == n->primary_address.address)) ) | ||
1441 | return; | 1431 | return; |
1442 | GNUNET_SCHEDULER_cancel (n->task); | 1432 | GNUNET_SCHEDULER_cancel (n->task); |
1443 | n->task = GNUNET_SCHEDULER_add_now (&master_task, n); | 1433 | n->task = GNUNET_SCHEDULER_add_now (&master_task, n); |