diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-06-12 21:43:31 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-06-12 21:43:31 +0000 |
commit | 1489edfdd05db78cbe2d66be4d274e7f69af48b0 (patch) | |
tree | 1013a3cdf68edbdf40efdbdc4f22465f9628f6c1 /src/gns/gnunet-service-gns_resolver.h | |
parent | de41512448a75b512977da6bca0809b7743bc323 (diff) | |
download | gnunet-1489edfdd05db78cbe2d66be4d274e7f69af48b0.tar.gz gnunet-1489edfdd05db78cbe2d66be4d274e7f69af48b0.zip |
-big shorten algorithm change, hopefully fixed conflict
Diffstat (limited to 'src/gns/gnunet-service-gns_resolver.h')
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h index f1f25a5c1..2a2c341d3 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/gns/gnunet-service-gns_resolver.h | |||
@@ -228,17 +228,14 @@ struct GetNameAuthorityHandle | |||
228 | */ | 228 | */ |
229 | struct GetPseuAuthorityHandle | 229 | struct GetPseuAuthorityHandle |
230 | { | 230 | { |
231 | /* the name given from delegation */ | 231 | /* the name to store the zone under */ |
232 | char name[MAX_DNS_LABEL_LENGTH]; | 232 | char name[MAX_DNS_LABEL_LENGTH]; |
233 | 233 | ||
234 | /* name to store the pseu under */ | 234 | /* test name to store the zone under */ |
235 | char new_name[MAX_DNS_LABEL_LENGTH]; | 235 | char test_name[MAX_DNS_LABEL_LENGTH]; |
236 | 236 | ||
237 | /* the zone of discovered authority */ | ||
238 | struct GNUNET_CRYPTO_ShortHashCode new_zone; | ||
239 | |||
240 | /* the zone of our authority */ | 237 | /* the zone of our authority */ |
241 | struct GNUNET_CRYPTO_ShortHashCode zone; | 238 | struct GNUNET_CRYPTO_ShortHashCode our_zone; |
242 | 239 | ||
243 | /* the private key of the zone to store the pseu in */ | 240 | /* the private key of the zone to store the pseu in */ |
244 | struct GNUNET_CRYPTO_RsaPrivateKey *key; | 241 | struct GNUNET_CRYPTO_RsaPrivateKey *key; |
@@ -248,6 +245,9 @@ struct GetPseuAuthorityHandle | |||
248 | 245 | ||
249 | /* timeout task for lookup */ | 246 | /* timeout task for lookup */ |
250 | GNUNET_SCHEDULER_TaskIdentifier timeout; | 247 | GNUNET_SCHEDULER_TaskIdentifier timeout; |
248 | |||
249 | /* Head of the authority list */ | ||
250 | struct AuthorityChain *ahead; | ||
251 | }; | 251 | }; |
252 | 252 | ||
253 | /** | 253 | /** |