diff options
| author | Martin Schanzenbach <schanzen@gnunet.org> | 2021-12-03 18:22:15 +0100 |
|---|---|---|
| committer | Martin Schanzenbach <schanzen@gnunet.org> | 2021-12-03 18:22:15 +0100 |
| commit | 0d7bbcd3ab20cf6c259bc6fd3eb5b2c05e7f71d4 (patch) | |
| tree | 3d477982eecdb88ea128c8bbfd10ec41d126b58e | |
| parent | a0b8084ca93b19191ad0529ae349b4821ff905d6 (diff) | |
DHT: Update wire formats.v0.16.0-alpha.0
| -rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 47 |
1 files changed, 26 insertions, 21 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? @@ -176,14 +176,19 @@ 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 */ |