[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22826 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22826 - gnunet/src/gns |
Date: |
Sun, 22 Jul 2012 22:46:09 +0200 |
Author: grothoff
Date: 2012-07-22 22:46:09 +0200 (Sun, 22 Jul 2012)
New Revision: 22826
Modified:
gnunet/src/gns/gnunet-dns2gns.c
gnunet/src/gns/gnunet-gns-helper-service-w32.c
Log:
-fix
Modified: gnunet/src/gns/gnunet-dns2gns.c
===================================================================
--- gnunet/src/gns/gnunet-dns2gns.c 2012-07-22 18:58:13 UTC (rev 22825)
+++ gnunet/src/gns/gnunet-dns2gns.c 2012-07-22 20:46:09 UTC (rev 22826)
@@ -188,7 +188,6 @@
* lookup
*
* @param cls closure
- * @param name "name" of the original lookup
* @param rd_count number of records
* @param rd the records in reply
*/
Modified: gnunet/src/gns/gnunet-gns-helper-service-w32.c
===================================================================
--- gnunet/src/gns/gnunet-gns-helper-service-w32.c 2012-07-22 18:58:13 UTC
(rev 22825)
+++ gnunet/src/gns/gnunet-gns-helper-service-w32.c 2012-07-22 20:46:09 UTC
(rev 22826)
@@ -104,8 +104,6 @@
*/
struct GNUNET_MessageHeader *msg;
- size_t msgsize;
-
/**
* Handle for the transmission request.
*/
@@ -154,7 +152,7 @@
tcc->th = NULL;
GNUNET_CONTAINER_DLL_remove (tcc_head, tcc_tail, tcc);
- msize = tcc->msgsize;
+ msize = ntohs (tcc->msg->size);
if (size == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -180,7 +178,8 @@
* @param msg message to transmit, will be freed!
*/
static void
-transmit (struct GNUNET_SERVER_Client *client, struct GNUNET_MessageHeader
*msg, size_t msgsize)
+transmit (struct GNUNET_SERVER_Client *client,
+ struct GNUNET_MessageHeader *msg)
{
struct TransmitCallbackContext *tcc;
@@ -194,11 +193,11 @@
}
tcc = GNUNET_malloc (sizeof (struct TransmitCallbackContext));
tcc->msg = msg;
- tcc->msgsize = msgsize;
tcc->client = client;
if (NULL ==
(tcc->th =
- GNUNET_SERVER_notify_transmit_ready (client, msgsize,
+ GNUNET_SERVER_notify_transmit_ready (client,
+ ntohs (msg->size),
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_callback, tcc)))
{
@@ -249,9 +248,11 @@
MarshallPtr (qs->lpBlob, qs, BLOB);
}
+
static void
-process_ip_lookup_result (void* cls, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+process_ip_lookup_result (void* cls,
+ uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
int i, j, csanum;
struct request *rq = (struct request *) cls;
@@ -274,7 +275,7 @@
msg = GNUNET_malloc (size);
msg->header.size = htons (size);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_W32RESOLVER_RESPONSE);
- transmit (rq->client, &msg->header, msg->header.size);
+ transmit (rq->client, &msg->header);
return;
}
@@ -504,7 +505,7 @@
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);
}
MarshallWSAQUERYSETW (qs, &rq->sc);
- transmit (rq->client, &msg->header, size);
+ transmit (rq->client, &msg->header);
}
static void
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22826 - gnunet/src/gns,
gnunet <=