From 9361462cf1f65a59edc7764633597e8627fe49b0 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 12 Jul 2020 21:11:32 +0200 Subject: [PATCH] Don't link with Catta anymore. --- Makefile.am | 6 +- README | 3 - README.git | 6 - configure.ac | 8 - examples/Makefile.am | 14 +- examples/chat.c | 4 +- src/Makefile.am | 13 - src/discovery.c | 515 -------------------------- src/meshlink_internal.h | 18 +- test/blackbox/util/build_container.sh | 2 - 10 files changed, 12 insertions(+), 577 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5a8a38df..1dc085c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,11 +2,7 @@ AUTOMAKE_OPTIONS = gnu -if CATTA -MAYBE_CATTA = catta -endif - -SUBDIRS = $(MAYBE_CATTA) src test examples +SUBDIRS = src test examples DIST_SUBDIRS = $(SUBDIRS) diff --git a/README b/README index 390468b0..59d99270 100644 --- a/README +++ b/README @@ -23,9 +23,6 @@ Requirements In order to compile MeshLink, you will need a GNU C compiler environment. -The following libraries are used by default, but can be disabled if necessary: - -- Catta (https://github.com/meshlink/catta) Features -------- diff --git a/README.git b/README.git index ab4de78b..f28b01f4 100644 --- a/README.git +++ b/README.git @@ -5,12 +5,6 @@ to install the very latest versions of the following packages: - automake - autoconf -Compile first the git submodules - -git submodule init -git submodule update -sh README.catta - Then you have to let the autotools create all the autogenerated files, using this command: diff --git a/configure.ac b/configure.ac index f9a93259..10f544e9 100644 --- a/configure.ac +++ b/configure.ac @@ -81,14 +81,6 @@ AS_IF([test "x$enable_hardening" != "xno"], ] ); -dnl Allow building without Catta -AC_ARG_ENABLE([catta], AS_HELP_STRING([--disable-catta], [disable linking with the Catta library])) -AS_IF([test "x$enable_catta" != "xno"], - AC_DEFINE(HAVE_CATTA, 1, [Link with Catta]) - AC_CONFIG_SUBDIRS([catta]) -) -AM_CONDITIONAL(CATTA, test "x$enable_catta" != "xno") - dnl UTCP debug flags AC_ARG_ENABLE([utcp_debug], AS_HELP_STRING([--enable-utcp-debug], [compile utcp with debug output])) AS_IF([test "x$enable_utcp_debug" = "xyes"], diff --git a/examples/Makefile.am b/examples/Makefile.am index 36de6e24..9c7261c0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -4,26 +4,26 @@ 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 ${top_builddir}/catta/src/libcatta.la +meshlinkapp_LDADD = ${top_builddir}/src/libmeshlink.la chat_SOURCES = chat.c -chat_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la +chat_LDADD = ${top_builddir}/src/libmeshlink.la noinst_PROGRAMS += chatpp chatpp_SOURCES = chatpp.cc -chatpp_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la +chatpp_LDADD = ${top_builddir}/src/libmeshlink.la manynodes_SOURCES = manynodes.c -manynodes_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la +manynodes_LDADD = ${top_builddir}/src/libmeshlink.la channels_SOURCES = channels.c -channels_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la +channels_LDADD = ${top_builddir}/src/libmeshlink.la if MONITOR noinst_PROGRAMS += monitor monitor_SOURCES = monitor.c -monitor_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la $(NCURSES_LIBS) -lm +monitor_LDADD = ${top_builddir}/src/libmeshlink.la $(NCURSES_LIBS) -lm endif groupchat_SOURCES = groupchat.c -groupchat_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la +groupchat_LDADD = ${top_builddir}/src/libmeshlink.la diff --git a/examples/chat.c b/examples/chat.c index 88fe127a..87af2878 100644 --- a/examples/chat.c +++ b/examples/chat.c @@ -246,7 +246,7 @@ int main(int argc, char *argv[]) { nick = argv[2]; } - meshlink_set_log_cb(NULL, MESHLINK_INFO, log_message); + meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_message); meshlink_handle_t *mesh = meshlink_open(confbase, nick, "chat", DEV_CLASS_STATIONARY); @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) { meshlink_set_receive_cb(mesh, receive); meshlink_set_node_status_cb(mesh, node_status); - meshlink_set_log_cb(mesh, MESHLINK_INFO, log_message); + meshlink_set_log_cb(mesh, MESHLINK_DEBUG, log_message); if(!meshlink_start(mesh)) { fprintf(stderr, "Could not start MeshLink: %s\n", meshlink_strerror(meshlink_errno)); diff --git a/src/Makefile.am b/src/Makefile.am index e9c33510..640cf64f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -96,16 +96,3 @@ libmeshlink_la_LDFLAGS += $(PTHREAD_LIBS) utcp_test_CFLAGS = $(PTHREAD_CFLAGS) -iquote. utcp_test_LDFLAGS = $(PTHREAD_LIBS) - -if CATTA -libmeshlink_la_SOURCES += \ - discovery.c discovery.h - -libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/include/ - -if MINGW -libmeshlink_la_CFLAGS += -I${top_srcdir}/catta/src/compat/windows/include/ -endif - -libmeshlink_la_LIBADD = ${top_builddir}/catta/src/libcatta.la -endif diff --git a/src/discovery.c b/src/discovery.c index 36d202bd..df5dda72 100644 --- a/src/discovery.c +++ b/src/discovery.c @@ -1,14 +1,5 @@ #include "system.h" -#include -#include -#include -#include -#include -#include -#include -#include - #if defined(__APPLE__) || defined(__unix) && !defined(__linux) #include #elif defined(__linux) @@ -49,474 +40,6 @@ static const sockaddr_t mdns_address_ipv6 = { .in6.sin6_port = 0xe914, }; -static void generate_rand_string(meshlink_handle_t *mesh, char *buffer, size_t size) { - assert(size); - - for(size_t i = 0; i < (size - 1); ++i) { - buffer[i] = 'a' + prng(mesh, 'z' - 'a' + 1); - } - - buffer[size - 1] = '\0'; -} - -static void discovery_entry_group_callback(CattaServer *server, CattaSEntryGroup *group, CattaEntryGroupState state, void *userdata) { - (void)server; - (void)group; - meshlink_handle_t *mesh = userdata; - - assert(mesh); - assert(mesh->catta_server); - assert(mesh->catta_poll); - - /* Called whenever the entry group state changes */ - switch(state) { - case CATTA_ENTRY_GROUP_ESTABLISHED: - /* The entry group has been established successfully */ - logger(mesh, MESHLINK_DEBUG, "Catta Service successfully established.\n"); - break; - - case CATTA_ENTRY_GROUP_COLLISION: - logger(mesh, MESHLINK_WARNING, "Catta Service collision.\n"); - // @TODO can we just set a new name and retry? - break; - - case CATTA_ENTRY_GROUP_FAILURE : - /* Some kind of failure happened while we were registering our services */ - logger(mesh, MESHLINK_ERROR, "Catta Entry group failure: %s\n", catta_strerror(catta_server_errno(mesh->catta_server))); - catta_simple_poll_quit(mesh->catta_poll); - break; - - case CATTA_ENTRY_GROUP_UNCOMMITED: - case CATTA_ENTRY_GROUP_REGISTERING: - break; - } -} - - -static void discovery_create_services(meshlink_handle_t *mesh) { - char *fingerprint = NULL; - char *txt_name = NULL; - char *txt_fingerprint = NULL; - - assert(mesh); - assert(mesh->name); - assert(mesh->myport); - assert(mesh->catta_server); - assert(mesh->catta_poll); - assert(mesh->catta_servicetype); - assert(mesh->self); - - logger(mesh, MESHLINK_DEBUG, "Adding service\n"); - - /* If this is the first time we're called, let's create a new entry group */ - if(!(mesh->catta_group = catta_s_entry_group_new(mesh->catta_server, discovery_entry_group_callback, mesh))) { - logger(mesh, MESHLINK_ERROR, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(mesh->catta_server))); - goto fail; - } - - /* Create txt records */ - fingerprint = meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self); - xasprintf(&txt_name, "%s=%s", MESHLINK_MDNS_NAME_KEY, mesh->name); - xasprintf(&txt_fingerprint, "%s=%s", MESHLINK_MDNS_FINGERPRINT_KEY, fingerprint); - - /* Add the service */ - int ret = 0; - - if((ret = catta_server_add_service(mesh->catta_server, mesh->catta_group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, fingerprint, mesh->catta_servicetype, NULL, NULL, atoi(mesh->myport), txt_name, txt_fingerprint, NULL)) < 0) { - logger(mesh, MESHLINK_ERROR, "Failed to add service: %s\n", catta_strerror(ret)); - goto fail; - } - - /* Tell the server to register the service */ - if((ret = catta_s_entry_group_commit(mesh->catta_group)) < 0) { - logger(mesh, MESHLINK_ERROR, "Failed to commit entry_group: %s\n", catta_strerror(ret)); - goto fail; - } - - goto done; - -fail: - catta_simple_poll_quit(mesh->catta_poll); - -done: - free(fingerprint); - free(txt_name); - free(txt_fingerprint); -} - -static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) { - (void)server; - meshlink_handle_t *mesh = userdata; - - assert(mesh); - - switch(state) { - case CATTA_SERVER_RUNNING: - - /* The serve has startup successfully and registered its host - * name on the network, so it's time to create our services */ - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - if(!mesh->catta_group) { - discovery_create_services(mesh); - } - - pthread_mutex_unlock(&mesh->mutex); - - break; - - case CATTA_SERVER_COLLISION: { - /* A host name collision happened. Let's pick a new name for the server */ - char hostname[17]; - generate_rand_string(mesh, hostname, sizeof(hostname)); - - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - assert(mesh->catta_server); - assert(mesh->catta_poll); - - int result = catta_server_set_host_name(mesh->catta_server, hostname); - - if(result < 0) { - catta_simple_poll_quit(mesh->catta_poll); - } - - pthread_mutex_unlock(&mesh->mutex); - } - break; - - case CATTA_SERVER_REGISTERING: - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - /* Let's drop our registered services. When the server is back - * in CATTA_SERVER_RUNNING state we will register them - * again with the new host name. */ - if(mesh->catta_group) { - catta_s_entry_group_reset(mesh->catta_group); - mesh->catta_group = NULL; - } - - pthread_mutex_unlock(&mesh->mutex); - - break; - - case CATTA_SERVER_FAILURE: - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - assert(mesh->catta_server); - assert(mesh->catta_poll); - - /* Terminate on failure */ - catta_simple_poll_quit(mesh->catta_poll); - - pthread_mutex_unlock(&mesh->mutex); - break; - - case CATTA_SERVER_INVALID: - break; - } -} - -static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfIndex interface_, CattaProtocol protocol, CattaResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, const CattaAddress *address, uint16_t port, CattaStringList *txt, CattaLookupResultFlags flags, void *userdata) { - (void)interface_; - (void)protocol; - (void)flags; - (void)name; - (void)type; - (void)domain; - (void)host_name; - - meshlink_handle_t *mesh = userdata; - - assert(mesh); - - if(event != CATTA_RESOLVER_FOUND) { - catta_s_service_resolver_free(resolver); - return; - } - - // retrieve fingerprint - CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY); - CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY); - - if(node_name_li && node_fp_li) { - char *node_name = (char *)catta_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY); - char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY); - - if(node_name[0] == '=' && node_fp[0] == '=') { - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - node_name += 1; - - meshlink_node_t *node = meshlink_get_node(mesh, node_name); - - if(node) { - logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name); - - sockaddr_t naddress; - memset(&naddress, 0, sizeof(naddress)); - - switch(address->proto) { - case CATTA_PROTO_INET: { - naddress.in.sin_family = AF_INET; - naddress.in.sin_port = htons(port); - naddress.in.sin_addr.s_addr = address->data.ipv4.address; - } - break; - - case CATTA_PROTO_INET6: { - naddress.in6.sin6_family = AF_INET6; - naddress.in6.sin6_port = htons(port); - memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr)); - } - break; - - default: - naddress.unknown.family = AF_UNKNOWN; - break; - } - - if(naddress.unknown.family != AF_UNKNOWN) { - node_t *n = (node_t *)node; - connection_t *c = n->connection; - - n->catta_address = naddress; - node_add_recent_address(mesh, n, &naddress); - - if(c && c->outgoing && !c->status.active) { - c->outgoing->timeout = 0; - - if(c->outgoing->ev.cb) { - timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) { - 0, 0 - }); - } - - c->last_ping_time = -3600; - } - - } else { - logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name); - } - } else { - logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name); - } - - pthread_mutex_unlock(&mesh->mutex); - } - } - - catta_s_service_resolver_free(resolver); -} - -static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfIndex interface_, CattaProtocol protocol, CattaBrowserEvent event, const char *name, const char *type, const char *domain, CattaLookupResultFlags flags, void *userdata) { - (void)browser; - (void)flags; - meshlink_handle_t *mesh = userdata; - - /* Called whenever a new services becomes available on the LAN or is removed from the LAN */ - switch(event) { - case CATTA_BROWSER_FAILURE: - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - catta_simple_poll_quit(mesh->catta_poll); - pthread_mutex_unlock(&mesh->mutex); - break; - - case CATTA_BROWSER_NEW: - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh); - handle_network_change(mesh, ++mesh->catta_interfaces); - pthread_mutex_unlock(&mesh->mutex); - break; - - case CATTA_BROWSER_REMOVE: - if(pthread_mutex_lock(&mesh->mutex) != 0) { - abort(); - } - - handle_network_change(mesh, --mesh->catta_interfaces); - pthread_mutex_unlock(&mesh->mutex); - break; - - case CATTA_BROWSER_ALL_FOR_NOW: - case CATTA_BROWSER_CACHE_EXHAUSTED: - break; - } -} - -static void discovery_log_cb(CattaLogLevel level, const char *txt) { - meshlink_log_level_t mlevel = MESHLINK_CRITICAL; - - switch(level) { - case CATTA_LOG_ERROR: - mlevel = MESHLINK_ERROR; - break; - - case CATTA_LOG_WARN: - mlevel = MESHLINK_WARNING; - break; - - case CATTA_LOG_NOTICE: - case CATTA_LOG_INFO: - mlevel = MESHLINK_INFO; - break; - - case CATTA_LOG_DEBUG: - default: - mlevel = MESHLINK_DEBUG; - break; - } - - logger(NULL, mlevel, "%s\n", txt); -} - -static void *discovery_loop(void *userdata) { - bool status = false; - meshlink_handle_t *mesh = userdata; - assert(mesh); - - if(pthread_mutex_lock(&mesh->discovery_mutex) != 0) { - abort(); - } - -#if 1 - // bypass Catta - pthread_cond_broadcast(&mesh->discovery_cond); - pthread_mutex_unlock(&mesh->discovery_mutex); - return NULL; -#endif - - // handle catta logs - catta_set_log_function(discovery_log_cb); - - // create service type string - char appname[strlen(mesh->appname) + 2]; - strcpy(appname, mesh->appname); - - for(char *p = appname; *p; p++) { - if(!isalnum(*p) && *p != '_' && *p != '-') { - *p = '_'; - } - } - - if(!appname[1]) { - appname[1] = '_'; - appname[2] = '\0'; - } - - size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(appname) + 1; - mesh->catta_servicetype = malloc(servicetype_strlen); - - if(mesh->catta_servicetype == NULL) { - logger(mesh, MESHLINK_ERROR, "Failed to allocate memory for service type string.\n"); - goto fail; - } - - snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, appname); - - // Allocate discovery loop object - if(!(mesh->catta_poll = catta_simple_poll_new())) { - logger(mesh, MESHLINK_ERROR, "Failed to create discovery poll object.\n"); - goto fail; - } - - // generate some unique host name (we actually do not care about it) - char hostname[17]; - generate_rand_string(mesh, hostname, sizeof(hostname)); - - // Let's set the host name for this server. - CattaServerConfig config; - catta_server_config_init(&config); - config.host_name = catta_strdup(hostname); - config.publish_workstation = 0; - config.disallow_other_stacks = 0; - config.publish_hinfo = 0; - config.publish_addresses = 1; - config.publish_no_reverse = 1; - config.allow_point_to_point = 1; - - /* Allocate a new server */ - int error; - const CattaPoll *poller = catta_simple_poll_get(mesh->catta_poll); - - if(!poller) { - logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error)); - goto fail; - } - - mesh->catta_server = catta_server_new(poller, &config, discovery_server_callback, mesh, &error); - - /* Free the configuration data */ - catta_server_config_free(&config); - - /* Check whether creating the server object succeeded */ - if(!mesh->catta_server) { - logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error)); - goto fail; - } - - // Create the service browser - if(!(mesh->catta_browser = catta_s_service_browser_new(mesh->catta_server, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, mesh->catta_servicetype, NULL, 0, discovery_browse_callback, mesh))) { - logger(mesh, MESHLINK_ERROR, "Failed to create discovery service browser: %s\n", catta_strerror(catta_server_errno(mesh->catta_server))); - goto fail; - } - - status = true; - -fail: - - pthread_cond_broadcast(&mesh->discovery_cond); - pthread_mutex_unlock(&mesh->discovery_mutex); - - if(status) { - catta_simple_poll_loop(mesh->catta_poll); - } - - if(mesh->catta_browser) { - catta_s_service_browser_free(mesh->catta_browser); - mesh->catta_browser = NULL; - } - - if(mesh->catta_group) { - catta_s_entry_group_reset(mesh->catta_group); - catta_s_entry_group_free(mesh->catta_group); - mesh->catta_group = NULL; - } - - if(mesh->catta_server) { - catta_server_free(mesh->catta_server); - mesh->catta_server = NULL; - } - - if(mesh->catta_poll) { - catta_simple_poll_free(mesh->catta_poll); - mesh->catta_poll = NULL; - } - - if(mesh->catta_servicetype) { - free(mesh->catta_servicetype); - mesh->catta_servicetype = NULL; - } - - return NULL; -} - typedef struct discovery_address { int index; bool up; @@ -1072,28 +595,6 @@ bool discovery_start(meshlink_handle_t *mesh) { logger(mesh, MESHLINK_DEBUG, "discovery_start called\n"); assert(mesh); - assert(!mesh->catta_poll); - assert(!mesh->catta_server); - assert(!mesh->catta_browser); - assert(!mesh->discovery_threadstarted); - assert(!mesh->catta_servicetype); - - if(pthread_mutex_lock(&mesh->discovery_mutex) != 0) { - abort(); - } - - // Start the discovery thread - if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) { - pthread_mutex_unlock(&mesh->discovery_mutex); - logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno)); - memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread); - return false; - } - - pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex); - pthread_mutex_unlock(&mesh->discovery_mutex); - - mesh->discovery_threadstarted = true; // Set up multicast sockets for mDNS static const int one = 1; @@ -1176,20 +677,4 @@ void discovery_stop(meshlink_handle_t *mesh) { io_del(&mesh->loop, &mesh->discovery_sockets[i]); } } - - // Shut down - if(mesh->catta_poll) { - catta_simple_poll_quit(mesh->catta_poll); - } - - // Wait for the discovery thread to finish - if(mesh->discovery_threadstarted == true) { - if(pthread_join(mesh->discovery_thread, NULL) != 0) { - abort(); - } - - mesh->discovery_threadstarted = false; - } - - mesh->catta_interfaces = 0; } diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h index 077705fa..6c6c4c4d 100644 --- a/src/meshlink_internal.h +++ b/src/meshlink_internal.h @@ -45,11 +45,6 @@ static const char meshlink_udp_label[] = "MeshLink UDP"; #define MESHLINK_CONFIG_VERSION 2 #define MESHLINK_INVITATION_VERSION 2 -struct CattaServer; -struct CattaSServiceBrowser; -struct CattaSimplePoll; -struct CattaSEntryGroup; - typedef struct listen_socket_t { struct io_t tcp; struct io_t udp; @@ -161,7 +156,7 @@ struct meshlink_handle { int netns; bool default_blacklist; - bool discovery; // Whether Catta is enabled or not + bool discovery; // Whether mDNS discovery is enabled or not bool inviter_commits_first; // Configuration @@ -179,16 +174,7 @@ struct meshlink_handle { bool threadstarted; bool discovery_threadstarted; - // Catta - pthread_t discovery_thread; - struct CattaServer *catta_server; - struct CattaSServiceBrowser *catta_browser; - struct CattaSimplePoll *catta_poll; - struct CattaSEntryGroup *catta_group; - char *catta_servicetype; - unsigned int catta_interfaces; - - // PFROUTE + // mDNS discovery io_t pfroute_io; int *discovery_ifaces; struct discovery_address *discovery_addresses; diff --git a/test/blackbox/util/build_container.sh b/test/blackbox/util/build_container.sh index 98fc62ed..e03b0180 100755 --- a/test/blackbox/util/build_container.sh +++ b/test/blackbox/util/build_container.sh @@ -28,7 +28,6 @@ setx=$4 # Folder Paths ltlibfolder=".libs" meshlinksrclibpath="${meshlinkrootpath}/src/${ltlibfolder}" -cattasrclibpath="${meshlinkrootpath}/catta/src/${ltlibfolder}" blackboxpath="${meshlinkrootpath}/test/blackbox" blackboxlibpath="${meshlinkrootpath}/test/blackbox/${ltlibfolder}" blackboxutilpath="${blackboxpath}/util" @@ -76,7 +75,6 @@ mkdir ${mirrorfolderlibpath} cp ${blackboxlibpath}/* ${mirrorfolderlibpath} cp ${testcaselibpath}/*${nodesimpgm}* ${mirrorfolderlibpath} cp ${meshlinksrclibpath}/* ${mirrorfolderlibpath} -cp ${cattasrclibpath}/* ${mirrorfolderlibpath} # Copy mirror folder into LXC Container # Delete Destination Folder -- 2.39.5