aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2021-12-03 18:22:15 +0100
committerMartin Schanzenbach <schanzen@gnunet.org>2021-12-03 18:22:15 +0100
commit0d7bbcd3ab20cf6c259bc6fd3eb5b2c05e7f71d4 (patch)
tree3d477982eecdb88ea128c8bbfd10ec41d126b58e
parenta0b8084ca93b19191ad0529ae349b4821ff905d6 (diff)
downloadgnunet-0d7bbcd3ab20cf6c259bc6fd3eb5b2c05e7f71d4.tar.gz
gnunet-0d7bbcd3ab20cf6c259bc6fd3eb5b2c05e7f71d4.zip
DHT: Update wire formats.v0.16.0-alpha.0
-rw-r--r--src/dht/gnunet-service-dht_neighbours.c47
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
115 struct GNUNET_MessageHeader header; 115 struct GNUNET_MessageHeader header;
116 116
117 /** 117 /**
118 * Processing options 118 * Content type.
119 */ 119 */
120 uint32_t options GNUNET_PACKED; 120 uint32_t type GNUNET_PACKED;
121 121
122 /** 122 /**
123 * Content type. 123 * Processing options
124 */ 124 */
125 uint32_t type GNUNET_PACKED; 125 uint16_t options GNUNET_PACKED;
126 126
127 /** 127 /**
128 * Hop count 128 * Hop count
129 */ 129 */
130 uint32_t hop_count GNUNET_PACKED; 130 uint16_t hop_count GNUNET_PACKED;
131 131
132 /** 132 /**
133 * Replication level for this message 133 * Replication level for this message
134 */ 134 */
135 uint32_t desired_replication_level GNUNET_PACKED; 135 uint16_t desired_replication_level GNUNET_PACKED;
136 136
137 /** 137 /**
138 * Length of the PUT path that follows (if tracked). 138 * Length of the PUT path that follows (if tracked).
139 */ 139 */
140 uint32_t put_path_length GNUNET_PACKED; 140 uint16_t put_path_length GNUNET_PACKED;
141 141
142 /** 142 /**
143 * When does the content expire? 143 * When does the content expire?
@@ -176,14 +176,19 @@ struct PeerResultMessage
176 uint32_t type GNUNET_PACKED; 176 uint32_t type GNUNET_PACKED;
177 177
178 /** 178 /**
179 * Reserved.
180 */
181 uint32_t reserved GNUNET_PACKED;
182
183 /**
179 * Length of the PUT path that follows (if tracked). 184 * Length of the PUT path that follows (if tracked).
180 */ 185 */
181 uint32_t put_path_length GNUNET_PACKED; 186 uint16_t put_path_length GNUNET_PACKED;
182 187
183 /** 188 /**
184 * Length of the GET path that follows (if tracked). 189 * Length of the GET path that follows (if tracked).
185 */ 190 */
186 uint32_t get_path_length GNUNET_PACKED; 191 uint16_t get_path_length GNUNET_PACKED;
187 192
188 /** 193 /**
189 * When does the content expire? 194 * When does the content expire?
@@ -214,34 +219,29 @@ struct PeerGetMessage
214 struct GNUNET_MessageHeader header; 219 struct GNUNET_MessageHeader header;
215 220
216 /** 221 /**
217 * Processing options 222 * Desired content type.
218 */ 223 */
219 uint32_t options GNUNET_PACKED; 224 uint32_t type GNUNET_PACKED;
220 225
221 /** 226 /**
222 * Desired content type. 227 * Processing options
223 */ 228 */
224 uint32_t type GNUNET_PACKED; 229 uint16_t options GNUNET_PACKED;
225 230
226 /** 231 /**
227 * Hop count 232 * Hop count
228 */ 233 */
229 uint32_t hop_count GNUNET_PACKED; 234 uint16_t hop_count GNUNET_PACKED;
230 235
231 /** 236 /**
232 * Desired replication level for this request. 237 * Desired replication level for this request.
233 */ 238 */
234 uint32_t desired_replication_level GNUNET_PACKED; 239 uint16_t desired_replication_level GNUNET_PACKED;
235 240
236 /** 241 /**
237 * Size of the extended query. 242 * Size of the extended query.
238 */ 243 */
239 uint32_t xquery_size; 244 uint16_t xquery_size;
240
241 /**
242 * Bloomfilter mutator.
243 */
244 uint32_t bf_mutator;
245 245
246 /** 246 /**
247 * Bloomfilter (for peer identities) to stop circular routes 247 * Bloomfilter (for peer identities) to stop circular routes
@@ -253,6 +253,11 @@ struct PeerGetMessage
253 */ 253 */
254 struct GNUNET_HashCode key; 254 struct GNUNET_HashCode key;
255 255
256 /**
257 * Bloomfilter mutator.
258 */
259 uint32_t bf_mutator;
260
256 /* xquery */ 261 /* xquery */
257 262
258 /* result bloomfilter */ 263 /* result bloomfilter */