fix GNUnet 0.19.0 compatiablity

marty1885 · Dec 8, 2022 · 6c2ecfd · 6c2ecfd
1 parent 66b9517
commit 6c2ecfd
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 24 deletions.
diff --git a/gnunetpp/gnunetpp-crypto.hpp b/gnunetpp/gnunetpp-crypto.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "gnunet/platform.h"
-#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_util_lib.h>
 
 #include <string>
 #include <vector>
@@ -38,4 +37,4 @@ std::string to_string(const GNUNET_CRYPTO_EddsaPrivateKey& key);
 std::string to_string(const GNUNET_CRYPTO_EddsaPublicKey& key);
 
 GNUNET_CRYPTO_EcdsaPublicKey get_public_key(const GNUNET_CRYPTO_EcdsaPrivateKey& key);
-}
+}
diff --git a/gnunetpp/gnunetpp-dht.hpp b/gnunetpp/gnunetpp-dht.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_core_service.h>
 #include <gnunet/gnunet_dht_service.h>
 
@@ -93,4 +92,4 @@ struct DHT : public Service
     std::set<GetCallbackPack*> get_handles;
 };
 
-}
+}
diff --git a/gnunetpp/gnunetpp-fs.cpp b/gnunetpp/gnunetpp-fs.cpp
@@ -4,6 +4,9 @@
 #include <stdexcept>
 #include <iostream>
 
+#include <unistd.h>
+#include <gnunet/gnunet_fs_service.h>
+
 namespace gnunetpp::FS
 {
 namespace detail
@@ -75,8 +78,8 @@ GNUNET_FS_FileInformation * get_file_information (GNUNET_FS_Handle* fsh, GNUNET_
     if (GNUNET_YES == item->is_directory)
     {
         if (item->meta == NULL)
-            item->meta = GNUNET_CONTAINER_meta_data_create ();
-        GNUNET_CONTAINER_meta_data_delete (item->meta, EXTRACTOR_METATYPE_MIMETYPE, NULL, 0);
+            item->meta = GNUNET_FS_meta_data_create ();
+        GNUNET_FS_meta_data_delete (item->meta, EXTRACTOR_METATYPE_MIMETYPE, NULL, 0);
         GNUNET_FS_meta_data_make_directory (item->meta);
         if (item->ksk_uri == NULL) {
             const char *mime = GNUNET_FS_DIRECTORY_MIME;
@@ -100,7 +103,7 @@ GNUNET_FS_FileInformation * get_file_information (GNUNET_FS_Handle* fsh, GNUNET_
 }
 
 static int publish_inspector (void *cls, GNUNET_FS_FileInformation *fi, uint64_t length,
-    GNUNET_CONTAINER_MetaData *m, GNUNET_FS_Uri **uri, GNUNET_FS_BlockOptions *bo,
+    GNUNET_FS_MetaData *m, GNUNET_FS_Uri **uri, GNUNET_FS_BlockOptions *bo,
     int *do_index, void **client_info)
 {
     char *fn;
@@ -126,7 +129,7 @@ static int publish_inspector (void *cls, GNUNET_FS_FileInformation *fi, uint64_t
         data->keywords.clear();
     }
     if (/*enable_creation_time*/ true)
-        GNUNET_CONTAINER_meta_data_add_publication_date (m);
+        GNUNET_FS_meta_data_add_publication_date (m);
     if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory(m)) {
         data->fi = fi;
         GNUNET_FS_file_information_inspect(fi, &publish_inspector, data);
@@ -172,7 +175,7 @@ GNUNET_FS_SearchContext* search(
         else if(info->status != GNUNET_FS_STATUS_SEARCH_RESULT)
             return;
         char* uri = GNUNET_FS_uri_to_string(info->value.search.specifics.result.uri);
-        char* filename = GNUNET_CONTAINER_meta_data_get_by_type (
+        char* filename = GNUNET_FS_meta_data_get_by_type (
             info->value.search.specifics.result.meta,
             (EXTRACTOR_MetaType)EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME);
         bool keep_running = fn(uri, filename);

diff --git a/gnunetpp/gnunetpp-fs.hpp b/gnunetpp/gnunetpp-fs.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_fs_service.h>
 
 #include "inner/UniqueData.hpp"
@@ -98,4 +97,4 @@ GNUNET_FS_UnindexContext* unindex(
     UnindexCallbackFunctor fn);
 
 void cancel(GNUNET_FS_SearchContext* sc);
-}
+}
diff --git a/gnunetpp/gnunetpp-identity.cpp b/gnunetpp/gnunetpp-identity.cpp
@@ -7,18 +7,18 @@ namespace gnunetpp::identity
 {
 namespace detail
 {
-static void identity_create_trampline(void* cls, const struct GNUNET_IDENTITY_PrivateKey* id, const char* emsg)
+static void identity_create_trampline(void* cls, const struct GNUNET_IDENTITY_PrivateKey* id, GNUNET_ErrorCode ec)
 {
     auto cb = reinterpret_cast<std::function<void(const GNUNET_IDENTITY_PrivateKey& sk, const std::string& err)>*>(cls);
-    std::string err_msg = emsg ? emsg : "";
+    std::string err_msg = GNUNET_ErrorCode_get_hint(ec);
     (*cb)(*id, err_msg);
     delete cb;
 }
 
-static void identity_delete_trampline(void* cls, const char* emsg)
+static void identity_delete_trampline(void* cls, GNUNET_ErrorCode ec)
 {
     auto cb = reinterpret_cast<std::function<void(const std::string& err)>*>(cls);
-    std::string err_msg = emsg ? emsg : "";
+    std::string err_msg = GNUNET_ErrorCode_get_hint(ec);
     (*cb)(err_msg);
     delete cb;
 }

diff --git a/gnunetpp/gnunetpp-identity.hpp b/gnunetpp/gnunetpp-identity.hpp
@@ -1,7 +1,6 @@
 #pragma once
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_identity_service.h>
-#include <gnunet/gnunet_crypto_lib.h>
+#include <gnunet/gnunet_util_lib.h>
 
 #include "inner/Infra.hpp"
 
@@ -41,4 +40,4 @@ const GNUNET_IDENTITY_PrivateKey* get_private_key(const GNUNET_IDENTITY_Ego* ego
 GNUNET_IDENTITY_Ego* anonymous_ego();
 GNUNET_IDENTITY_KeyType get_key_type(GNUNET_IDENTITY_Ego* ego);
 
-}
+}
diff --git a/gnunetpp/gnunetpp-scheduler.cpp b/gnunetpp/gnunetpp-scheduler.cpp
@@ -1,5 +1,4 @@
 #include "gnunetpp-scheduler.hpp"
-#include "gnunet/platform.h"
 #include <gnunet/gnunet_core_service.h>
 
 #include "inner/UniqueData.hpp"
@@ -93,4 +92,4 @@ void shutdown()
     running = false;
 }
 
-}
+}
diff --git a/gnunetpp/gnunetpp.hpp b/gnunetpp/gnunetpp.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_core_service.h>
 #include <gnunet/gnunet_dht_service.h>
 

diff --git a/gnunetpp/inner/Infra.hpp b/gnunetpp/inner/Infra.hpp
@@ -2,7 +2,6 @@
 
 #include <functional>
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_core_service.h>
 
 namespace gnunetpp

diff --git a/gnunetpp/pch.hpp b/gnunetpp/pch.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <gnunet/platform.h>
 #include <gnunet/gnunet_core_service.h>
+#include <gnunet/gnunet_util_lib.h>
 
 #include <string>
 #include <functional>