From a7695d91fec473c153487aa84c425f9cbbaf2a54 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 29 Jun 2012 13:38:52 +0000
Subject: [PATCH] -fix message types for namestore, eliminate conflict with LM

---
 src/include/gnunet_protocols.h | 80 ++++++++++++++++++++++++++++++++--
 src/namestore/namestore.h      | 23 ----------
 2 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 47a2eb599..15f64fb7d 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1301,15 +1301,87 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_FINISHED 426
 
+
 /*******************************************************************************
  * NAMESTORE message types
  ******************************************************************************/
 
 /**
- * Request update and listing of a peer.
+ * Client to service: register.
  */
 #define GNUNET_MESSAGE_TYPE_NAMESTORE_START 430
 
+/**
+ * Client to service: lookup name
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME 431
+
+/**
+ * Service to client: result of name lookup
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE 432
+
+/**
+ * Client to service: put records (for caching)
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT 433
+
+/**
+ * Service to client: result of put operation.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE 434
+
+/**
+ * Client to service: create record as authority
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE 435
+
+/**
+ * Service to client: result of record creation request
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE 436
+
+/**
+ * Client to service: remove record(s)
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE 437
+
+/**
+ * Service to client: result of removal request.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE 438
+
+/**
+ * Client to service: "reverse" lookup for zone name based on zone key
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME 439
+
+/**
+ * Service to client: result of zone-to-name lookup.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE 440
+
+/**
+ * Client to service: please start iteration
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START 445
+
+/**
+ * Service to client: current record in iteration (or end of list).
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE 446
+
+/**
+ * Client to service: next record in iteration please.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 447
+
+/**
+ * Client to service: stop iterating.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 448
+
+
 /*******************************************************************************
  * LOCKMANAGER message types
  ******************************************************************************/
@@ -1317,17 +1389,17 @@ extern "C"
 /**
  * Message to acquire Lock
  */
-#define GNUNET_MESSAGE_TYPE_LOCKMANAGER_ACQUIRE 440
+#define GNUNET_MESSAGE_TYPE_LOCKMANAGER_ACQUIRE 450
 
 /**
  * Message to release lock
  */
-#define GNUNET_MESSAGE_TYPE_LOCKMANAGER_RELEASE 441
+#define GNUNET_MESSAGE_TYPE_LOCKMANAGER_RELEASE 451
 
 /**
  * SUCESS reply from lockmanager
  */
-#define GNUNET_MESSAGE_TYPE_LOCKMANAGER_SUCCESS 442
+#define GNUNET_MESSAGE_TYPE_LOCKMANAGER_SUCCESS 452
 
 /*******************************************************************************
  * TESTBED message types
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index ca4dae8d8..49015f158 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -31,29 +31,6 @@
  */
 #define MAX_NAME_LEN 256
 
-
-
-/*
- * Collect message types here, move to protocols later
- */
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_START 430
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME 431
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE 432
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT 433
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE 434
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE 435
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE_RESPONSE 436
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE 437
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE 438
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME 439
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_TO_NAME_RESPONSE 440
-
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START 445
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE 446
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 447
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 448
-
-
 /**
  * Convert a short hash to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
-- 
2.25.1