diff options
Diffstat (limited to 'src/nse/nse_api.c')
-rw-r--r-- | src/nse/nse_api.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index 62c58ca77..8ff0256b9 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c | |||
@@ -85,8 +85,8 @@ struct GNUNET_NSE_Handle | |||
85 | * @param cls the handle to the transport service | 85 | * @param cls the handle to the transport service |
86 | * @param tc scheduler context | 86 | * @param tc scheduler context |
87 | */ | 87 | */ |
88 | static void | 88 | static void reconnect (void *cls, |
89 | reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 89 | const struct GNUNET_SCHEDULER_TaskContext *tc); |
90 | 90 | ||
91 | 91 | ||
92 | /** | 92 | /** |
@@ -107,8 +107,8 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
107 | /* Error, timeout, death */ | 107 | /* Error, timeout, death */ |
108 | GNUNET_CLIENT_disconnect (h->client, GNUNET_NO); | 108 | GNUNET_CLIENT_disconnect (h->client, GNUNET_NO); |
109 | h->client = NULL; | 109 | h->client = NULL; |
110 | h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, | 110 | h->reconnect_task = |
111 | &reconnect, h); | 111 | GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h); |
112 | return; | 112 | return; |
113 | } | 113 | } |
114 | if ((ntohs (msg->size) != sizeof (struct GNUNET_NSE_ClientMessage)) || | 114 | if ((ntohs (msg->size) != sizeof (struct GNUNET_NSE_ClientMessage)) || |
@@ -118,11 +118,10 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
118 | return; | 118 | return; |
119 | } | 119 | } |
120 | client_msg = (const struct GNUNET_NSE_ClientMessage *) msg; | 120 | client_msg = (const struct GNUNET_NSE_ClientMessage *) msg; |
121 | h->recv_cb (h->recv_cb_cls, | 121 | h->recv_cb (h->recv_cb_cls, GNUNET_TIME_absolute_ntoh (client_msg->timestamp), |
122 | GNUNET_TIME_absolute_ntoh (client_msg->timestamp), | ||
123 | client_msg->size_estimate, client_msg->std_deviation); | 122 | client_msg->size_estimate, client_msg->std_deviation); |
124 | GNUNET_CLIENT_receive (h->client, | 123 | GNUNET_CLIENT_receive (h->client, &message_handler, h, |
125 | &message_handler, h, GNUNET_TIME_UNIT_FOREVER_REL); | 124 | GNUNET_TIME_UNIT_FOREVER_REL); |
126 | } | 125 | } |
127 | 126 | ||
128 | 127 | ||
@@ -153,8 +152,8 @@ reschedule_connect (struct GNUNET_NSE_Handle *h) | |||
153 | "Scheduling task to reconnect to nse service in %llu ms.\n", | 152 | "Scheduling task to reconnect to nse service in %llu ms.\n", |
154 | h->reconnect_delay.rel_value); | 153 | h->reconnect_delay.rel_value); |
155 | #endif | 154 | #endif |
156 | h->reconnect_task | 155 | h->reconnect_task = |
157 | = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h); | 156 | GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h); |
158 | if (h->reconnect_delay.rel_value == 0) | 157 | if (h->reconnect_delay.rel_value == 0) |
159 | { | 158 | { |
160 | h->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS; | 159 | h->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS; |
@@ -162,8 +161,8 @@ reschedule_connect (struct GNUNET_NSE_Handle *h) | |||
162 | else | 161 | else |
163 | { | 162 | { |
164 | h->reconnect_delay = GNUNET_TIME_relative_multiply (h->reconnect_delay, 2); | 163 | h->reconnect_delay = GNUNET_TIME_relative_multiply (h->reconnect_delay, 2); |
165 | h->reconnect_delay = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, | 164 | h->reconnect_delay = |
166 | h->reconnect_delay); | 165 | GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, h->reconnect_delay); |
167 | } | 166 | } |
168 | } | 167 | } |
169 | 168 | ||
@@ -201,8 +200,8 @@ send_start (void *cls, size_t size, void *buf) | |||
201 | msg = (struct GNUNET_MessageHeader *) buf; | 200 | msg = (struct GNUNET_MessageHeader *) buf; |
202 | msg->size = htons (sizeof (struct GNUNET_MessageHeader)); | 201 | msg->size = htons (sizeof (struct GNUNET_MessageHeader)); |
203 | msg->type = htons (GNUNET_MESSAGE_TYPE_NSE_START); | 202 | msg->type = htons (GNUNET_MESSAGE_TYPE_NSE_START); |
204 | GNUNET_CLIENT_receive (h->client, | 203 | GNUNET_CLIENT_receive (h->client, &message_handler, h, |
205 | &message_handler, h, GNUNET_TIME_UNIT_FOREVER_REL); | 204 | GNUNET_TIME_UNIT_FOREVER_REL); |
206 | return sizeof (struct GNUNET_MessageHeader); | 205 | return sizeof (struct GNUNET_MessageHeader); |
207 | } | 206 | } |
208 | 207 | ||