diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/Makefile.am | 1 | ||||
-rw-r--r-- | src/include/gnunet_gnsrecord_lib.h | 6 | ||||
-rw-r--r-- | src/include/gnunet_namestore_service.h | 24 | ||||
-rw-r--r-- | src/testbed/Makefile.am | 7 |
4 files changed, 20 insertions, 18 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 00a312a72..543fed287 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -47,6 +47,7 @@ libgnunetatstesting_la_LIBADD = \ | |||
47 | $(top_builddir)/src/transport/libgnunettransport.la \ | 47 | $(top_builddir)/src/transport/libgnunettransport.la \ |
48 | $(top_builddir)/src/hello/libgnunethello.la \ | 48 | $(top_builddir)/src/hello/libgnunethello.la \ |
49 | $(top_builddir)/src/ats/libgnunetats.la \ | 49 | $(top_builddir)/src/ats/libgnunetats.la \ |
50 | $(top_builddir)/src/arm/libgnunetarm.la \ | ||
50 | $(top_builddir)/src/util/libgnunetutil.la \ | 51 | $(top_builddir)/src/util/libgnunetutil.la \ |
51 | $(GN_LIBINTL) | 52 | $(GN_LIBINTL) |
52 | libgnunetatstesting_la_DEPENDENCIES = \ | 53 | libgnunetatstesting_la_DEPENDENCIES = \ |
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index 5afb3f253..f00a5d0f8 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h | |||
@@ -601,7 +601,8 @@ GNUNET_GNSRECORD_block_get_size (const struct GNUNET_GNSRECORD_Block *block); | |||
601 | * @return the block expiration. | 601 | * @return the block expiration. |
602 | */ | 602 | */ |
603 | struct GNUNET_TIME_Absolute | 603 | struct GNUNET_TIME_Absolute |
604 | GNUNET_GNSRECORD_block_get_expiration (const struct GNUNET_GNSRECORD_Block *block); | 604 | GNUNET_GNSRECORD_block_get_expiration (const struct |
605 | GNUNET_GNSRECORD_Block *block); | ||
605 | 606 | ||
606 | 607 | ||
607 | /** | 608 | /** |
@@ -643,7 +644,8 @@ GNUNET_GNSRECORD_identity_from_data (const char *data, | |||
643 | * @return GNUNET_OK if successful. | 644 | * @return GNUNET_OK if successful. |
644 | */ | 645 | */ |
645 | enum GNUNET_GenericReturnValue | 646 | enum GNUNET_GenericReturnValue |
646 | GNUNET_GNSRECORD_data_from_identity (const struct GNUNET_IDENTITY_PublicKey *key, | 647 | GNUNET_GNSRECORD_data_from_identity (const struct |
648 | GNUNET_IDENTITY_PublicKey *key, | ||
647 | char **data, | 649 | char **data, |
648 | size_t *data_size, | 650 | size_t *data_size, |
649 | uint32_t *type); | 651 | uint32_t *type); |
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index ca4d2cb52..2482b97a5 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h | |||
@@ -127,8 +127,7 @@ typedef void | |||
127 | */ | 127 | */ |
128 | struct GNUNET_NAMESTORE_QueueEntry * | 128 | struct GNUNET_NAMESTORE_QueueEntry * |
129 | GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, | 129 | GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, |
130 | const struct | 130 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
131 | GNUNET_IDENTITY_PrivateKey *pkey, | ||
132 | const char *label, | 131 | const char *label, |
133 | unsigned int rd_count, | 132 | unsigned int rd_count, |
134 | const struct GNUNET_GNSRECORD_Data *rd, | 133 | const struct GNUNET_GNSRECORD_Data *rd, |
@@ -314,17 +313,16 @@ struct GNUNET_NAMESTORE_ZoneMonitor; | |||
314 | * @return handle to stop monitoring | 313 | * @return handle to stop monitoring |
315 | */ | 314 | */ |
316 | struct GNUNET_NAMESTORE_ZoneMonitor * | 315 | struct GNUNET_NAMESTORE_ZoneMonitor * |
317 | GNUNET_NAMESTORE_zone_monitor_start (const struct | 316 | GNUNET_NAMESTORE_zone_monitor_start ( |
318 | GNUNET_CONFIGURATION_Handle *cfg, | 317 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
319 | const struct | 318 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
320 | GNUNET_IDENTITY_PrivateKey *zone, | 319 | int iterate_first, |
321 | int iterate_first, | 320 | GNUNET_SCHEDULER_TaskCallback error_cb, |
322 | GNUNET_SCHEDULER_TaskCallback error_cb, | 321 | void *error_cb_cls, |
323 | void *error_cb_cls, | 322 | GNUNET_NAMESTORE_RecordMonitor monitor, |
324 | GNUNET_NAMESTORE_RecordMonitor monitor, | 323 | void *monitor_cls, |
325 | void *monitor_cls, | 324 | GNUNET_SCHEDULER_TaskCallback sync_cb, |
326 | GNUNET_SCHEDULER_TaskCallback sync_cb, | 325 | void *sync_cb_cls); |
327 | void *sync_cb_cls); | ||
328 | 326 | ||
329 | 327 | ||
330 | /** | 328 | /** |
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index a1fe0b8b4..5b81f7295 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -110,15 +110,16 @@ libgnunettestbed_la_LIBADD = $(XLIB) \ | |||
110 | $(top_builddir)/src/transport/libgnunettransport.la \ | 110 | $(top_builddir)/src/transport/libgnunettransport.la \ |
111 | $(top_builddir)/src/hello/libgnunethello.la \ | 111 | $(top_builddir)/src/hello/libgnunethello.la \ |
112 | -lm $(Z_LIBS) \ | 112 | -lm $(Z_LIBS) \ |
113 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
114 | $(top_builddir)/src/testing/libgnunettesting.la \ | 113 | $(top_builddir)/src/testing/libgnunettesting.la \ |
114 | $(top_builddir)/src/arm/libgnunetarm.la \ | ||
115 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
115 | $(LTLIBINTL) | 116 | $(LTLIBINTL) |
116 | libgnunettestbed_la_DEPENDENCIES = \ | 117 | libgnunettestbed_la_DEPENDENCIES = \ |
117 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 118 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
118 | $(top_builddir)/src/transport/libgnunettransport.la \ | 119 | $(top_builddir)/src/transport/libgnunettransport.la \ |
119 | $(top_builddir)/src/hello/libgnunethello.la \ | 120 | $(top_builddir)/src/hello/libgnunethello.la \ |
120 | $(top_builddir)/src/util/libgnunetutil.la \ | 121 | $(top_builddir)/src/testing/libgnunettesting.la \ |
121 | $(top_builddir)/src/testing/libgnunettesting.la | 122 | $(top_builddir)/src/util/libgnunetutil.la |
122 | libgnunettestbed_la_LDFLAGS = \ | 123 | libgnunettestbed_la_LDFLAGS = \ |
123 | $(GN_LIB_LDFLAGS) \ | 124 | $(GN_LIB_LDFLAGS) \ |
124 | -version-info 0:0:0 | 125 | -version-info 0:0:0 |