[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: NEWS: ensure traits can be generated wit
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: NEWS: ensure traits can be generated with subsystem-specific prefixes for the symbols |
|
Date: |
Wed, 29 Nov 2023 15:22:00 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 994b9e471 NEWS: ensure traits can be generated with subsystem-specific
prefixes for the symbols
994b9e471 is described below
commit 994b9e471e22fd1c54658598f1b4e09ad5906dbc
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Wed Nov 29 23:21:47 2023 +0900
NEWS: ensure traits can be generated with subsystem-specific prefixes for
the symbols
---
src/include/gnunet_core_testing_lib.h | 6 +--
src/include/gnunet_testing_loop_lib.h | 54 ++++++++++++++--------
src/include/gnunet_testing_netjail_lib.h | 26 +++++------
src/include/gnunet_testing_ng_lib.h | 30 ++++++------
src/include/gnunet_transport_testing_ng_lib.h | 18 ++++----
src/service/core/core_api_cmd_connecting_peers.c | 8 ++--
src/service/testing/testing_api_traits.c | 10 ++--
.../transport/test_transport_plugin_cmd_nat_upnp.c | 2 +-
.../test_transport_plugin_cmd_simple_send.c | 2 +-
.../test_transport_plugin_cmd_simple_send_dv.c | 12 ++---
..._transport_plugin_cmd_simple_send_performance.c | 4 +-
.../test_transport_plugin_cmd_udp_backchannel.c | 4 +-
src/service/transport/testing_api_cmd_start_peer.c | 14 +++---
src/service/transport/testing_api_cmd_stop_peer.c | 4 +-
src/service/transport/transport-testing-cmds.h | 6 +--
.../transport_api_cmd_backchannel_check.c | 4 +-
.../transport/transport_api_cmd_connecting_peers.c | 16 +++----
.../transport/transport_api_cmd_send_simple.c | 2 +-
.../transport_api_cmd_send_simple_performance.c | 4 +-
.../transport/transport_api_cmd_start_peer.c | 14 +++---
.../transport/transport_api_cmd_stop_peer.c | 4 +-
src/service/transport/transport_api_traits.c | 2 +-
22 files changed, 132 insertions(+), 114 deletions(-)
diff --git a/src/include/gnunet_core_testing_lib.h
b/src/include/gnunet_core_testing_lib.h
index afb71b2cf..bf6f416d9 100644
--- a/src/include/gnunet_core_testing_lib.h
+++ b/src/include/gnunet_core_testing_lib.h
@@ -148,10 +148,10 @@ GNUNET_CORE_cmd_connect_peers (
/**
* Call #op on all simple traits.
*/
-#define GNUNET_CORE_TESTING_SIMPLE_TRAITS(op) \
- op (connect_peer_state, const struct GNUNET_TESTING_ConnectPeersState)
+#define GNUNET_CORE_TESTING_SIMPLE_TRAITS(op, prefix) \
+ op (prefix, connect_peer_state, const struct
GNUNET_TESTING_ConnectPeersState)
-GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT)
+GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
GNUNET_CORE_TESTING)
diff --git a/src/include/gnunet_testing_loop_lib.h
b/src/include/gnunet_testing_loop_lib.h
index e4a7653e8..7e13edfab 100644
--- a/src/include/gnunet_testing_loop_lib.h
+++ b/src/include/gnunet_testing_loop_lib.h
@@ -571,24 +571,32 @@ GNUNET_TESTING_get_trait (const struct
GNUNET_TESTING_Trait *traits,
/**
* Create headers for a trait with name @a name for
* statically allocated data of type @a type.
+ *
+ * @param prefix symbol prefix to use
+ * @param name name of the trait
+ * @param type data type for the trait
*/
-#define GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT(name,type) \
+#define GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT(prefix,name,type) \
enum GNUNET_GenericReturnValue \
- GNUNET_TESTING_get_trait_ ## name ( \
+ prefix ## _get_trait_ ## name ( \
const struct GNUNET_TESTING_Command *cmd, \
type **ret); \
struct GNUNET_TESTING_Trait \
- GNUNET_TESTING_make_trait_ ## name ( \
+ prefix ## _make_trait_ ## name ( \
type * value);
/**
* Create C implementation for a trait with name @a name for statically
* allocated data of type @a type.
+ *
+ * @param prefix symbol prefix to use
+ * @param name name of the trait
+ * @param type data type for the trait
*/
-#define GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT(name,type) \
+#define GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT(prefix,name,type) \
enum GNUNET_GenericReturnValue \
- GNUNET_TESTING_get_trait_ ## name ( \
+ prefix ## _get_trait_ ## name ( \
const struct GNUNET_TESTING_Command *cmd, \
type * *ret) \
{ \
@@ -599,7 +607,7 @@ GNUNET_TESTING_get_trait (const struct GNUNET_TESTING_Trait
*traits,
0); \
} \
struct GNUNET_TESTING_Trait \
- GNUNET_TESTING_make_trait_ ## name ( \
+ prefix ## _make_trait_ ## name ( \
type * value) \
{ \
struct GNUNET_TESTING_Trait ret = { \
@@ -613,15 +621,19 @@ GNUNET_TESTING_get_trait (const struct
GNUNET_TESTING_Trait *traits,
/**
* Create headers for a trait with name @a name for
* statically allocated data of type @a type.
+ *
+ * @param prefix symbol prefix to use
+ * @param name name of the trait
+ * @param type data type for the trait
*/
-#define GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT(name,type) \
+#define GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT(prefix,name,type) \
enum GNUNET_GenericReturnValue \
- GNUNET_TESTING_get_trait_ ## name ( \
+ prefix ## _get_trait_ ## name ( \
const struct GNUNET_TESTING_Command *cmd, \
unsigned int index, \
type **ret); \
struct GNUNET_TESTING_Trait \
- GNUNET_TESTING_make_trait_ ## name ( \
+ prefix ## _make_trait_ ## name ( \
unsigned int index, \
type *value);
@@ -630,9 +642,9 @@ GNUNET_TESTING_get_trait (const struct GNUNET_TESTING_Trait
*traits,
* Create C implementation for a trait with name @a name for statically
* allocated data of type @a type.
*/
-#define GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT(name,type) \
+#define GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT(prefix,name,type) \
enum GNUNET_GenericReturnValue \
- GNUNET_TESTING_get_trait_ ## name ( \
+ prefix ## _get_trait_ ## name ( \
const struct GNUNET_TESTING_Command *cmd, \
unsigned int index, \
type * *ret) \
@@ -644,7 +656,7 @@ GNUNET_TESTING_get_trait (const struct GNUNET_TESTING_Trait
*traits,
index); \
} \
struct GNUNET_TESTING_Trait \
- GNUNET_TESTING_make_trait_ ## name ( \
+ prefix ## _make_trait_ ## name ( \
unsigned int index, \
type * value) \
{ \
@@ -659,21 +671,27 @@ GNUNET_TESTING_get_trait (const struct
GNUNET_TESTING_Trait *traits,
/**
* Call #op on all simple traits needed by loop logic.
+ *
+ * @param op operation to perform
+ * @param prefix prefix to pass to @e op
*/
-#define GNUNET_TESTING_LOOP_SIMPLE_TRAITS(op) \
- op (batch_cmds, struct GNUNET_TESTING_Command *)
+#define GNUNET_TESTING_LOOP_SIMPLE_TRAITS(op,prefix) \
+ op (prefix, batch_cmds, struct GNUNET_TESTING_Command *)
-GNUNET_TESTING_LOOP_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT)
+GNUNET_TESTING_LOOP_SIMPLE_TRAITS(GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
GNUNET_TESTING)
/**
* Call #op on all indexed traits needed by loop logic.
+ *
+ * @param op operation to perform
+ * @param prefix prefix to pass to @e op
*/
-#define GNUNET_TESTING_LOOP_INDEXED_TRAITS(op) \
- op (cmd, const struct GNUNET_TESTING_Command)
+#define GNUNET_TESTING_LOOP_INDEXED_TRAITS(op,prefix) \
+ op (prefix, cmd, const struct GNUNET_TESTING_Command)
-GNUNET_TESTING_LOOP_INDEXED_TRAITS (GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT)
+GNUNET_TESTING_LOOP_INDEXED_TRAITS (GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT,
GNUNET_TESTING)
#endif
diff --git a/src/include/gnunet_testing_netjail_lib.h
b/src/include/gnunet_testing_netjail_lib.h
index 0d58e0f62..843fce0d5 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@ -520,11 +520,11 @@ GNUNET_TESTING_cmd_local_test_prepared (const char *label,
*/
struct GNUNET_TESTING_Command
GNUNET_TESTING_cmd_start_peer (const char *label,
- const char *system_label,
- uint32_t no,
- const char *node_ip,
- const char *cfgname,
- unsigned int broadcast);
+ const char *system_label,
+ uint32_t no,
+ const char *node_ip,
+ const char *cfgname,
+ unsigned int broadcast);
/* ***** Netjail trait support ***** */
@@ -533,14 +533,14 @@ GNUNET_TESTING_cmd_start_peer (const char *label,
/**
* Call #op on all simple traits.
*/
-#define GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS(op) \
- op (test_system, const struct GNUNET_TESTING_System) \
- op (async_context, struct GNUNET_TESTING_AsyncContext) \
- op (helper_handles, const struct GNUNET_HELPER_Handle *) \
- op (local_prepared_state, const struct GNUNET_TESTING_LocalPreparedState) \
- op (block_state, struct GNUNET_TESTING_BlockState)
-
-GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT)
+#define GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS(op, prefix)
\
+ op (prefix, test_system, const struct GNUNET_TESTING_System)
\
+ op (prefix, async_context, struct GNUNET_TESTING_AsyncContext)
\
+ op (prefix, helper_handles, const struct GNUNET_HELPER_Handle *)
\
+ op (prefix, local_prepared_state, const struct
GNUNET_TESTING_LocalPreparedState) \
+ op (prefix, block_state, struct GNUNET_TESTING_BlockState)
+
+GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
GNUNET_TESTING)
#endif
diff --git a/src/include/gnunet_testing_ng_lib.h
b/src/include/gnunet_testing_ng_lib.h
index 7b19a0ab4..407f50bb7 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -89,27 +89,27 @@ GNUNET_TESTING_cmd_exec_bash_script (const char *label,
/**
* Call #op on all simple traits.
*/
-#define GNUNET_TESTING_SIMPLE_TRAITS(op) \
- op (process, struct GNUNET_OS_Process *)
+#define GNUNET_TESTING_SIMPLE_TRAITS(op, prefix) \
+ op (prefix, process, struct GNUNET_OS_Process *)
-GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT)
+GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
GNUNET_TESTING)
/**
* Call #op on all indexed traits.
*/
-#define GNUNET_TESTING_INDEXED_TRAITS(op) \
- op (uint32, const uint32_t) \
- op (uint64, const uint64_t) \
- op (int64, const int64_t) \
- op (uint, const unsigned int) \
- op (string, const char) \
- op (uuid, const struct GNUNET_Uuid) \
- op (time, const struct GNUNET_TIME_Absolute) \
- op (absolute_time, const struct GNUNET_TIME_Absolute) \
- op (relative_time, const struct GNUNET_TIME_Relative)
-
-GNUNET_TESTING_INDEXED_TRAITS (GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT)
+#define GNUNET_TESTING_INDEXED_TRAITS(op, prefix) \
+ op (prefix, uint32, const uint32_t) \
+ op (prefix, uint64, const uint64_t) \
+ op (prefix, int64, const int64_t) \
+ op (prefix, uint, const unsigned int) \
+ op (prefix, string, const char) \
+ op (prefix, uuid, const struct GNUNET_Uuid) \
+ op (prefix, time, const struct GNUNET_TIME_Absolute) \
+ op (prefix, absolute_time, const struct GNUNET_TIME_Absolute) \
+ op (prefix, relative_time, const struct GNUNET_TIME_Relative)
+
+GNUNET_TESTING_INDEXED_TRAITS (GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT,
GNUNET_TESTING)
#endif
diff --git a/src/include/gnunet_transport_testing_ng_lib.h
b/src/include/gnunet_transport_testing_ng_lib.h
index b11fe6373..be904cf4c 100644
--- a/src/include/gnunet_transport_testing_ng_lib.h
+++ b/src/include/gnunet_transport_testing_ng_lib.h
@@ -196,16 +196,16 @@ GNUNET_TESTING_get_peer (unsigned int num,
/**
* Call #op on all simple traits.
*/
-#define GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS(op) \
- op (connected_peers_map, const struct GNUNET_CONTAINER_MultiShortmap) \
- op (peer_id, const struct GNUNET_PeerIdentity) \
- op (hello_size, const size_t) \
- op (hello, const char) \
- op (application_handle, const struct GNUNET_TRANSPORT_ApplicationHandle) \
- op (state, const struct GNUNET_TESTING_StartPeerState) \
- op (broadcast, const enum GNUNET_GenericReturnValue)
+#define GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS(op, prefix)
\
+ op (prefix, connected_peers_map, const struct
GNUNET_CONTAINER_MultiShortmap) \
+ op (prefix, peer_id, const struct GNUNET_PeerIdentity)
\
+ op (prefix, hello_size, const size_t)
\
+ op (prefix, hello, const char)
\
+ op (prefix, application_handle, const struct
GNUNET_TRANSPORT_ApplicationHandle) \
+ op (prefix, state, const struct GNUNET_TESTING_StartPeerState)
\
+ op (prefix, broadcast, const enum GNUNET_GenericReturnValue)
-GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT)
+GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
GNUNET_TRANSPORT_TESTING)
#endif
diff --git a/src/service/core/core_api_cmd_connecting_peers.c
b/src/service/core/core_api_cmd_connecting_peers.c
index 97cb8c4a6..a6aa818fa 100644
--- a/src/service/core/core_api_cmd_connecting_peers.c
+++ b/src/service/core/core_api_cmd_connecting_peers.c
@@ -63,9 +63,9 @@ connect_peers_run (void *cls,
cps->is = is;
peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
cps->start_peer_label);
- GNUNET_TESTING_get_trait_broadcast (peer1_cmd,
+ GNUNET_TRANSPORT_TESTING_get_trait_broadcast (peer1_cmd,
&broadcast);
- GNUNET_TESTING_get_trait_state (peer1_cmd,
+ GNUNET_TRANSPORT_TESTING_get_trait_state (peer1_cmd,
&sps);
system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
@@ -198,7 +198,7 @@ connect_peers_traits (void *cls,
{
struct GNUNET_TESTING_ConnectPeersState *cps = cls;
struct GNUNET_TESTING_Trait traits[] = {
- GNUNET_TESTING_make_trait_connect_peer_state ((const void *) cps),
+ GNUNET_CORE_TESTING_make_trait_connect_peer_state ((const void *) cps),
GNUNET_TESTING_trait_end ()
};
return GNUNET_TESTING_get_trait (traits,
@@ -274,5 +274,5 @@ GNUNET_CORE_cmd_connect_peers (
// FIXME: likely not ideally placed here, move to its own file
-GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT)
+GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
GNUNET_CORE_TESTING)
diff --git a/src/service/testing/testing_api_traits.c
b/src/service/testing/testing_api_traits.c
index ddd04ac30..18faa2d04 100644
--- a/src/service/testing/testing_api_traits.c
+++ b/src/service/testing/testing_api_traits.c
@@ -34,15 +34,15 @@
/* FIXME: move these into respective sub-libs? */
-GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT)
+GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
GNUNET_TESTING)
-GNUNET_TESTING_INDEXED_TRAITS (GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT)
+GNUNET_TESTING_INDEXED_TRAITS (GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT,
GNUNET_TESTING)
-GNUNET_TESTING_LOOP_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT)
+GNUNET_TESTING_LOOP_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
GNUNET_TESTING)
-GNUNET_TESTING_LOOP_INDEXED_TRAITS (GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT)
+GNUNET_TESTING_LOOP_INDEXED_TRAITS (GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT,
GNUNET_TESTING)
-GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT)
+GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
GNUNET_TESTING)
/**
* End a trait array. Usually, commands offer several traits,
diff --git a/src/service/transport/test_transport_plugin_cmd_nat_upnp.c
b/src/service/transport/test_transport_plugin_cmd_nat_upnp.c
index 4163ab68b..01e3e8b72 100644
--- a/src/service/transport/test_transport_plugin_cmd_nat_upnp.c
+++ b/src/service/transport/test_transport_plugin_cmd_nat_upnp.c
@@ -148,7 +148,7 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
cmd = GNUNET_TESTING_interpreter_lookup_command (is,
"connect-peers");
- GNUNET_TESTING_get_trait_connect_peer_state (cmd,
+ GNUNET_TRANSPORT_TESTING_get_trait_connect_peer_state (cmd,
&cps);
void *ret = NULL;
diff --git a/src/service/transport/test_transport_plugin_cmd_simple_send.c
b/src/service/transport/test_transport_plugin_cmd_simple_send.c
index 9f34d4bcc..efef49826 100644
--- a/src/service/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/service/transport/test_transport_plugin_cmd_simple_send.c
@@ -151,7 +151,7 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
cmd = GNUNET_TESTING_interpreter_lookup_command (is,
"connect-peers");
- GNUNET_TESTING_get_trait_connect_peer_state (cmd,
+ GNUNET_TRANSPORT_TESTING_get_trait_connect_peer_state (cmd,
&cps);
void *ret = NULL;
diff --git a/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c
b/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c
index 695344287..b92736eaa 100644
--- a/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/service/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -91,11 +91,11 @@ handle_test (void *cls,
struct GNUNET_TRANSPORT_CoreHandle *ch;
const struct GNUNET_TESTING_StartPeerState *sps;
- GNUNET_TESTING_get_trait_state (&start_peer,
- &sps);
+ GNUNET_TRANSPORT_TESTING_get_trait_state (&start_peer,
+ &sps);
ch = sps->th;
- GNUNET_TESTING_get_trait_connected_peers_map (&start_peer,
- &connected_peers_map);
+ GNUNET_TRANSPORT_TESTING_get_trait_connected_peers_map (&start_peer,
+
&connected_peers_map);
if (NULL != connected_peers_map)
{
@@ -210,8 +210,8 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
cmd = GNUNET_TESTING_interpreter_lookup_command_all (is,
"connect-peers");
// FIXME: check return value!
- GNUNET_TESTING_get_trait_connect_peer_state (cmd,
- &cps);
+ GNUNET_TRANSPORT_TESTING_get_trait_connect_peer_state (cmd,
+ &cps);
cps->notify_connect (is,
peer);
return NULL;
diff --git
a/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
index d44eab9e1..d00e5c318 100644
--- a/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
+++ b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
@@ -114,7 +114,7 @@ handle_test (void *cls,
const struct GNUNET_TESTING_StartPeerState *sps;
- GNUNET_TESTING_get_trait_state (&start_peer,
+ GNUNET_TRANSPORT_TESTING_get_trait_state (&start_peer,
&sps);
ch = sps->th;
num = ntohl (message->num);
@@ -254,7 +254,7 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
cmd = GNUNET_TESTING_interpreter_lookup_command (is,
"connect-peers");
- GNUNET_TESTING_get_trait_connect_peer_state (cmd,
+ GNUNET_TRANSPORT_TESTING_get_trait_connect_peer_state (cmd,
&cps);
void *ret = NULL;
diff --git a/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
index 15677eca8..75fb85e66 100644
--- a/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -146,8 +146,8 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
{
const struct ConnectPeersState *cps;
- GNUNET_TESTING_get_trait_connect_peer_state (&connect_peers,
- &cps);
+ GNUNET_TRANSPORT_TESTING_get_trait_connect_peer_state (&connect_peers,
+ &cps);
void *ret = NULL;
cps->notify_connect (is,
diff --git a/src/service/transport/testing_api_cmd_start_peer.c
b/src/service/transport/testing_api_cmd_start_peer.c
index 3932be74b..4454b2939 100644
--- a/src/service/transport/testing_api_cmd_start_peer.c
+++ b/src/service/transport/testing_api_cmd_start_peer.c
@@ -248,15 +248,15 @@ start_peer_traits (void *cls,
char *hello = sps->hello;
size_t hello_size = sps->hello_size;
struct GNUNET_TESTING_Trait traits[] = {
- GNUNET_TESTING_make_trait_application_handle ((const void *) ah),
- GNUNET_TESTING_make_trait_peer_id ((const void *) id),
- GNUNET_TESTING_make_trait_connected_peers_map ((const
+ GNUNET_TRANSPORT_TESTING_make_trait_application_handle ((const void *) ah),
+ GNUNET_TRANSPORT_TESTING_make_trait_peer_id ((const void *) id),
+ GNUNET_TRANSPORT_TESTING_make_trait_connected_peers_map ((const
void *)
connected_peers_map),
- GNUNET_TESTING_make_trait_hello ((const void *) hello),
- GNUNET_TESTING_make_trait_hello_size ((const void *) hello_size),
- GNUNET_TESTING_make_trait_state ((const void *) sps),
- GNUNET_TESTING_make_trait_broadcast ((const void *) &sps->broadcast),
+ GNUNET_TRANSPORT_TESTING_make_trait_hello ((const void *) hello),
+ GNUNET_TRANSPORT_TESTING_make_trait_hello_size ((const void *) hello_size),
+ GNUNET_TRANSPORT_TESTING_make_trait_state ((const void *) sps),
+ GNUNET_TRANSPORT_TESTING_make_trait_broadcast ((const void *)
&sps->broadcast),
GNUNET_TESTING_trait_end ()
};
diff --git a/src/service/transport/testing_api_cmd_stop_peer.c
b/src/service/transport/testing_api_cmd_stop_peer.c
index 76a63e319..ce8d824f5 100644
--- a/src/service/transport/testing_api_cmd_stop_peer.c
+++ b/src/service/transport/testing_api_cmd_stop_peer.c
@@ -59,8 +59,8 @@ stop_peer_run (void *cls,
start_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
stop_ps->start_label);
- GNUNET_TESTING_get_trait_state (start_cmd,
- &sps);
+ GNUNET_TRANSPORT_TESTING_get_trait_state (start_cmd,
+ &sps);
if (NULL != sps->peer)
{
diff --git a/src/service/transport/transport-testing-cmds.h
b/src/service/transport/transport-testing-cmds.h
index 057f6ea14..7ebc84d11 100644
--- a/src/service/transport/transport-testing-cmds.h
+++ b/src/service/transport/transport-testing-cmds.h
@@ -263,10 +263,10 @@ GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
/**
* Call #op on all simple traits.
*/
-#define GNUNET_TRANSPORT_SIMPLE_TRAITS(op) \
- op (connect_peer_state, const struct ConnectPeersState)
+#define GNUNET_TRANSPORT_SIMPLE_TRAITS(op, prefix) \
+ op (prefix, connect_peer_state, const struct ConnectPeersState)
-GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT)
+GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
GNUNET_TRANSPORT_TESTING)
#endif
diff --git a/src/service/transport/transport_api_cmd_backchannel_check.c
b/src/service/transport/transport_api_cmd_backchannel_check.c
index 0b57ddabd..f23230798 100644
--- a/src/service/transport/transport_api_cmd_backchannel_check.c
+++ b/src/service/transport/transport_api_cmd_backchannel_check.c
@@ -417,8 +417,8 @@ backchannel_check_run (void *cls,
peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
cs->start_peer_label);
- GNUNET_TESTING_get_trait_application_handle (peer1_cmd,
- &ah);
+ GNUNET_TRANSPORT_TESTING_get_trait_application_handle (peer1_cmd,
+ &ah);
system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
cs->create_label);
diff --git a/src/service/transport/transport_api_cmd_connecting_peers.c
b/src/service/transport/transport_api_cmd_connecting_peers.c
index 8498efa42..b7c072169 100644
--- a/src/service/transport/transport_api_cmd_connecting_peers.c
+++ b/src/service/transport/transport_api_cmd_connecting_peers.c
@@ -67,19 +67,19 @@ connect_peers_run (void *cls,
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Wait for connect.\n");
- GNUNET_TESTING_get_trait_application_handle (peer1_cmd,
- &ah);
+ GNUNET_TRANSPORT_TESTING_get_trait_application_handle (peer1_cmd,
+ &ah);
}
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Not waiting for connect.\n");
- GNUNET_TESTING_get_trait_application_handle (peer1_cmd,
- &ah);
+ GNUNET_TRANSPORT_TESTING_get_trait_application_handle (peer1_cmd,
+ &ah);
}
- GNUNET_TESTING_get_trait_broadcast (peer1_cmd,
- &broadcast);
+ GNUNET_TRANSPORT_TESTING_get_trait_broadcast (peer1_cmd,
+ &broadcast);
system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
cps->create_label);
@@ -249,7 +249,7 @@ connect_peers_traits (void *cls,
{
struct ConnectPeersState *cps = cls;
struct GNUNET_TESTING_Trait traits[] = {
- GNUNET_TESTING_make_trait_connect_peer_state ((const void *) cps),
+ GNUNET_TRANSPORT_TESTING_make_trait_connect_peer_state ((const void *)
cps),
GNUNET_TESTING_trait_end ()
};
return GNUNET_TESTING_get_trait (traits,
@@ -310,4 +310,4 @@ GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
// FIXME: likely not ideally placed here, move to its own file
-GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT)
+GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
GNUNET_TRANSPORT_TESTING)
diff --git a/src/service/transport/transport_api_cmd_send_simple.c
b/src/service/transport/transport_api_cmd_send_simple.c
index 4013a1556..3e732ffc9 100644
--- a/src/service/transport/transport_api_cmd_send_simple.c
+++ b/src/service/transport/transport_api_cmd_send_simple.c
@@ -122,7 +122,7 @@ send_simple_run (void *cls,
peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
sss->start_peer_label);
- GNUNET_TESTING_get_trait_connected_peers_map (peer1_cmd,
+ GNUNET_TRANSPORT_TESTING_get_trait_connected_peers_map (peer1_cmd,
&connected_peers_map);
system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
diff --git a/src/service/transport/transport_api_cmd_send_simple_performance.c
b/src/service/transport/transport_api_cmd_send_simple_performance.c
index d6581c4e1..5979e47fe 100644
--- a/src/service/transport/transport_api_cmd_send_simple_performance.c
+++ b/src/service/transport/transport_api_cmd_send_simple_performance.c
@@ -173,8 +173,8 @@ send_simple_run (void *cls,
peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
sss->start_peer_label);
- GNUNET_TESTING_get_trait_connected_peers_map (peer1_cmd,
- &connected_peers_map);
+ GNUNET_TRANSPORT_TESTING_get_trait_connected_peers_map (peer1_cmd,
+
&connected_peers_map);
system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
sss->create_label);
diff --git a/src/service/transport/transport_api_cmd_start_peer.c
b/src/service/transport/transport_api_cmd_start_peer.c
index 642478109..24d731d77 100644
--- a/src/service/transport/transport_api_cmd_start_peer.c
+++ b/src/service/transport/transport_api_cmd_start_peer.c
@@ -420,15 +420,15 @@ start_peer_traits (void *cls,
struct GNUNET_TESTING_Trait traits[] = {
- GNUNET_TESTING_make_trait_application_handle ((const void *) ah),
- GNUNET_TESTING_make_trait_peer_id ((const void *) id),
- GNUNET_TESTING_make_trait_connected_peers_map ((const
+ GNUNET_TRANSPORT_TESTING_make_trait_application_handle ((const void *) ah),
+ GNUNET_TRANSPORT_TESTING_make_trait_peer_id ((const void *) id),
+ GNUNET_TRANSPORT_TESTING_make_trait_connected_peers_map ((const
void *)
connected_peers_map),
- GNUNET_TESTING_make_trait_hello ((const void *) hello),
- GNUNET_TESTING_make_trait_hello_size ((const void *) hello_size),
- GNUNET_TESTING_make_trait_state ((const void *) sps),
- GNUNET_TESTING_make_trait_broadcast ((const void *) &sps->broadcast),
+ GNUNET_TRANSPORT_TESTING_make_trait_hello ((const void *) hello),
+ GNUNET_TRANSPORT_TESTING_make_trait_hello_size ((const void *) hello_size),
+ GNUNET_TRANSPORT_TESTING_make_trait_state ((const void *) sps),
+ GNUNET_TRANSPORT_TESTING_make_trait_broadcast ((const void *)
&sps->broadcast),
GNUNET_TESTING_trait_end ()
};
diff --git a/src/service/transport/transport_api_cmd_stop_peer.c
b/src/service/transport/transport_api_cmd_stop_peer.c
index cd6863711..333a3dae7 100644
--- a/src/service/transport/transport_api_cmd_stop_peer.c
+++ b/src/service/transport/transport_api_cmd_stop_peer.c
@@ -63,8 +63,8 @@ stop_peer_run (void *cls,
start_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
stop_ps->start_label);
- GNUNET_TESTING_get_trait_state (start_cmd,
- &sps);
+ GNUNET_TRANSPORT_TESTING_get_trait_state (start_cmd,
+ &sps);
if (NULL != sps->pic)
{
diff --git a/src/service/transport/transport_api_traits.c
b/src/service/transport/transport_api_traits.c
index 78f306019..ec53f6f2b 100644
--- a/src/service/transport/transport_api_traits.c
+++ b/src/service/transport/transport_api_traits.c
@@ -29,4 +29,4 @@
#include "transport-testing-cmds.h"
#include "gnunet_util_lib.h"
-GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT)
+GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
GNUNET_TRANSPORT_TESTING)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: NEWS: ensure traits can be generated with subsystem-specific prefixes for the symbols,
gnunet <=