aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2023-11-22 20:43:29 +0100
committerMartin Schanzenbach <schanzen@gnunet.org>2023-11-22 20:43:29 +0100
commit12ab12595f5021427c4d09623f0d7bb9aac21710 (patch)
tree620a021d480b2316e32416e50a5ed2ba344f6fe9
parentc7ea74d4767da3c769c8cfe90ff47bf05735bbb0 (diff)
downloadgnunet-12ab12595f5021427c4d09623f0d7bb9aac21710.tar.gz
gnunet-12ab12595f5021427c4d09623f0d7bb9aac21710.zip
PEERSTORE: More peerstore API change missing changes
-rw-r--r--configure.ac1
-rw-r--r--po/POTFILES.in2
-rw-r--r--src/cli/Makefile.am1
-rw-r--r--src/cli/meson.build1
-rw-r--r--src/cli/peerstore/gnunet-peerstore.c2
-rw-r--r--src/contrib/service/rps/gnunet-service-rps.c2
-rw-r--r--src/lib/util/gnunet_error_codes.c1
-rw-r--r--src/service/peerstore/perf_peerstore_store.c2
-rw-r--r--src/service/peerstore/test_peerstore_api_iterate.c2
-rw-r--r--src/service/peerstore/test_peerstore_api_sync.c3
10 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index ae5ee9ff2..6e579e1dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1327,6 +1327,7 @@ src/cli/identity/Makefile
1327src/cli/messenger/Makefile 1327src/cli/messenger/Makefile
1328src/cli/namecache/Makefile 1328src/cli/namecache/Makefile
1329src/cli/namestore/Makefile 1329src/cli/namestore/Makefile
1330src/cli/peerstore/Makefile
1330src/cli/nat/Makefile 1331src/cli/nat/Makefile
1331src/cli/nat-auto/Makefile 1332src/cli/nat-auto/Makefile
1332src/cli/nse/Makefile 1333src/cli/nse/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 06cff2846..4afcf48db 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,6 +25,7 @@ src/cli/nat-auto/gnunet-nat-auto.c
25src/cli/nat-auto/gnunet-nat-server.c 25src/cli/nat-auto/gnunet-nat-server.c
26src/cli/nat/gnunet-nat.c 26src/cli/nat/gnunet-nat.c
27src/cli/nse/gnunet-nse.c 27src/cli/nse/gnunet-nse.c
28src/cli/peerstore/gnunet-peerstore.c
28src/cli/reclaim/gnunet-did.c 29src/cli/reclaim/gnunet-did.c
29src/cli/reclaim/gnunet-reclaim.c 30src/cli/reclaim/gnunet-reclaim.c
30src/cli/revocation/gnunet-revocation-tvg.c 31src/cli/revocation/gnunet-revocation-tvg.c
@@ -393,7 +394,6 @@ src/service/nat/nat_api_stun.c
393src/service/nse/gnunet-nse-profiler.c 394src/service/nse/gnunet-nse-profiler.c
394src/service/nse/gnunet-service-nse.c 395src/service/nse/gnunet-service-nse.c
395src/service/nse/nse_api.c 396src/service/nse/nse_api.c
396src/service/peerstore/gnunet-peerstore.c
397src/service/peerstore/gnunet-service-peerstore.c 397src/service/peerstore/gnunet-service-peerstore.c
398src/service/peerstore/peerstore_api.c 398src/service/peerstore/peerstore_api.c
399src/service/peerstore/peerstore_common.c 399src/service/peerstore/peerstore_common.c
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d7584b2c4..6ad6dd70a 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = \
2 util \ 2 util \
3 arm \ 3 arm \
4 statistics \ 4 statistics \
5 peerstore \
5 core \ 6 core \
6 nat \ 7 nat \
7 nat-auto \ 8 nat-auto \
diff --git a/src/cli/meson.build b/src/cli/meson.build
index 5c1fded1a..12662933d 100644
--- a/src/cli/meson.build
+++ b/src/cli/meson.build
@@ -1,6 +1,7 @@
1subdir('util') 1subdir('util')
2subdir('arm') 2subdir('arm')
3subdir('statistics') 3subdir('statistics')
4subdir('peerstore')
4subdir('datastore') 5subdir('datastore')
5subdir('nat') 6subdir('nat')
6subdir('nat-auto') 7subdir('nat-auto')
diff --git a/src/cli/peerstore/gnunet-peerstore.c b/src/cli/peerstore/gnunet-peerstore.c
index 11313b5d3..84cae675f 100644
--- a/src/cli/peerstore/gnunet-peerstore.c
+++ b/src/cli/peerstore/gnunet-peerstore.c
@@ -45,7 +45,7 @@ shutdown_task (void *cls)
45{ 45{
46 if (NULL != peerstore_handle) 46 if (NULL != peerstore_handle)
47 { 47 {
48 GNUNET_PEERSTORE_disconnect (peerstore_handle, GNUNET_YES); 48 GNUNET_PEERSTORE_disconnect (peerstore_handle);
49 peerstore_handle = NULL; 49 peerstore_handle = NULL;
50 } 50 }
51} 51}
diff --git a/src/contrib/service/rps/gnunet-service-rps.c b/src/contrib/service/rps/gnunet-service-rps.c
index 76e33c87b..8ca25257a 100644
--- a/src/contrib/service/rps/gnunet-service-rps.c
+++ b/src/contrib/service/rps/gnunet-service-rps.c
@@ -4745,7 +4745,7 @@ shutdown_task (void *cls)
4745 4745
4746 /* Disconnect from other services */ 4746 /* Disconnect from other services */
4747 GNUNET_PEERSTORE_hello_changed_notify_cancel (peerstore_notify); 4747 GNUNET_PEERSTORE_hello_changed_notify_cancel (peerstore_notify);
4748 GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_YES); 4748 GNUNET_PEERSTORE_disconnect (peerstore);
4749 peerstore = NULL; 4749 peerstore = NULL;
4750 GNUNET_NSE_disconnect (nse); 4750 GNUNET_NSE_disconnect (nse);
4751 if (NULL != map_single_hop) 4751 if (NULL != map_single_hop)
diff --git a/src/lib/util/gnunet_error_codes.c b/src/lib/util/gnunet_error_codes.c
index c286f2e52..11ce2d0c8 100644
--- a/src/lib/util/gnunet_error_codes.c
+++ b/src/lib/util/gnunet_error_codes.c
@@ -17,7 +17,6 @@
17 17
18 SPDX-License-Identifier: AGPL3.0-or-later 18 SPDX-License-Identifier: AGPL3.0-or-later
19 */ 19 */
20#include "platform.h"
21#include "gnunet_error_codes.h" 20#include "gnunet_error_codes.h"
22#include <stddef.h> 21#include <stddef.h>
23#include <microhttpd.h> 22#include <microhttpd.h>
diff --git a/src/service/peerstore/perf_peerstore_store.c b/src/service/peerstore/perf_peerstore_store.c
index 24c7e4f01..e59af61e5 100644
--- a/src/service/peerstore/perf_peerstore_store.c
+++ b/src/service/peerstore/perf_peerstore_store.c
@@ -43,7 +43,7 @@ static void
43disconnect () 43disconnect ()
44{ 44{
45 if (NULL != h) 45 if (NULL != h)
46 GNUNET_PEERSTORE_disconnect (h, GNUNET_YES); 46 GNUNET_PEERSTORE_disconnect (h);
47 GNUNET_SCHEDULER_shutdown (); 47 GNUNET_SCHEDULER_shutdown ();
48} 48}
49 49
diff --git a/src/service/peerstore/test_peerstore_api_iterate.c b/src/service/peerstore/test_peerstore_api_iterate.c
index b6cd51906..59367a110 100644
--- a/src/service/peerstore/test_peerstore_api_iterate.c
+++ b/src/service/peerstore/test_peerstore_api_iterate.c
@@ -58,7 +58,7 @@ iter3_cb (void *cls,
58 } 58 }
59 GNUNET_assert (count == 3); 59 GNUNET_assert (count == 3);
60 ok = 0; 60 ok = 0;
61 GNUNET_PEERSTORE_disconnect (h, GNUNET_NO); 61 GNUNET_PEERSTORE_disconnect (h);
62 GNUNET_SCHEDULER_shutdown (); 62 GNUNET_SCHEDULER_shutdown ();
63} 63}
64 64
diff --git a/src/service/peerstore/test_peerstore_api_sync.c b/src/service/peerstore/test_peerstore_api_sync.c
index 5057c98b5..4e16afae8 100644
--- a/src/service/peerstore/test_peerstore_api_sync.c
+++ b/src/service/peerstore/test_peerstore_api_sync.c
@@ -110,8 +110,7 @@ iterate_cb (void *cls,
110 it = NULL; 110 it = NULL;
111 if (0 == ok) 111 if (0 == ok)
112 { 112 {
113 GNUNET_PEERSTORE_disconnect (h, 113 GNUNET_PEERSTORE_disconnect (h);
114 GNUNET_NO);
115 if (NULL != to) 114 if (NULL != to)
116 { 115 {
117 GNUNET_SCHEDULER_cancel (to); 116 GNUNET_SCHEDULER_cancel (to);