[gnunet] branch master updated (27e4f78f3 -> 0d7bbcd3a)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 27e4f78f3 - fixed warning, raised log level for udp backchannel test
     new a0b8084ca DHT: Remove unused processing option
     new 0d7bbcd3a DHT: Update wire formats.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/dht/gnunet-service-dht_neighbours.c | 47 ++++++++++++++++++---------------
 src/include/gnunet_dht_service.h        | 12 +++------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/dht/gnunet-service-dht_neighbours.c 
b/src/dht/gnunet-service-dht_neighbours.c
index 6465d8d57..02dab849b 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -115,29 +115,29 @@ struct PeerPutMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Processing options
+   * Content type.
    */
-  uint32_t options GNUNET_PACKED;
+  uint32_t type GNUNET_PACKED;
 
   /**
-   * Content type.
+   * Processing options
    */
-  uint32_t type GNUNET_PACKED;
+  uint16_t options GNUNET_PACKED;
 
   /**
    * Hop count
    */
-  uint32_t hop_count GNUNET_PACKED;
+  uint16_t hop_count GNUNET_PACKED;
 
   /**
    * Replication level for this message
    */
-  uint32_t desired_replication_level GNUNET_PACKED;
+  uint16_t desired_replication_level GNUNET_PACKED;
 
   /**
    * Length of the PUT path that follows (if tracked).
    */
-  uint32_t put_path_length GNUNET_PACKED;
+  uint16_t put_path_length GNUNET_PACKED;
 
   /**
    * When does the content expire?
@@ -175,15 +175,20 @@ struct PeerResultMessage
    */
   uint32_t type GNUNET_PACKED;
 
+  /**
+   * Reserved.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * Length of the PUT path that follows (if tracked).
    */
-  uint32_t put_path_length GNUNET_PACKED;
+  uint16_t put_path_length GNUNET_PACKED;
 
   /**
    * Length of the GET path that follows (if tracked).
    */
-  uint32_t get_path_length GNUNET_PACKED;
+  uint16_t get_path_length GNUNET_PACKED;
 
   /**
    * When does the content expire?
@@ -214,34 +219,29 @@ struct PeerGetMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Processing options
+   * Desired content type.
    */
-  uint32_t options GNUNET_PACKED;
+  uint32_t type GNUNET_PACKED;
 
   /**
-   * Desired content type.
+   * Processing options
    */
-  uint32_t type GNUNET_PACKED;
+  uint16_t options GNUNET_PACKED;
 
   /**
    * Hop count
    */
-  uint32_t hop_count GNUNET_PACKED;
+  uint16_t hop_count GNUNET_PACKED;
 
   /**
    * Desired replication level for this request.
    */
-  uint32_t desired_replication_level GNUNET_PACKED;
+  uint16_t desired_replication_level GNUNET_PACKED;
 
   /**
    * Size of the extended query.
    */
-  uint32_t xquery_size;
-
-  /**
-   * Bloomfilter mutator.
-   */
-  uint32_t bf_mutator;
+  uint16_t xquery_size;
 
   /**
    * Bloomfilter (for peer identities) to stop circular routes
@@ -253,6 +253,11 @@ struct PeerGetMessage
    */
   struct GNUNET_HashCode key;
 
+  /**
+   * Bloomfilter mutator.
+   */
+  uint32_t bf_mutator;
+
   /* xquery */
 
   /* result bloomfilter */
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index 34628e1fb..d4a4ed7d2 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -100,14 +100,10 @@ enum GNUNET_DHT_RouteOption
   GNUNET_DHT_RO_FIND_PEER = 4,
 
   /**
-   * Possible message option for query key randomization.
-   */
-  GNUNET_DHT_RO_BART = 8,
-
-  /**
-   * Flag given to monitors if this was the last hop for a GET/PUT.
-   */
-  GNUNET_DHT_RO_LAST_HOP = 16
+    * Flag given to monitors if this was the last hop for a GET/PUT.
+    * This is only used for internal processing.
+    */
+  GNUNET_DHT_RO_LAST_HOP = 65535
 };
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.