[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35217 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r35217 - gnunet/src/ats |
Date: |
Wed, 11 Feb 2015 14:42:22 +0100 |
Author: grothoff
Date: 2015-02-11 14:42:22 +0100 (Wed, 11 Feb 2015)
New Revision: 35217
Modified:
gnunet/src/ats/ats_api_performance.c
Log:
do not call receive before sending first message
Modified: gnunet/src/ats/ats_api_performance.c
===================================================================
--- gnunet/src/ats/ats_api_performance.c 2015-02-11 13:33:42 UTC (rev
35216)
+++ gnunet/src/ats/ats_api_performance.c 2015-02-11 13:42:22 UTC (rev
35217)
@@ -241,6 +241,11 @@
* Request multiplexing
*/
uint32_t id;
+
+ /**
+ * Is the receive loop active?
+ */
+ int in_receive;
};
/**
@@ -323,6 +328,14 @@
GNUNET_free(p);
}
do_transmit (ph);
+ if (GNUNET_NO == ph->in_receive)
+ {
+ ph->in_receive = GNUNET_YES;
+ GNUNET_CLIENT_receive (ph->client,
+ &process_ats_message,
+ ph,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ }
return ret;
}
@@ -469,7 +482,7 @@
/**
- * We received a reservation result message. Validate and process it.
+ * We received a PeerInformationMessage. Validate and process it.
*
* @param ph our context with the callback
* @param msg the message
@@ -593,18 +606,27 @@
{
case GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION:
if (GNUNET_OK != process_pi_message (ph, msg))
+ {
+ GNUNET_break (0);
goto reconnect;
+ }
break;
case GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT:
if (GNUNET_OK != process_rr_message (ph, msg))
+ {
+ GNUNET_break (0);
goto reconnect;
+ }
break;
case GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE:
if (GNUNET_OK != process_ar_message (ph, msg))
+ {
+ GNUNET_break (0);
goto reconnect;
+ }
break;
default:
- GNUNET_break(0);
+ GNUNET_break (0);
goto reconnect;
}
ph->backoff = GNUNET_TIME_UNIT_ZERO;
@@ -622,17 +644,21 @@
GNUNET_CLIENT_notify_transmit_ready_cancel (ph->th);
ph->th = NULL;
}
- GNUNET_CLIENT_disconnect (ph->client);
- ph->client = NULL;
- if (NULL != ph->addr_info_cb)
+ if (NULL != ph->client)
{
- /* Indicate reconnect */
- ph->addr_info_cb (ph->addr_info_cb_cls,
- NULL,
- GNUNET_NO,
- GNUNET_BANDWIDTH_value_init (0),
- GNUNET_BANDWIDTH_value_init (0),
- NULL);
+ GNUNET_CLIENT_disconnect (ph->client);
+ ph->client = NULL;
+ ph->in_receive = GNUNET_NO;
+ if (NULL != ph->addr_info_cb)
+ {
+ /* Indicate reconnect */
+ ph->addr_info_cb (ph->addr_info_cb_cls,
+ NULL,
+ GNUNET_NO,
+ GNUNET_BANDWIDTH_value_init (0),
+ GNUNET_BANDWIDTH_value_init (0),
+ NULL);
+ }
}
ph->backoff = GNUNET_TIME_STD_BACKOFF (ph->backoff);
ph->task = GNUNET_SCHEDULER_add_delayed (ph->backoff,
@@ -656,10 +682,6 @@
ph->client = GNUNET_CLIENT_connect ("ats",
ph->cfg);
GNUNET_assert (NULL != ph->client);
- GNUNET_CLIENT_receive (ph->client,
- &process_ats_message,
- ph,
- GNUNET_TIME_UNIT_FOREVER_REL);
if ((NULL == (p = ph->pending_head)) || (GNUNET_YES != p->is_init))
{
p = GNUNET_malloc (sizeof (struct PendingMessage) +
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35217 - gnunet/src/ats,
gnunet <=