diff options
Diffstat (limited to 'src/zonemaster')
-rw-r--r-- | src/zonemaster/Makefile.am | 3 | ||||
-rw-r--r-- | src/zonemaster/gnunet-service-zonemaster-monitor.c | 8 | ||||
-rw-r--r-- | src/zonemaster/gnunet-service-zonemaster.c | 8 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am index 3d248efd8..f2d569c75 100644 --- a/src/zonemaster/Makefile.am +++ b/src/zonemaster/Makefile.am | |||
@@ -24,6 +24,7 @@ gnunet_service_zonemaster_SOURCES = \ | |||
24 | gnunet_service_zonemaster_LDADD = \ | 24 | gnunet_service_zonemaster_LDADD = \ |
25 | $(top_builddir)/src/dht/libgnunetdht.la \ | 25 | $(top_builddir)/src/dht/libgnunetdht.la \ |
26 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 26 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
27 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
27 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 28 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
28 | $(top_builddir)/src/util/libgnunetutil.la \ | 29 | $(top_builddir)/src/util/libgnunetutil.la \ |
29 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 30 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
@@ -32,10 +33,10 @@ gnunet_service_zonemaster_LDADD = \ | |||
32 | 33 | ||
33 | gnunet_service_zonemaster_monitor_SOURCES = \ | 34 | gnunet_service_zonemaster_monitor_SOURCES = \ |
34 | gnunet-service-zonemaster-monitor.c | 35 | gnunet-service-zonemaster-monitor.c |
35 | |||
36 | gnunet_service_zonemaster_monitor_LDADD = \ | 36 | gnunet_service_zonemaster_monitor_LDADD = \ |
37 | $(top_builddir)/src/dht/libgnunetdht.la \ | 37 | $(top_builddir)/src/dht/libgnunetdht.la \ |
38 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ | 38 | $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ |
39 | $(top_builddir)/src/identity/libgnunetidentity.la \ | ||
39 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 40 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
40 | $(top_builddir)/src/util/libgnunetutil.la \ | 41 | $(top_builddir)/src/util/libgnunetutil.la \ |
41 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 42 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c index 4a368048e..c6dd2b6ca 100644 --- a/src/zonemaster/gnunet-service-zonemaster-monitor.c +++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c | |||
@@ -240,7 +240,7 @@ convert_records_for_export (const struct GNUNET_GNSRECORD_Data *rd, | |||
240 | * @return DHT PUT handle, NULL on error | 240 | * @return DHT PUT handle, NULL on error |
241 | */ | 241 | */ |
242 | static struct GNUNET_DHT_PutHandle * | 242 | static struct GNUNET_DHT_PutHandle * |
243 | perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | 243 | perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey *key, |
244 | const char *label, | 244 | const char *label, |
245 | const struct GNUNET_GNSRECORD_Data *rd_public, | 245 | const struct GNUNET_GNSRECORD_Data *rd_public, |
246 | unsigned int rd_public_count, | 246 | unsigned int rd_public_count, |
@@ -271,9 +271,7 @@ perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | |||
271 | GNUNET_break (0); | 271 | GNUNET_break (0); |
272 | return NULL; /* whoops */ | 272 | return NULL; /* whoops */ |
273 | } | 273 | } |
274 | block_size = ntohl (block->purpose.size) | 274 | block_size = GNUNET_GNSRECORD_block_get_size (block); |
275 | + sizeof(struct GNUNET_CRYPTO_EcdsaSignature) | ||
276 | + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey); | ||
277 | GNUNET_GNSRECORD_query_from_private_key (key, | 275 | GNUNET_GNSRECORD_query_from_private_key (key, |
278 | label, | 276 | label, |
279 | &query); | 277 | &query); |
@@ -314,7 +312,7 @@ perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | |||
314 | */ | 312 | */ |
315 | static void | 313 | static void |
316 | handle_monitor_event (void *cls, | 314 | handle_monitor_event (void *cls, |
317 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 315 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
318 | const char *label, | 316 | const char *label, |
319 | unsigned int rd_count, | 317 | unsigned int rd_count, |
320 | const struct GNUNET_GNSRECORD_Data *rd) | 318 | const struct GNUNET_GNSRECORD_Data *rd) |
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c index c5aab8d92..11fa9921d 100644 --- a/src/zonemaster/gnunet-service-zonemaster.c +++ b/src/zonemaster/gnunet-service-zonemaster.c | |||
@@ -579,7 +579,7 @@ convert_records_for_export (const struct GNUNET_GNSRECORD_Data *rd, | |||
579 | * @return DHT PUT handle, NULL on error | 579 | * @return DHT PUT handle, NULL on error |
580 | */ | 580 | */ |
581 | static struct GNUNET_DHT_PutHandle * | 581 | static struct GNUNET_DHT_PutHandle * |
582 | perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | 582 | perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey *key, |
583 | const char *label, | 583 | const char *label, |
584 | const struct GNUNET_GNSRECORD_Data *rd_public, | 584 | const struct GNUNET_GNSRECORD_Data *rd_public, |
585 | unsigned int rd_public_count, | 585 | unsigned int rd_public_count, |
@@ -610,9 +610,7 @@ perform_dht_put (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | |||
610 | GNUNET_break (0); | 610 | GNUNET_break (0); |
611 | return NULL; /* whoops */ | 611 | return NULL; /* whoops */ |
612 | } | 612 | } |
613 | block_size = ntohl (block->purpose.size) | 613 | block_size = GNUNET_GNSRECORD_block_get_size (block); |
614 | + sizeof(struct GNUNET_CRYPTO_EcdsaSignature) | ||
615 | + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey); | ||
616 | GNUNET_GNSRECORD_query_from_private_key (key, | 614 | GNUNET_GNSRECORD_query_from_private_key (key, |
617 | label, | 615 | label, |
618 | &query); | 616 | &query); |
@@ -725,7 +723,7 @@ zone_iteration_finished (void *cls) | |||
725 | */ | 723 | */ |
726 | static void | 724 | static void |
727 | put_gns_record (void *cls, | 725 | put_gns_record (void *cls, |
728 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *key, | 726 | const struct GNUNET_IDENTITY_PrivateKey *key, |
729 | const char *label, | 727 | const char *label, |
730 | unsigned int rd_count, | 728 | unsigned int rd_count, |
731 | const struct GNUNET_GNSRECORD_Data *rd) | 729 | const struct GNUNET_GNSRECORD_Data *rd) |