diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-helper-service-w32.c | 21 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 3c48c4268..741c8dd00 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -188,7 +188,6 @@ do_timeout (void *cls, | |||
188 | * lookup | 188 | * lookup |
189 | * | 189 | * |
190 | * @param cls closure | 190 | * @param cls closure |
191 | * @param name "name" of the original lookup | ||
192 | * @param rd_count number of records | 191 | * @param rd_count number of records |
193 | * @param rd the records in reply | 192 | * @param rd the records in reply |
194 | */ | 193 | */ |
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index 198dfb851..d291e9557 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c | |||
@@ -104,8 +104,6 @@ struct TransmitCallbackContext | |||
104 | */ | 104 | */ |
105 | struct GNUNET_MessageHeader *msg; | 105 | struct GNUNET_MessageHeader *msg; |
106 | 106 | ||
107 | size_t msgsize; | ||
108 | |||
109 | /** | 107 | /** |
110 | * Handle for the transmission request. | 108 | * Handle for the transmission request. |
111 | */ | 109 | */ |
@@ -154,7 +152,7 @@ transmit_callback (void *cls, size_t size, void *buf) | |||
154 | 152 | ||
155 | tcc->th = NULL; | 153 | tcc->th = NULL; |
156 | GNUNET_CONTAINER_DLL_remove (tcc_head, tcc_tail, tcc); | 154 | GNUNET_CONTAINER_DLL_remove (tcc_head, tcc_tail, tcc); |
157 | msize = tcc->msgsize; | 155 | msize = ntohs (tcc->msg->size); |
158 | if (size == 0) | 156 | if (size == 0) |
159 | { | 157 | { |
160 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 158 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
@@ -180,7 +178,8 @@ transmit_callback (void *cls, size_t size, void *buf) | |||
180 | * @param msg message to transmit, will be freed! | 178 | * @param msg message to transmit, will be freed! |
181 | */ | 179 | */ |
182 | static void | 180 | static void |
183 | transmit (struct GNUNET_SERVER_Client *client, struct GNUNET_MessageHeader *msg, size_t msgsize) | 181 | transmit (struct GNUNET_SERVER_Client *client, |
182 | struct GNUNET_MessageHeader *msg) | ||
184 | { | 183 | { |
185 | struct TransmitCallbackContext *tcc; | 184 | struct TransmitCallbackContext *tcc; |
186 | 185 | ||
@@ -194,11 +193,11 @@ transmit (struct GNUNET_SERVER_Client *client, struct GNUNET_MessageHeader *msg, | |||
194 | } | 193 | } |
195 | tcc = GNUNET_malloc (sizeof (struct TransmitCallbackContext)); | 194 | tcc = GNUNET_malloc (sizeof (struct TransmitCallbackContext)); |
196 | tcc->msg = msg; | 195 | tcc->msg = msg; |
197 | tcc->msgsize = msgsize; | ||
198 | tcc->client = client; | 196 | tcc->client = client; |
199 | if (NULL == | 197 | if (NULL == |
200 | (tcc->th = | 198 | (tcc->th = |
201 | GNUNET_SERVER_notify_transmit_ready (client, msgsize, | 199 | GNUNET_SERVER_notify_transmit_ready (client, |
200 | ntohs (msg->size), | ||
202 | GNUNET_TIME_UNIT_FOREVER_REL, | 201 | GNUNET_TIME_UNIT_FOREVER_REL, |
203 | &transmit_callback, tcc))) | 202 | &transmit_callback, tcc))) |
204 | { | 203 | { |
@@ -249,9 +248,11 @@ MarshallWSAQUERYSETW (WSAQUERYSETW *qs, GUID *sc) | |||
249 | MarshallPtr (qs->lpBlob, qs, BLOB); | 248 | MarshallPtr (qs->lpBlob, qs, BLOB); |
250 | } | 249 | } |
251 | 250 | ||
251 | |||
252 | static void | 252 | static void |
253 | process_ip_lookup_result (void* cls, uint32_t rd_count, | 253 | process_ip_lookup_result (void* cls, |
254 | const struct GNUNET_NAMESTORE_RecordData *rd) | 254 | uint32_t rd_count, |
255 | const struct GNUNET_NAMESTORE_RecordData *rd) | ||
255 | { | 256 | { |
256 | int i, j, csanum; | 257 | int i, j, csanum; |
257 | struct request *rq = (struct request *) cls; | 258 | struct request *rq = (struct request *) cls; |
@@ -274,7 +275,7 @@ process_ip_lookup_result (void* cls, uint32_t rd_count, | |||
274 | msg = GNUNET_malloc (size); | 275 | msg = GNUNET_malloc (size); |
275 | msg->header.size = htons (size); | 276 | msg->header.size = htons (size); |
276 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_W32RESOLVER_RESPONSE); | 277 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_W32RESOLVER_RESPONSE); |
277 | transmit (rq->client, &msg->header, msg->header.size); | 278 | transmit (rq->client, &msg->header); |
278 | return; | 279 | return; |
279 | } | 280 | } |
280 | 281 | ||
@@ -504,7 +505,7 @@ process_ip_lookup_result (void* cls, uint32_t rd_count, | |||
504 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error in WSAQUERYSETW size calc: expected %lu, got %lu (recalc %lu)\n", size, (unsigned long) ((char *) ptr - (char *) msg), size_recalc); | 505 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error in WSAQUERYSETW size calc: expected %lu, got %lu (recalc %lu)\n", size, (unsigned long) ((char *) ptr - (char *) msg), size_recalc); |
505 | } | 506 | } |
506 | MarshallWSAQUERYSETW (qs, &rq->sc); | 507 | MarshallWSAQUERYSETW (qs, &rq->sc); |
507 | transmit (rq->client, &msg->header, size); | 508 | transmit (rq->client, &msg->header); |
508 | } | 509 | } |
509 | 510 | ||
510 | static void | 511 | static void |