From 80a9dcfd08bcd450f7be14207257713e1b027319 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 12 Jun 2021 23:07:27 +0200 Subject: [PATCH] Rename the library and public header to meshlink-tiny. This allows the library to coexist with the full MeshLink library in the same installation directory, and avoids accidental linking to the wrong version of the library. The function names have not changed, so it is not possible to simultaneously link both versions of the library into a single program. --- examples/Makefile.am | 14 ++--- examples/channels.c | 2 +- examples/chat.c | 2 +- examples/chatpp.cc | 2 +- examples/groupchat.c | 2 +- examples/manynodes.c | 2 +- examples/meshlinkapp.c | 2 +- examples/monitor.c | 2 +- src/Makefile.am | 16 +++--- src/event.c | 2 +- src/{meshlink++.h => meshlink-tiny++.h} | 4 +- src/{meshlink.h => meshlink-tiny.h} | 2 +- src/meshlink_internal.h | 4 +- test/Makefile.am | 52 +++++++++---------- test/api_set_node_status_cb.c | 2 +- test/basic.c | 2 +- test/basicpp.cpp | 2 +- test/blackbox/common/common_types.h | 2 +- test/blackbox/common/test_step.c | 2 +- test/blackbox/common/test_step.h | 2 +- .../test_cases_random_port_bindings01.c | 2 +- .../test_cases_random_port_bindings02.c | 2 +- test/blackbox/util/gen_invite.c | 2 +- test/blacklist.c | 2 +- test/channels-aio-abort.c | 2 +- test/channels-aio-cornercases.c | 2 +- test/channels-aio-fd.c | 2 +- test/channels-aio.c | 2 +- test/channels-buffer-storage.c | 2 +- test/channels-cornercases.c | 2 +- test/channels-failure.c | 2 +- test/channels-fork.c | 2 +- test/channels-no-partial.c | 2 +- test/channels-udp-cornercases.c | 2 +- test/channels-udp.c | 2 +- test/channels.c | 2 +- test/duplicate.c | 2 +- test/echo-fork.c | 2 +- test/encrypted.c | 2 +- test/ephemeral.c | 2 +- test/get-all-nodes.c | 2 +- test/import-export.c | 2 +- test/invite-join.c | 2 +- test/meta-connections.c | 2 +- test/netns_utils.c | 2 +- test/sign-verify.c | 2 +- test/storage-policy.c | 2 +- test/trio.c | 2 +- test/trio2.c | 2 +- test/utils.h | 2 +- 50 files changed, 90 insertions(+), 90 deletions(-) rename src/{meshlink++.h => meshlink-tiny++.h} (99%) rename src/{meshlink.h => meshlink-tiny.h} (99%) diff --git a/examples/Makefile.am b/examples/Makefile.am index ee64fa8..be97bfe 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,25 +4,25 @@ AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall AM_LDFLAGS = $(PTHREAD_LIBS) meshlinkapp_SOURCES = meshlinkapp.c -meshlinkapp_LDADD = ${top_builddir}/src/libmeshlink.la +meshlinkapp_LDADD = ${top_builddir}/src/libmeshlink-tiny.la chat_SOURCES = chat.c -chat_LDADD = ${top_builddir}/src/libmeshlink.la +chat_LDADD = ${top_builddir}/src/libmeshlink-tiny.la chatpp_SOURCES = chatpp.cc -chatpp_LDADD = ${top_builddir}/src/libmeshlink.la +chatpp_LDADD = ${top_builddir}/src/libmeshlink-tiny.la manynodes_SOURCES = manynodes.c -manynodes_LDADD = ${top_builddir}/src/libmeshlink.la +manynodes_LDADD = ${top_builddir}/src/libmeshlink-tiny.la channels_SOURCES = channels.c -channels_LDADD = ${top_builddir}/src/libmeshlink.la +channels_LDADD = ${top_builddir}/src/libmeshlink-tiny.la if MONITOR EXTRA_PROGRAMS += monitor monitor_SOURCES = monitor.c -monitor_LDADD = ${top_builddir}/src/libmeshlink.la $(NCURSES_LIBS) -lm +monitor_LDADD = ${top_builddir}/src/libmeshlink-tiny.la $(NCURSES_LIBS) -lm endif groupchat_SOURCES = groupchat.c -groupchat_LDADD = ${top_builddir}/src/libmeshlink.la +groupchat_LDADD = ${top_builddir}/src/libmeshlink-tiny.la diff --git a/examples/channels.c b/examples/channels.c index 0f23de8..3a5426e 100644 --- a/examples/channels.c +++ b/examples/channels.c @@ -2,7 +2,7 @@ #include #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #define CHAT_PORT 531 diff --git a/examples/chat.c b/examples/chat.c index 4e6f5d6..0df04a7 100644 --- a/examples/chat.c +++ b/examples/chat.c @@ -2,7 +2,7 @@ #include #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" static void log_message(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) { (void)mesh; diff --git a/examples/chatpp.cc b/examples/chatpp.cc index 2fa65d0..113d955 100644 --- a/examples/chatpp.cc +++ b/examples/chatpp.cc @@ -2,7 +2,7 @@ #include #include #include -#include "../src/meshlink++.h" +#include "../src/meshlink-tiny++.h" class ChatMesh : public meshlink::mesh { public: diff --git a/examples/groupchat.c b/examples/groupchat.c index 18e6f61..5f03a61 100644 --- a/examples/groupchat.c +++ b/examples/groupchat.c @@ -3,7 +3,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "../src/devtools.h" #define CHAT_PORT 531 diff --git a/examples/manynodes.c b/examples/manynodes.c index 64ccd9c..1fdb3b4 100644 --- a/examples/manynodes.c +++ b/examples/manynodes.c @@ -11,7 +11,7 @@ #include #endif -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "../src/devtools.h" #include diff --git a/examples/meshlinkapp.c b/examples/meshlinkapp.c index 67f996a..7e70066 100644 --- a/examples/meshlinkapp.c +++ b/examples/meshlinkapp.c @@ -1,6 +1,6 @@ #include "../src/logger.h" #include "../src/system.h" -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" static void handle_recv_data(meshlink_handle_t *mesh, meshlink_node_t *source, void *data, size_t len) { (void)mesh; diff --git a/examples/monitor.c b/examples/monitor.c index 218cb67..f2fbb99 100644 --- a/examples/monitor.c +++ b/examples/monitor.c @@ -8,7 +8,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "../src/devtools.h" static WINDOW *topwin; diff --git a/src/Makefile.am b/src/Makefile.am index fad47bf..8d62492 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,14 +29,14 @@ utcp_SOURCES = \ utcp.c utcp.h \ utcp_priv.h -lib_LTLIBRARIES = libmeshlink.la +lib_LTLIBRARIES = libmeshlink-tiny.la EXTRA_PROGRAMS = utcp-test -pkginclude_HEADERS = meshlink++.h meshlink.h +pkginclude_HEADERS = meshlink-tiny++.h meshlink-tiny.h -libmeshlink_la_LDFLAGS = -export-symbols $(srcdir)/meshlink.sym +libmeshlink_tiny_la_LDFLAGS = -export-symbols $(srcdir)/meshlink.sym -libmeshlink_la_SOURCES = \ +libmeshlink_tiny_la_SOURCES = \ adns.c adns.h \ buffer.c buffer.h \ conf.c conf.h \ @@ -55,7 +55,7 @@ libmeshlink_la_SOURCES = \ list.c list.h \ logger.c logger.h \ mdns.c mdns.h \ - meshlink.c meshlink.h meshlink.sym \ + meshlink.c meshlink-tiny.h meshlink.sym \ meshlink_internal.h \ meshlink_queue.h \ meta.c meta.h \ @@ -90,10 +90,10 @@ utcp_test_SOURCES = \ utcp-test.c \ $(utcp_SOURCES) -EXTRA_libmeshlink_la_DEPENDENCIES = $(srcdir)/meshlink.sym +EXTRA_libmeshlink_tiny_la_DEPENDENCIES = $(srcdir)/meshlink.sym -libmeshlink_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote. -libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS) +libmeshlink_tiny_la_CFLAGS = $(PTHREAD_CFLAGS) -fPIC -iquote. +libmeshlink_tiny_la_LDFLAGS += $(PTHREAD_LIBS) utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote. utcp_test_LDFLAGS = $(PTHREAD_LIBS) diff --git a/src/event.c b/src/event.c index f8ebe8b..6385465 100644 --- a/src/event.c +++ b/src/event.c @@ -22,7 +22,7 @@ #include "dropin.h" #include "event.h" #include "logger.h" -#include "meshlink.h" +#include "meshlink-tiny.h" #include "net.h" #include "splay_tree.h" #include "utils.h" diff --git a/src/meshlink++.h b/src/meshlink-tiny++.h similarity index 99% rename from src/meshlink++.h rename to src/meshlink-tiny++.h index 1fa7c7b..b9e7bb7 100644 --- a/src/meshlink++.h +++ b/src/meshlink-tiny++.h @@ -2,7 +2,7 @@ #define MESHLINKPP_H /* - meshlink++.h -- MeshLink C++ API + meshlink-tiny++.h -- MeshLink C++ API Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include // for 'placement new' namespace meshlink { diff --git a/src/meshlink.h b/src/meshlink-tiny.h similarity index 99% rename from src/meshlink.h rename to src/meshlink-tiny.h index ea463a0..8dbe725 100644 --- a/src/meshlink.h +++ b/src/meshlink-tiny.h @@ -2,7 +2,7 @@ #define MESHLINK_H /* - meshlink.h -- MeshLink API + meshlink-tiny.h -- MeshLink API Copyright (C) 2014-2021 Guus Sliepen This program is free software; you can redistribute it and/or modify diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h index 17ff9d9..af3a250 100644 --- a/src/meshlink_internal.h +++ b/src/meshlink_internal.h @@ -21,14 +21,14 @@ */ #ifdef MESHLINK_H -#error You must not include both meshlink.h and meshlink_internal.h! +#error You must not include both meshlink-tiny.h and meshlink_internal.h! #endif #include "system.h" #include "event.h" #include "hash.h" -#include "meshlink.h" +#include "meshlink-tiny.h" #include "meshlink_queue.h" #include "sockaddr.h" #include "sptps.h" diff --git a/test/Makefile.am b/test/Makefile.am index 56f6a3e..d9703dd 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -72,79 +72,79 @@ bin_PROGRAMS = $(check_PROGRAMS) endif api_set_node_status_cb_SOURCES = api_set_node_status_cb.c utils.c utils.h -api_set_node_status_cb_LDADD = $(top_builddir)/src/libmeshlink.la +api_set_node_status_cb_LDADD = $(top_builddir)/src/libmeshlink-tiny.la basic_SOURCES = basic.c utils.c utils.h -basic_LDADD = $(top_builddir)/src/libmeshlink.la +basic_LDADD = $(top_builddir)/src/libmeshlink-tiny.la basicpp_SOURCES = basicpp.cpp utils.c utils.h -basicpp_LDADD = $(top_builddir)/src/libmeshlink.la +basicpp_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_SOURCES = channels.c utils.c utils.h -channels_LDADD = $(top_builddir)/src/libmeshlink.la +channels_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_aio_SOURCES = channels-aio.c utils.c utils.h -channels_aio_LDADD = $(top_builddir)/src/libmeshlink.la +channels_aio_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_aio_abort_SOURCES = channels-aio-abort.c utils.c utils.h -channels_aio_abort_LDADD = $(top_builddir)/src/libmeshlink.la +channels_aio_abort_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_aio_cornercases_SOURCES = channels-aio-cornercases.c utils.c utils.h -channels_aio_cornercases_LDADD = $(top_builddir)/src/libmeshlink.la +channels_aio_cornercases_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_aio_fd_SOURCES = channels-aio-fd.c utils.c utils.h -channels_aio_fd_LDADD = $(top_builddir)/src/libmeshlink.la +channels_aio_fd_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_buffer_storage_SOURCES = channels-buffer-storage.c utils.c utils.h -channels_buffer_storage_LDADD = $(top_builddir)/src/libmeshlink.la +channels_buffer_storage_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_no_partial_SOURCES = channels-no-partial.c utils.c utils.h -channels_no_partial_LDADD = $(top_builddir)/src/libmeshlink.la +channels_no_partial_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_failure_SOURCES = channels-failure.c utils.c utils.h -channels_failure_LDADD = $(top_builddir)/src/libmeshlink.la +channels_failure_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_fork_SOURCES = channels-fork.c utils.c utils.h -channels_fork_LDADD = $(top_builddir)/src/libmeshlink.la +channels_fork_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h -channels_cornercases_LDADD = $(top_builddir)/src/libmeshlink.la +channels_cornercases_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_udp_SOURCES = channels-udp.c utils.c utils.h -channels_udp_LDADD = $(top_builddir)/src/libmeshlink.la +channels_udp_LDADD = $(top_builddir)/src/libmeshlink-tiny.la channels_udp_cornercases_SOURCES = channels-udp-cornercases.c utils.c utils.h -channels_udp_cornercases_LDADD = $(top_builddir)/src/libmeshlink.la +channels_udp_cornercases_LDADD = $(top_builddir)/src/libmeshlink-tiny.la duplicate_SOURCES = duplicate.c utils.c utils.h -duplicate_LDADD = $(top_builddir)/src/libmeshlink.la +duplicate_LDADD = $(top_builddir)/src/libmeshlink-tiny.la echo_fork_SOURCES = echo-fork.c utils.c utils.h -echo_fork_LDADD = $(top_builddir)/src/libmeshlink.la +echo_fork_LDADD = $(top_builddir)/src/libmeshlink-tiny.la encrypted_SOURCES = encrypted.c utils.c utils.h -encrypted_LDADD = $(top_builddir)/src/libmeshlink.la +encrypted_LDADD = $(top_builddir)/src/libmeshlink-tiny.la ephemeral_SOURCES = ephemeral.c utils.c utils.h -ephemeral_LDADD = $(top_builddir)/src/libmeshlink.la +ephemeral_LDADD = $(top_builddir)/src/libmeshlink-tiny.la get_all_nodes_SOURCES = get-all-nodes.c utils.c utils.h -get_all_nodes_LDADD = $(top_builddir)/src/libmeshlink.la +get_all_nodes_LDADD = $(top_builddir)/src/libmeshlink-tiny.la import_export_SOURCES = import-export.c utils.c utils.h -import_export_LDADD = $(top_builddir)/src/libmeshlink.la +import_export_LDADD = $(top_builddir)/src/libmeshlink-tiny.la meta_connections_SOURCES = meta-connections.c netns_utils.c netns_utils.h utils.c utils.h -meta_connections_LDADD = $(top_builddir)/src/libmeshlink.la +meta_connections_LDADD = $(top_builddir)/src/libmeshlink-tiny.la sign_verify_SOURCES = sign-verify.c utils.c utils.h -sign_verify_LDADD = $(top_builddir)/src/libmeshlink.la +sign_verify_LDADD = $(top_builddir)/src/libmeshlink-tiny.la storage_policy_SOURCES = storage-policy.c utils.c utils.h -storage_policy_LDADD = $(top_builddir)/src/libmeshlink.la +storage_policy_LDADD = $(top_builddir)/src/libmeshlink-tiny.la trio_SOURCES = trio.c utils.c utils.h -trio_LDADD = $(top_builddir)/src/libmeshlink.la +trio_LDADD = $(top_builddir)/src/libmeshlink-tiny.la trio2_SOURCES = trio2.c utils.c utils.h -trio2_LDADD = $(top_builddir)/src/libmeshlink.la +trio2_LDADD = $(top_builddir)/src/libmeshlink-tiny.la diff --git a/test/api_set_node_status_cb.c b/test/api_set_node_status_cb.c index 7e5da19..7cb3001 100644 --- a/test/api_set_node_status_cb.c +++ b/test/api_set_node_status_cb.c @@ -5,7 +5,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static struct sync_flag a_reachable; diff --git a/test/basic.c b/test/basic.c index 004e718..e848efd 100644 --- a/test/basic.c +++ b/test/basic.c @@ -10,7 +10,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" int main(void) { diff --git a/test/basicpp.cpp b/test/basicpp.cpp index c0550ec..bed6946 100644 --- a/test/basicpp.cpp +++ b/test/basicpp.cpp @@ -5,7 +5,7 @@ #include #include -#include "meshlink++.h" +#include "meshlink-tiny++.h" using namespace std; diff --git a/test/blackbox/common/common_types.h b/test/blackbox/common/common_types.h index edea650..75dd686 100644 --- a/test/blackbox/common/common_types.h +++ b/test/blackbox/common/common_types.h @@ -21,7 +21,7 @@ #define COMMON_TYPES_H #include -#include "../../../src/meshlink.h" +#include "../../../src/meshlink-tiny.h" #define NUT_NODE_NAME "nut" diff --git a/test/blackbox/common/test_step.c b/test/blackbox/common/test_step.c index b772b93..29cc5a6 100644 --- a/test/blackbox/common/test_step.c +++ b/test/blackbox/common/test_step.c @@ -25,7 +25,7 @@ #include #include #include -#include "../../../src/meshlink.h" +#include "../../../src/meshlink-tiny.h" #include "test_step.h" #include "common_handlers.h" diff --git a/test/blackbox/common/test_step.h b/test/blackbox/common/test_step.h index 1704d34..8ef6d76 100644 --- a/test/blackbox/common/test_step.h +++ b/test/blackbox/common/test_step.h @@ -20,7 +20,7 @@ #ifndef TEST_STEP_H #define TEST_STEP_H -#include "../../../src/meshlink.h" +#include "../../../src/meshlink-tiny.h" meshlink_handle_t *execute_open(char *node_name, char *dev_class); char *execute_invite(char *invitee, meshlink_submesh_t *submesh); diff --git a/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings01.c b/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings01.c index 23118c9..f7bead8 100644 --- a/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings01.c +++ b/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings01.c @@ -26,7 +26,7 @@ #include "execute_tests.h" #include "test_cases_random_port_bindings01.h" -#include "../../../src/meshlink.h" +#include "../../../src/meshlink-tiny.h" #include "../../../src/devtools.h" #include "../common/containers.h" #include "../common/test_step.h" diff --git a/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings02.c b/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings02.c index 168915a..1c6fa79 100644 --- a/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings02.c +++ b/test/blackbox/run_blackbox_tests/test_cases_random_port_bindings02.c @@ -27,7 +27,7 @@ #include #include #include -#include "../../../src/meshlink.h" +#include "../../../src/meshlink-tiny.h" #include "../common/containers.h" #include "../common/test_step.h" #include "../common/common_handlers.h" diff --git a/test/blackbox/util/gen_invite.c b/test/blackbox/util/gen_invite.c index 365e9fb..dda2641 100644 --- a/test/blackbox/util/gen_invite.c +++ b/test/blackbox/util/gen_invite.c @@ -24,7 +24,7 @@ #include #include #include -#include "../../../src/meshlink.h" +#include "../../../src/meshlink-tiny.h" #include "../common/test_step.h" #define CMD_LINE_ARG_NODENAME 1 diff --git a/test/blacklist.c b/test/blacklist.c index d296745..f9a3036 100644 --- a/test/blacklist.c +++ b/test/blacklist.c @@ -13,7 +13,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "devtools.h" #include "utils.h" diff --git a/test/channels-aio-abort.c b/test/channels-aio-abort.c index 19a2566..e214898 100644 --- a/test/channels-aio-abort.c +++ b/test/channels-aio-abort.c @@ -11,7 +11,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static const size_t size = 2000000; // size of data to transfer diff --git a/test/channels-aio-cornercases.c b/test/channels-aio-cornercases.c index 208c955..db3ae9a 100644 --- a/test/channels-aio-cornercases.c +++ b/test/channels-aio-cornercases.c @@ -9,7 +9,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static const size_t size = 12000000; // size of data to transfer diff --git a/test/channels-aio-fd.c b/test/channels-aio-fd.c index 3cac823..dbfdde6 100644 --- a/test/channels-aio-fd.c +++ b/test/channels-aio-fd.c @@ -12,7 +12,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static const size_t size = 1024 * 1024; // size of data to transfer diff --git a/test/channels-aio.c b/test/channels-aio.c index 19472ba..db1b0cc 100644 --- a/test/channels-aio.c +++ b/test/channels-aio.c @@ -11,7 +11,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static const size_t size = 25000000; // size of data to transfer diff --git a/test/channels-buffer-storage.c b/test/channels-buffer-storage.c index af7b25b..1da2de0 100644 --- a/test/channels-buffer-storage.c +++ b/test/channels-buffer-storage.c @@ -10,7 +10,7 @@ #include #include "utils.h" -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" static struct sync_flag b_responded; static struct sync_flag aio_finished; diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c index ca0d9b6..20412e0 100644 --- a/test/channels-cornercases.c +++ b/test/channels-cornercases.c @@ -12,7 +12,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "utils.h" static volatile bool b_responded = false; diff --git a/test/channels-failure.c b/test/channels-failure.c index 1ac50d3..bc39e1e 100644 --- a/test/channels-failure.c +++ b/test/channels-failure.c @@ -9,7 +9,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "utils.h" static bool listen_cb(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port) { diff --git a/test/channels-fork.c b/test/channels-fork.c index 74aa84b..a1089b5 100644 --- a/test/channels-fork.c +++ b/test/channels-fork.c @@ -18,7 +18,7 @@ #endif #include "utils.h" -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" static struct sync_flag bar_responded; static struct sync_flag foo_connected; diff --git a/test/channels-no-partial.c b/test/channels-no-partial.c index 43792be..e9abfb3 100644 --- a/test/channels-no-partial.c +++ b/test/channels-no-partial.c @@ -9,7 +9,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) { diff --git a/test/channels-udp-cornercases.c b/test/channels-udp-cornercases.c index 0ae3755..a9da705 100644 --- a/test/channels-udp-cornercases.c +++ b/test/channels-udp-cornercases.c @@ -12,7 +12,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "utils.h" static struct sync_flag b_responded; diff --git a/test/channels-udp.c b/test/channels-udp.c index 6b71ebd..c268727 100644 --- a/test/channels-udp.c +++ b/test/channels-udp.c @@ -10,7 +10,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "utils.h" #define SMALL_SIZE 512 diff --git a/test/channels.c b/test/channels.c index f8946d4..c52c2e3 100644 --- a/test/channels.c +++ b/test/channels.c @@ -10,7 +10,7 @@ #include #include "utils.h" -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" static struct sync_flag b_responded; diff --git a/test/duplicate.c b/test/duplicate.c index a5b85bb..6e7607c 100644 --- a/test/duplicate.c +++ b/test/duplicate.c @@ -8,7 +8,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static struct sync_flag duplicate_detected; diff --git a/test/echo-fork.c b/test/echo-fork.c index 33966da..971136f 100644 --- a/test/echo-fork.c +++ b/test/echo-fork.c @@ -17,7 +17,7 @@ #include #endif -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" /* diff --git a/test/encrypted.c b/test/encrypted.c index ac0dfa9..4f354e4 100644 --- a/test/encrypted.c +++ b/test/encrypted.c @@ -10,7 +10,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" int main(void) { diff --git a/test/ephemeral.c b/test/ephemeral.c index 07db7eb..d22fbea 100644 --- a/test/ephemeral.c +++ b/test/ephemeral.c @@ -7,7 +7,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" int main(void) { diff --git a/test/get-all-nodes.c b/test/get-all-nodes.c index 33adb9a..2d68c42 100644 --- a/test/get-all-nodes.c +++ b/test/get-all-nodes.c @@ -10,7 +10,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static struct sync_flag bar_reachable; diff --git a/test/import-export.c b/test/import-export.c index 15981ed..08343d0 100644 --- a/test/import-export.c +++ b/test/import-export.c @@ -9,7 +9,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" static struct sync_flag bar_reachable; diff --git a/test/invite-join.c b/test/invite-join.c index 5bd5d41..9ae831e 100644 --- a/test/invite-join.c +++ b/test/invite-join.c @@ -10,7 +10,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "devtools.h" #include "utils.h" diff --git a/test/meta-connections.c b/test/meta-connections.c index 22d7c21..c3a0e26 100644 --- a/test/meta-connections.c +++ b/test/meta-connections.c @@ -6,7 +6,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "devtools.h" #include "netns_utils.h" #include "utils.h" diff --git a/test/netns_utils.c b/test/netns_utils.c index 4641c4e..50f7be8 100644 --- a/test/netns_utils.c +++ b/test/netns_utils.c @@ -10,7 +10,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" #include "netns_utils.h" #include "utils.h" diff --git a/test/sign-verify.c b/test/sign-verify.c index a9ac115..f8a21cb 100644 --- a/test/sign-verify.c +++ b/test/sign-verify.c @@ -8,7 +8,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" int main(void) { diff --git a/test/storage-policy.c b/test/storage-policy.c index 4152946..7f757a3 100644 --- a/test/storage-policy.c +++ b/test/storage-policy.c @@ -7,7 +7,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "utils.h" int main(void) { diff --git a/test/trio.c b/test/trio.c index bdb3904..292a1a5 100644 --- a/test/trio.c +++ b/test/trio.c @@ -12,7 +12,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "devtools.h" #include "utils.h" diff --git a/test/trio2.c b/test/trio2.c index dc57679..cc1ce87 100644 --- a/test/trio2.c +++ b/test/trio2.c @@ -12,7 +12,7 @@ #include #include -#include "meshlink.h" +#include "meshlink-tiny.h" #include "devtools.h" #include "utils.h" diff --git a/test/utils.h b/test/utils.h index 11facfc..ecc1f2a 100644 --- a/test/utils.h +++ b/test/utils.h @@ -5,7 +5,7 @@ #include #include -#include "../src/meshlink.h" +#include "../src/meshlink-tiny.h" // Simple synchronisation between threads struct sync_flag { -- 2.39.5