[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30407 - in gnunet/src: include namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30407 - in gnunet/src: include namestore |
Date: |
Fri, 25 Oct 2013 14:59:41 +0200 |
Author: wachs
Date: 2013-10-25 14:59:41 +0200 (Fri, 25 Oct 2013)
New Revision: 30407
Added:
gnunet/src/namestore/test_namestore_api_lookup_private.c
Modified:
gnunet/src/include/gnunet_protocols.h
gnunet/src/namestore/Makefile.am
gnunet/src/namestore/gnunet-service-namestore.c
gnunet/src/namestore/namestore.h
gnunet/src/namestore/namestore_api.c
Log:
- clean protocol number
- added lookup protocol numbers
- implemented lookup sending
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2013-10-24 16:05:16 UTC (rev
30406)
+++ gnunet/src/include/gnunet_protocols.h 2013-10-25 12:59:41 UTC (rev
30407)
@@ -1356,25 +1356,21 @@
/**
* Client to service: lookup block
*/
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK 431
#define GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK 431
/**
* Service to client: result of block lookup
*/
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_BLOCK_RESPONSE 432
#define GNUNET_MESSAGE_TYPE_NAMECACHE_LOOKUP_BLOCK_RESPONSE 432
/**
* Client to service: cache a block
*/
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE 433
#define GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE 433
/**
* Service to client: result of block cache request
*/
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_BLOCK_CACHE_RESPONSE 434
#define GNUNET_MESSAGE_TYPE_NAMECACHE_BLOCK_CACHE_RESPONSE 434
/*******************************************************************************
@@ -1392,6 +1388,16 @@
#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE_RESPONSE 436
/**
+ * Client to service: lookup label
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP 437
+
+/**
+ * Service to client: lookup label
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP_RESPONSE 438
+
+/**
* Client to service: "reverse" lookup for zone name based on zone key
*/
#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME 439
@@ -1433,11 +1439,6 @@
*/
#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 448
-/**
- * Client to service: lookup label
- */
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_LABEL_LOOKUP 449
-
/*******************************************************************************
* LOCKMANAGER message types
******************************************************************************/
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2013-10-24 16:05:16 UTC (rev 30406)
+++ gnunet/src/namestore/Makefile.am 2013-10-25 12:59:41 UTC (rev 30407)
@@ -40,6 +40,7 @@
test_namestore_api_store \
test_namestore_api_store_update \
test_namestore_api_lookup_public \
+ test_namestore_api_lookup_private \
test_namestore_api_remove \
test_namestore_api_remove_not_existing_record \
test_namestore_api_zone_iteration \
@@ -196,6 +197,15 @@
$(top_builddir)/src/namecache/libgnunetnamecache.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la
+test_namestore_api_lookup_private_SOURCES = \
+ test_namestore_api_lookup_private.c
+test_namestore_api_lookup_private_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+ $(top_builddir)/src/namecache/libgnunetnamecache.la \
+ $(top_builddir)/src/namestore/libgnunetnamestore.la
+
test_namestore_api_put_SOURCES = \
test_namestore_api_put.c
test_namestore_api_put_LDADD = \
Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c 2013-10-24 16:05:16 UTC
(rev 30406)
+++ gnunet/src/namestore/gnunet-service-namestore.c 2013-10-25 12:59:41 UTC
(rev 30407)
@@ -561,7 +561,50 @@
GNUNET_free (block);
}
+/**
+ * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP message
+ *
+ * @param cls unused
+ * @param client client sending the message
+ * @param message message of type 'struct RecordCreateMessage'
+ */
+static void
+handle_record_lookup (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct LabelLookupMessage * ll_msg;
+ const char *name_tmp;
+ uint32_t rid;
+ uint32_t name_len;
+ size_t msg_size;
+ if (ntohs (message->size) < sizeof (struct LabelLookupMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+
+ ll_msg = (const struct LabelLookupMessage *) message;
+ rid = ntohl (ll_msg->gns_header.r_id);
+ name_len = ntohs (ll_msg->label_len);
+ msg_size = ntohs (message->size);
+
+ if (name_len != msg_size - sizeof (struct LabelLookupMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ name_tmp = &ll_msg[1];
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message for name `%s'\n",
+ "NAMESTORE_RECORD_LOOKUP", name_tmp);
+}
+
+
/**
* Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE message
*
@@ -1292,6 +1335,8 @@
static const struct GNUNET_SERVER_MessageHandler handlers[] = {
{&handle_record_store, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_STORE, 0},
+ {&handle_record_lookup, NULL,
+ GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP, 0},
{&handle_zone_to_name, NULL,
GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME, sizeof (struct
ZoneToNameMessage) },
{&handle_iteration_start, NULL,
Modified: gnunet/src/namestore/namestore.h
===================================================================
--- gnunet/src/namestore/namestore.h 2013-10-24 16:05:16 UTC (rev 30406)
+++ gnunet/src/namestore/namestore.h 2013-10-25 12:59:41 UTC (rev 30407)
@@ -215,19 +215,19 @@
struct LabelLookupMessage
{
/**
- * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_LABEL_LOOKUP
+ * Type will be #GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP
*/
struct GNUNET_NAMESTORE_Header gns_header;
/**
- * The private key of the zone to look up in
+ * Length of the name
*/
- struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
+ uint32_t label_len GNUNET_PACKED;
/**
- * Length of the name
+ * The private key of the zone to look up in
*/
- uint16_t label_len GNUNET_PACKED;
+ struct GNUNET_CRYPTO_EcdsaPrivateKey zone;
/* followed by:
* name with length name_len
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2013-10-24 16:05:16 UTC (rev
30406)
+++ gnunet/src/namestore/namestore_api.c 2013-10-25 12:59:41 UTC (rev
30407)
@@ -1022,11 +1022,12 @@
pe = GNUNET_malloc (sizeof (struct PendingMessage) + msg_size);
pe->size = msg_size;
msg = (struct LabelLookupMessage *) &pe[1];
- msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_LABEL_LOOKUP);
+ msg->gns_header.header.type = htons
(GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_LOOKUP);
msg->gns_header.header.size = htons (msg_size);
msg->gns_header.r_id = htonl (qe->op_id);
msg->zone = *pkey;
msg->label_len = htons(label_len);
+ memcpy (&msg[1], label, label_len);
/* transmit message */
GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
Added: gnunet/src/namestore/test_namestore_api_lookup_private.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup_private.c
(rev 0)
+++ gnunet/src/namestore/test_namestore_api_lookup_private.c 2013-10-25
12:59:41 UTC (rev 30407)
@@ -0,0 +1,186 @@
+/*
+ This file is part of GNUnet.
+ (C) 2012 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file namestore/test_namestore_api_store.c
+ * @brief testcase for namestore_api.c: store a record
+ */
+#include "platform.h"
+#include "gnunet_namestore_service.h"
+#include "gnunet_testing_lib.h"
+
+#define TEST_RECORD_TYPE 1234
+
+#define TEST_RECORD_DATALEN 123
+
+#define TEST_RECORD_DATA 'a'
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
+static struct GNUNET_NAMESTORE_Handle *nsh;
+
+static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+
+static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
+
+static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
+
+static int res;
+
+static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+
+static const char * name = "dummy.dummy.gnunet";
+
+static void
+cleanup ()
+{
+ if (NULL != nsh)
+ {
+ GNUNET_NAMESTORE_disconnect (nsh);
+ nsh = NULL;
+ }
+ if (NULL != privkey)
+ {
+ GNUNET_free (privkey);
+ privkey = NULL;
+ }
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Re-establish the connection to the service.
+ *
+ * @param cls handle to use to re-connect.
+ * @param tc scheduler context
+ */
+static void
+endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ if (NULL != nsqe)
+ {
+ GNUNET_NAMESTORE_cancel (nsqe);
+ nsqe = NULL;
+ }
+ cleanup ();
+ res = 1;
+}
+
+
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ cleanup ();
+ res = 0;
+}
+
+void lookup_it (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ /* Check here */
+
+
+ /* Done */
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+}
+
+
+static void
+put_cont (void *cls, int32_t success, const char *emsg)
+{
+ const char *name = cls;
+
+ nsqe = NULL;
+ GNUNET_assert (NULL != cls);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Name store added record for `%s': %s\n",
+ name,
+ (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+
+ if (GNUNET_OK != success)
+ {
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ return;
+ }
+ /* Lookup */
+ nsqe = GNUNET_NAMESTORE_records_lookup (nsh, privkey, name, lookup_it, NULL);
+}
+
+
+static void
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
+{
+ struct GNUNET_GNSRECORD_Data rd;
+ char *hostkey_file;
+
+ endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &endbadly, NULL);
+ GNUNET_asprintf (&hostkey_file,
+ "zonefiles%s%s",
+ DIR_SEPARATOR_STR,
+ "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n",
hostkey_file);
+ privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file (hostkey_file);
+ GNUNET_free (hostkey_file);
+ GNUNET_assert (privkey != NULL);
+ GNUNET_CRYPTO_ecdsa_key_get_public (privkey, &pubkey);
+
+ rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+ rd.record_type = TEST_RECORD_TYPE;
+ rd.data_size = TEST_RECORD_DATALEN;
+ rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+ memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
+
+ nsh = GNUNET_NAMESTORE_connect (cfg);
+ GNUNET_break (NULL != nsh);
+ nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name,
+ 1, &rd, &put_cont, (void *) name);
+ if (NULL == nsqe)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Namestore cannot store no block\n"));
+ }
+
+ GNUNET_free ((void *)rd.data);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+ res = 1;
+ if (0 !=
+ GNUNET_TESTING_peer_run ("test-namestore-api",
+ "test_namestore_api.conf",
+ &run,
+ NULL))
+ return 1;
+ return res;
+}
+
+
+/* end of test_namestore_api_store.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30407 - in gnunet/src: include namestore,
gnunet <=