[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20308 - gnunet/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20308 - gnunet/src/namestore |
Date: |
Tue, 6 Mar 2012 14:01:31 +0100 |
Author: wachs
Date: 2012-03-06 14:01:31 +0100 (Tue, 06 Mar 2012)
New Revision: 20308
Modified:
gnunet/src/namestore/gnunet-service-namestore.c
gnunet/src/namestore/namestore_api.c
gnunet/src/namestore/test_namestore_api.conf
Log:
- fixes
Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c 2012-03-06 12:49:02 UTC
(rev 20307)
+++ gnunet/src/namestore/gnunet-service-namestore.c 2012-03-06 13:01:31 UTC
(rev 20308)
@@ -311,7 +311,11 @@
lnr_msg->rd_len = htons (rd_ser_len);
lnr_msg->name_len = htons (name_len);
lnr_msg->expire = GNUNET_TIME_absolute_hton(expire);
- lnr_msg->public_key = (*zone_key);
+ if (zone_key != NULL)
+ lnr_msg->public_key = (*zone_key);
+ else
+ memset(&lnr_msg->public_key, '\0', sizeof (lnr_msg->public_key));
+
lnr_msg->contains_sig = htons (contains_signature);
if (GNUNET_YES == contains_signature)
lnr_msg->signature = *signature;
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2012-03-06 12:49:02 UTC (rev
20307)
+++ gnunet/src/namestore/namestore_api.c 2012-03-06 13:01:31 UTC (rev
20308)
@@ -259,6 +259,7 @@
struct GNUNET_CRYPTO_RsaSignature *signature = NULL;
struct GNUNET_TIME_Absolute expire;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key_tmp;
size_t exp_msg_len;
size_t msg_len = 0;
size_t name_len = 0;
@@ -284,11 +285,6 @@
GNUNET_break_op (0);
return;
}
- if (name_len == 0)
- {
- GNUNET_break_op (0);
- return;
- }
name = (char *) &msg[1];
rd_tmp = &name[name_len];
@@ -302,10 +298,16 @@
signature = NULL;
else
signature = &msg->signature;
+ if (name_len == 0)
+ name = NULL;
+ if ((name != NULL) && (signature != NULL) && (rd_count > 0))
+ public_key_tmp = &msg->public_key;
+ else
+ public_key_tmp = NULL;
if (qe->proc != NULL)
{
- qe->proc (qe->proc_cls, &msg->public_key, expire, name, rd_count,
(rd_count > 0) ? rd : NULL, signature);
+ qe->proc (qe->proc_cls, public_key_tmp, expire, name, rd_count, (rd_count
> 0) ? rd : NULL, signature);
}
/* Operation done, remove */
Modified: gnunet/src/namestore/test_namestore_api.conf
===================================================================
--- gnunet/src/namestore/test_namestore_api.conf 2012-03-06 12:49:02 UTC
(rev 20307)
+++ gnunet/src/namestore/test_namestore_api.conf 2012-03-06 13:01:31 UTC
(rev 20308)
@@ -4,7 +4,7 @@
UNIXPATH = /tmp/gnunet-p1-service-arm.sock
[namestore]
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
AUTOSTART = YES
UNIXPATH = /tmp/gnunet-service-namestore.sock
UNIX_MATCH_UID = YES
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20308 - gnunet/src/namestore,
gnunet <=