/**
* request id
*/
- uint64_t r_id;
+ uint32_t r_id;
};
*/
struct GNUNET_GNS_ShortenRequest *prev;
- /* handle to gns */
+ /**
+ * handle to gns
+ */
struct GNUNET_GNS_Handle *gns_handle;
- /* processor to call on shorten result */
+ /**
+ * processor to call on shorten result
+ */
GNUNET_GNS_ShortenResultProcessor shorten_proc;
- /* processor closure */
+ /**
+ * processor closure
+ */
void *proc_cls;
- /* request id */
- uint64_t r_id;
-
+ /**
+ * request id
+ */
+ uint32_t r_id;
};
*/
struct GNUNET_GNS_GetAuthRequest *prev;
- /* handle to gns */
+ /**
+ * handle to gns
+ */
struct GNUNET_GNS_Handle *gns_handle;
- /* processor to call on authority lookup result */
+ /**
+ * processor to call on authority lookup result
+ */
GNUNET_GNS_GetAuthResultProcessor auth_proc;
- /* processor closure */
+ /**
+ * processor closure
+ */
void *proc_cls;
- /* request id */
+ /**
+ * request id
+ */
uint32_t r_id;
};
*/
struct PendingMessage *next;
+ /**
+ * Size of the message.
+ */
+ size_t size;
+
/**
* request id
*/
- uint64_t r_id;
+ uint32_t r_id;
/**
- * Size of the message.
+ * This message has been transmitted. GNUNET_NO if the message is
+ * in the "pending" DLL, GNUNET_YES if it has been transmitted to
+ * the service via the current client connection.
*/
- size_t size;
+ int transmitted;
};
* Reconnect task
*/
GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+
+ /**
+ * How long do we wait until we try to reconnect?
+ */
+ struct GNUNET_TIME_Relative reconnect_backoff;
- uint32_t r_id;
+ /**
+ * Request Id generator. Incremented by one for each request.
+ */
+ uint32_t r_id_gen;
/**
* Did we start our receive loop yet?
/**
* Reconnect to GNS service.
*
- * @param h the handle to the GNS service
+ * @param handle the handle to the GNS service
*/
static void
-reconnect (struct GNUNET_GNS_Handle *h)
+reconnect (struct GNUNET_GNS_Handle *handle)
{
- GNUNET_assert (NULL == h->client);
+ GNUNET_assert (NULL == handle->client);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Trying to connect to GNS\n");
- h->client = GNUNET_CLIENT_connect ("gns", h->cfg);
- GNUNET_assert (NULL != h->client);
- process_pending_messages (h);
+ handle->client = GNUNET_CLIENT_connect ("gns", handle->cfg);
+ GNUNET_assert (NULL != handle->client);
+ process_pending_messages (handle);
}
static void
reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_GNS_Handle *h = cls;
+ struct GNUNET_GNS_Handle *handle = cls;
- h->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
- reconnect (h);
+ handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ reconnect (handle);
}
/**
* Disconnect from service and then reconnect.
*
- * @param h our handle
+ * @param handle our handle
*/
static void
-force_reconnect (struct GNUNET_GNS_Handle *h)
+force_reconnect (struct GNUNET_GNS_Handle *handle)
{
- GNUNET_CLIENT_disconnect (h->client);
- h->client = NULL;
- h->in_receive = GNUNET_NO;
- /* FIXME: 1s too long, exponential-backoff, starting at 1ms! (max = 1s might be OK) */
- h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ struct GNUNET_GNS_ShortenRequest *st;
+ struct GNUNET_GNS_LookupRequest *lh;
+ struct GNUNET_GNS_GetAuthRequest *ga;
+ struct PendingMessage *p;
+
+ GNUNET_CLIENT_disconnect (handle->client);
+ handle->client = NULL;
+ handle->in_receive = GNUNET_NO;
+ for (st = handle->shorten_head; NULL != st; st = st->next)
+ {
+ p = (struct PendingMessage *) &st[1];
+ if (GNUNET_NO == p->transmitted)
+ continue;
+ p->transmitted = GNUNET_NO;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ p);
+ }
+ for (lh = handle->lookup_head; NULL != lh; lh = lh->next)
+ {
+ p = (struct PendingMessage *) &lh[1];
+ if (GNUNET_NO == p->transmitted)
+ continue;
+ p->transmitted = GNUNET_NO;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ p);
+ }
+ for (ga = handle->get_auth_head; NULL != ga; ga = ga->next)
+ {
+ p = (struct PendingMessage *) &ga[1];
+ if (GNUNET_NO == p->transmitted)
+ continue;
+ p->transmitted = GNUNET_NO;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ handle->pending_tail,
+ p);
+ }
+ handle->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
+ handle->reconnect_task = GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
&reconnect_task,
- h);
+ handle);
}
/**
* Transmit the next pending message, called by notify_transmit_ready
*
- * @param fixme
+ * @param cls the closure
+ * @param size size of pending data
+ * @param buf buffer with pending data
+ * @return size data transmitted
*/
static size_t
transmit_pending (void *cls, size_t size, void *buf);
/**
* Try to send messages from list of messages to send
*
- * @param fixme
+ * @param handle the GNS handle
*/
static void
process_pending_messages (struct GNUNET_GNS_Handle *handle)
{
- struct PendingMessage *p;
+ struct PendingMessage *p = handle->pending_head;
if (NULL == handle->client)
return; /* wait for reconnect */
if (NULL != handle->th)
return; /* transmission request already pending */
- if (NULL == (p = handle->pending_head))
- return; /* no messages pending */
+
+ while ((NULL != p) && (p->transmitted == GNUNET_YES))
+ p = p->next;
+ if (NULL == p)
+ return; /* no messages pending */
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Trying to transmit %u bytes\n",
(unsigned int) p->size);
/**
* Transmit the next pending message, called by notify_transmit_ready
*
- * @param fixme
+ * @param cls the closure
+ * @param size size of pending data
+ * @param buf buffer with pending data
+ * @return size data transmitted
*/
static size_t
transmit_pending (void *cls, size_t size, void *buf)
struct PendingMessage *p;
size_t tsize;
- handle->th = NULL;
+ handle->th = NULL;
if ((0 == size) || (NULL == buf))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmission to GNS service failed!\n");
- force_reconnect(handle);
+ force_reconnect (handle);
return 0;
}
if (NULL == (p = handle->pending_head))
memcpy (&cbuf[tsize], &p[1], p->size);
tsize += p->size;
size -= p->size;
- GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail, p);
+ p->transmitted = GNUNET_YES;
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ p);
if (GNUNET_YES != handle->in_receive)
{
GNUNET_CLIENT_receive (handle->client, &process_message, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
handle->in_receive = GNUNET_YES;
}
- GNUNET_free (p);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending %u bytes\n",
process_shorten_reply (struct GNUNET_GNS_ShortenRequest *qe,
const struct GNUNET_GNS_ClientShortenResultMessage *msg)
{
- struct GNUNET_GNS_Handle *h = qe->gns_handle;
+ struct GNUNET_GNS_Handle *handle = qe->gns_handle;
+ struct PendingMessage *p = (struct PendingMessage *)&qe[1];
const char *short_name;
size_t mlen;
-
- GNUNET_CONTAINER_DLL_remove (h->shorten_head, h->shorten_tail, qe);
+
+ if (GNUNET_YES != p->transmitted)
+ {
+ /* service send reply to query we never managed to send!? */
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
mlen = ntohs (msg->header.size);
if (ntohs (msg->header.size) == sizeof (struct GNUNET_GNS_ClientShortenResultMessage))
- {
- /* service reports resolution failed */
- short_name = NULL;
- }
+ {
+ /* service reports resolution failed */
+ short_name = NULL;
+ }
else
+ {
+ short_name = (const char *) &msg[1];
+ if ('\0' != short_name[mlen - sizeof (struct GNUNET_GNS_ClientShortenResultMessage) - 1])
{
- short_name = (const char *) &msg[1];
- if ('\0' != short_name[mlen - sizeof (struct GNUNET_GNS_ClientShortenResultMessage) - 1])
- {
- GNUNET_break (0);
- // FIXME: reconnect and queue management logic is broken...
- qe->shorten_proc (qe->proc_cls, NULL);
- GNUNET_free (qe);
- force_reconnect (h);
- return;
- }
- }
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
+ }
+ GNUNET_CONTAINER_DLL_remove (handle->shorten_head, handle->shorten_tail, qe);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received shortened reply `%s' from GNS service\n",
short_name);
process_get_auth_reply (struct GNUNET_GNS_GetAuthRequest *qe,
const struct GNUNET_GNS_ClientGetAuthResultMessage *msg)
{
- struct GNUNET_GNS_Handle *h = qe->gns_handle;
+ struct GNUNET_GNS_Handle *handle = qe->gns_handle;
+ struct PendingMessage *p = (struct PendingMessage *)&qe[1];
const char *auth_name;
+ size_t mlen;
- GNUNET_CONTAINER_DLL_remove (h->get_auth_head, h->get_auth_tail, qe);
- auth_name = (char*)&msg[1];
-
- if (ntohs (((struct GNUNET_MessageHeader*)msg)->size) <
- sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage))
+ if (GNUNET_YES != p->transmitted)
{
- GNUNET_free(qe);
+ /* service send reply to query we never managed to send!? */
GNUNET_break (0);
- force_reconnect (h);
+ force_reconnect (handle);
return;
}
-
+ mlen = ntohs (msg->header.size);
+ if (mlen == sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage))
+ {
+ auth_name = NULL;
+ }
+ else
+ {
+ auth_name = (const char*) &msg[1];
+ if ('\0' != auth_name[mlen - sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage) - 1])
+ {
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
+ }
+ GNUNET_CONTAINER_DLL_remove (handle->get_auth_head, handle->get_auth_tail, qe);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received GET_AUTH reply `%s' from GNS service\n",
auth_name);
process_lookup_reply (struct GNUNET_GNS_LookupRequest *qe,
const struct GNUNET_GNS_ClientLookupResultMessage *msg)
{
- struct GNUNET_GNS_Handle *h = qe->gns_handle;
- int rd_count = ntohl(msg->rd_count);
- size_t len = ntohs (((struct GNUNET_MessageHeader*)msg)->size);
+ struct GNUNET_GNS_Handle *handle = qe->gns_handle;
+ struct PendingMessage *p = (struct PendingMessage *) &qe[1];
+ uint32_t rd_count = ntohl (msg->rd_count);
struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ size_t mlen;
- GNUNET_CONTAINER_DLL_remove (h->lookup_head, h->lookup_tail, qe);
-
- if (len < sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
+ if (GNUNET_YES != p->transmitted)
{
- GNUNET_free(qe);
+ /* service send reply to query we never managed to send!? */
GNUNET_break (0);
- force_reconnect (h);
+ force_reconnect (handle);
return;
}
-
- len -= sizeof (struct GNUNET_GNS_ClientLookupResultMessage);
- if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (len,
- (char*)&msg[1],
+ mlen = ntohs (msg->header.size);
+ mlen -= sizeof (struct GNUNET_GNS_ClientLookupResultMessage);
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (mlen,
+ (const char*) &msg[1],
rd_count,
rd))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to serialize lookup reply from GNS service!\n");
+ _("Failed to serialize lookup reply from GNS service!\n"));
qe->lookup_proc (qe->proc_cls, 0, NULL);
}
else
- {
-
+ {
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received lookup reply from GNS service (count=%d)\n",
- ntohl (msg->rd_count));
+ "Received lookup reply from GNS service (%u records)\n",
+ (unsigned int) rd_count);
qe->lookup_proc (qe->proc_cls, rd_count, rd);
}
+ GNUNET_CONTAINER_DLL_remove (handle->lookup_head, handle->lookup_tail, qe);
GNUNET_free (qe);
}
+
/**
* Handler for messages received from the GNS service
*
const struct GNUNET_GNS_ClientLookupResultMessage *lookup_msg;
const struct GNUNET_GNS_ClientShortenResultMessage *shorten_msg;
const struct GNUNET_GNS_ClientGetAuthResultMessage *get_auth_msg;
- uint64_t r_id;
+ uint32_t r_id;
if (NULL == msg)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got LOOKUP_RESULT msg\n");
if (ntohs (msg->size) < sizeof (struct GNUNET_GNS_ClientLookupResultMessage))
- {
- GNUNET_break (0);
- force_reconnect (handle);
- return;
- }
+ {
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
lookup_msg = (const struct GNUNET_GNS_ClientLookupResultMessage *) msg;
r_id = ntohl (lookup_msg->id);
for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
if (lr->r_id == r_id)
- {
- process_lookup_reply(lr, lookup_msg);
- break;
- }
+ {
+ process_lookup_reply(lr, lookup_msg);
+ break;
+ }
break;
case GNUNET_MESSAGE_TYPE_GNS_SHORTEN_RESULT:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got SHORTEN_RESULT msg\n");
if (ntohs (msg->size) < sizeof (struct GNUNET_GNS_ClientShortenResultMessage))
- {
- GNUNET_break (0);
- force_reconnect (handle);
- return;
- }
+ {
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
shorten_msg = (const struct GNUNET_GNS_ClientShortenResultMessage *) msg;
r_id = ntohl (shorten_msg->id);
for (sr = handle->shorten_head; NULL != sr; sr = sr->next)
if (sr->r_id == r_id)
- {
- process_shorten_reply (sr, shorten_msg);
- break;
- }
+ {
+ process_shorten_reply (sr, shorten_msg);
+ break;
+ }
break;
- case GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT:
+ case GNUNET_MESSAGE_TYPE_GNS_GET_AUTH_RESULT:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got GET_AUTH_RESULT msg\n");
if (ntohs (msg->size) < sizeof (struct GNUNET_GNS_ClientGetAuthResultMessage))
- {
- GNUNET_break (0);
- force_reconnect (handle);
- return;
- }
+ {
+ GNUNET_break (0);
+ force_reconnect (handle);
+ return;
+ }
get_auth_msg = (const struct GNUNET_GNS_ClientGetAuthResultMessage *) msg;
r_id = ntohl (get_auth_msg->id);
for (gar = handle->get_auth_head; NULL != gar; gar = gar->next)
if (gar->r_id == r_id)
- {
- process_get_auth_reply (gar, get_auth_msg);
- break;
- }
+ {
+ process_get_auth_reply (gar, get_auth_msg);
+ break;
+ }
break;
default:
GNUNET_break (0);
GNUNET_assert (NULL == handle->lookup_head);
GNUNET_assert (NULL == handle->shorten_head);
GNUNET_assert (NULL == handle->get_auth_head);
- GNUNET_free(handle);
- /* disco from GNS */
+ GNUNET_free (handle);
}
void
GNUNET_GNS_cancel_lookup_request (struct GNUNET_GNS_LookupRequest *lr)
{
- struct PendingMessage *tmp;
+ struct PendingMessage *p = (struct PendingMessage*) &lr[1];
GNUNET_assert (NULL != lr->gns_handle);
- for (tmp = lr->gns_handle->pending_head;
- NULL != tmp; tmp = tmp->next)
- {
- if (tmp->r_id == lr->r_id)
- break;
- }
-
- if (NULL != tmp)
- {
+ if (GNUNET_NO == p->transmitted)
GNUNET_CONTAINER_DLL_remove (lr->gns_handle->pending_head,
lr->gns_handle->pending_tail,
- tmp);
- GNUNET_free (tmp);
- }
-
+ p);
GNUNET_CONTAINER_DLL_remove (lr->gns_handle->lookup_head,
lr->gns_handle->lookup_tail,
lr);
-
GNUNET_free (lr);
}
void
GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr)
{
- struct PendingMessage *tmp;
+ struct PendingMessage *p = (struct PendingMessage*) &sr[1];
GNUNET_assert (NULL != sr->gns_handle);
- for (tmp = sr->gns_handle->pending_head;
- NULL != tmp; tmp = tmp->next)
- {
- if (tmp->r_id == sr->r_id)
- break;
- }
-
- if (NULL != tmp)
- {
+ if (GNUNET_NO == p->transmitted)
GNUNET_CONTAINER_DLL_remove (sr->gns_handle->pending_head,
sr->gns_handle->pending_tail,
- tmp);
- GNUNET_free (tmp);
- }
-
+ p);
GNUNET_CONTAINER_DLL_remove (sr->gns_handle->shorten_head,
sr->gns_handle->shorten_tail,
sr);
-
GNUNET_free (sr);
}
void
GNUNET_GNS_cancel_get_auth_request (struct GNUNET_GNS_GetAuthRequest *gar)
{
- struct PendingMessage *tmp;
+ struct PendingMessage *p = (struct PendingMessage*) &gar[1];
GNUNET_assert (NULL != gar->gns_handle);
- for (tmp = gar->gns_handle->pending_head;
- NULL != tmp; tmp = tmp->next)
- {
- if (tmp->r_id == gar->r_id)
- break;
- }
-
- if (NULL != tmp)
- {
+ if (GNUNET_NO == p->transmitted)
GNUNET_CONTAINER_DLL_remove (gar->gns_handle->pending_head,
gar->gns_handle->pending_tail,
- tmp);
- GNUNET_free (tmp);
- }
-
+ p);
GNUNET_CONTAINER_DLL_remove (gar->gns_handle->get_auth_head,
gar->gns_handle->get_auth_tail,
gar);
-
GNUNET_free (gar);
}
*/
struct GNUNET_GNS_LookupRequest*
GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
- const char * name,
- struct GNUNET_CRYPTO_ShortHashCode *zone,
- enum GNUNET_GNS_RecordType type,
- int only_cached,
- struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
- GNUNET_GNS_LookupResultProcessor proc,
- void *proc_cls)
+ const char *name,
+ struct GNUNET_CRYPTO_ShortHashCode *zone,
+ enum GNUNET_GNS_RecordType type,
+ int only_cached,
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+ GNUNET_GNS_LookupResultProcessor proc,
+ void *proc_cls)
{
/* IPC to shorten gns names, return shorten_handle */
struct GNUNET_GNS_ClientLookupMessage *lookup_msg;
{
GNUNET_break (0);
return NULL;
- }
-
+ }
if (NULL != shorten_key)
{
pkey_enc = GNUNET_CRYPTO_rsa_encode_key (shorten_key);
pkey_enc = NULL;
key_len = 0;
}
-
- msize = sizeof (struct GNUNET_GNS_ClientLookupMessage)
- + key_len + strlen (name) + 1;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to lookup %s in GNS\n",
+ "Trying to lookup `%s' in GNS\n",
name);
- lr = GNUNET_malloc (sizeof (struct GNUNET_GNS_LookupRequest));
+ msize = sizeof (struct GNUNET_GNS_ClientLookupMessage)
+ + key_len + strlen (name) + 1;
+ if (msize > UINT16_MAX)
+ {
+ GNUNET_break (0);
+ GNUNET_free (pkey_enc);
+ return NULL;
+ }
+ lr = GNUNET_malloc (sizeof (struct GNUNET_GNS_LookupRequest) +
+ sizeof (struct PendingMessage) + msize);
lr->gns_handle = handle;
lr->lookup_proc = proc;
lr->proc_cls = proc_cls;
- lr->r_id = handle->r_id++;
- GNUNET_CONTAINER_DLL_insert_tail (handle->lookup_head,
- handle->lookup_tail, lr);
-
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ lr->r_id = handle->r_id_gen++;
+ pending = (struct PendingMessage *)&lr[1];
pending->size = msize;
pending->r_id = lr->r_id;
+ GNUNET_CONTAINER_DLL_insert_tail (handle->lookup_head,
+ handle->lookup_tail, lr);
lookup_msg = (struct GNUNET_GNS_ClientLookupMessage *) &pending[1];
lookup_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_LOOKUP);
* @param proc_cls closure for processor
* @return handle to the lookup request
*/
-struct GNUNET_GNS_LookupRequest*
+struct GNUNET_GNS_LookupRequest *
GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
- const char * name,
+ const char *name,
enum GNUNET_GNS_RecordType type,
int only_cached,
struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
*/
struct GNUNET_GNS_ShortenRequest*
GNUNET_GNS_shorten_zone (struct GNUNET_GNS_Handle *handle,
- const char * name,
+ const char *name,
struct GNUNET_CRYPTO_ShortHashCode *private_zone,
struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
struct GNUNET_CRYPTO_ShortHashCode *zone,
GNUNET_break (0);
return NULL;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to shorten %s in GNS\n", name);
-
- msize = sizeof (struct GNUNET_GNS_ClientShortenMessage) + strlen(name) + 1;
- sr = GNUNET_malloc (sizeof (struct GNUNET_GNS_ShortenRequest));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to shorten `%s' in GNS\n", name);
+ msize = sizeof (struct GNUNET_GNS_ClientShortenMessage) + strlen (name) + 1;
+ if (msize > UINT16_MAX)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ sr = GNUNET_malloc (sizeof (struct GNUNET_GNS_ShortenRequest) +
+ sizeof (struct PendingMessage) + msize);
sr->gns_handle = handle;
sr->shorten_proc = proc;
sr->proc_cls = proc_cls;
- sr->r_id = handle->r_id++;
+ sr->r_id = handle->r_id_gen++;
GNUNET_CONTAINER_DLL_insert_tail (handle->shorten_head,
handle->shorten_tail, sr);
-
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ pending = (struct PendingMessage *)&sr[1];
pending->size = msize;
pending->r_id = sr->r_id;
shorten_msg = (struct GNUNET_GNS_ClientShortenMessage *) &pending[1];
shorten_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_SHORTEN);
- shorten_msg->header.size = htons (msize);
+ shorten_msg->header.size = htons ((uint16_t) msize);
shorten_msg->id = htonl (sr->r_id);
shorten_msg->private_zone = *private_zone;
- shorten_msg->shorten_zone = *shorten_zone;
-
+ shorten_msg->shorten_zone = *shorten_zone;
if (NULL != zone)
{
shorten_msg->use_default_zone = htonl (GNUNET_NO);
{
shorten_msg->use_default_zone = htonl (GNUNET_YES);
memset (&shorten_msg->zone, 0, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
- }
-
+ }
memcpy (&shorten_msg[1], name, strlen (name) + 1);
-
GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail,
- pending);
-
+ pending);
process_pending_messages (handle);
return sr;
}
*/
struct GNUNET_GNS_ShortenRequest*
GNUNET_GNS_shorten (struct GNUNET_GNS_Handle *handle,
- const char * name,
+ const char *name,
struct GNUNET_CRYPTO_ShortHashCode *private_zone,
struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
GNUNET_GNS_ShortenResultProcessor proc,
*/
struct GNUNET_GNS_GetAuthRequest*
GNUNET_GNS_get_authority (struct GNUNET_GNS_Handle *handle,
- const char * name,
- GNUNET_GNS_GetAuthResultProcessor proc,
- void *proc_cls)
+ const char *name,
+ GNUNET_GNS_GetAuthResultProcessor proc,
+ void *proc_cls)
{
struct GNUNET_GNS_ClientGetAuthMessage *get_auth_msg;
struct GNUNET_GNS_GetAuthRequest *gar;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Trying to look up authority for %s in GNS\n", name);
-
msize = sizeof (struct GNUNET_GNS_ClientGetAuthMessage) + strlen (name) + 1;
- gar = GNUNET_malloc (sizeof (struct GNUNET_GNS_GetAuthRequest));
+ if (msize > UINT16_MAX)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ gar = GNUNET_malloc (sizeof (struct GNUNET_GNS_GetAuthRequest) +
+ sizeof (struct PendingMessage) + msize);
gar->gns_handle = handle;
gar->auth_proc = proc;
gar->proc_cls = proc_cls;
- gar->r_id = handle->r_id++;
+ gar->r_id = handle->r_id_gen++;
GNUNET_CONTAINER_DLL_insert_tail (handle->get_auth_head,
handle->get_auth_tail, gar);
- pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ pending = (struct PendingMessage *) &gar[1];
pending->size = msize;
pending->r_id = gar->r_id;
get_auth_msg = (struct GNUNET_GNS_ClientGetAuthMessage *) &pending[1];
get_auth_msg->header.type = htons (GNUNET_MESSAGE_TYPE_GNS_GET_AUTH);
get_auth_msg->header.size = htons (msize);
get_auth_msg->id = htonl (gar->r_id);
- memcpy (&get_auth_msg[1], name, strlen(name) + 1);
-
+ memcpy (&get_auth_msg[1], name, strlen (name) + 1);
GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head,
handle->pending_tail,
pending);
projects / oweals / gnunet.git / blobdiff