X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fnetns_utils.c;h=5e0ed2157f6ca50fd9ebe071f5381fab6d63c12b;hb=92bae04187d9ecd7900b5a28154a2c046001a7f3;hp=d957d5b63386640e622821ef673ec45cb1b3e41b;hpb=9d23fe58052b3ef971305699a00ea6dbd1111744;p=meshlink-tiny

diff --git a/test/netns_utils.c b/test/netns_utils.c
index d957d5b..5e0ed21 100644
--- a/test/netns_utils.c
+++ b/test/netns_utils.c
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "../src/meshlink.h"
+#include "../src/meshlink-tiny.h"
 #include "netns_utils.h"
 #include "utils.h"
 
@@ -55,8 +55,6 @@ static void create_peers(peer_config_t *peers, int npeers, const char *prefix) {
 		assert(peers[i].mesh);
 		free(params);
 		free(conf_path);
-
-		meshlink_enable_discovery(peers[i].mesh, false);
 	}
 }
 
@@ -106,17 +104,17 @@ void change_peer_ip(peer_config_t *peer) {
 }
 
 /// Let the first peer in a list invite all the subsequent peers
-static void invite_peers(peer_config_t *peers, int npeers) {
-	assert(meshlink_start(peers[0].mesh));
-
+static void link_peers(peer_config_t *peers, int npeers) {
 	for(int i = 1; i < npeers; i++) {
-		char *invitation = meshlink_invite_ex(peers[0].mesh, NULL, peers[i].name, MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_NUMERIC);
-		assert(invitation);
-		assert(meshlink_join(peers[i].mesh, invitation));
-		free(invitation);
+		char *export_relay = meshlink_export(peers[0].mesh);
+		char *export_peer = meshlink_export(peers[i].mesh);
+		assert(export_relay);
+		assert(export_peer);
+		assert(meshlink_import(peers[0].mesh, export_peer));
+		assert(meshlink_import(peers[i].mesh, export_relay));
+		free(export_relay);
+		free(export_peer);
 	}
-
-	meshlink_stop(peers[0].mesh);
 }
 
 /// Close meshlink instances and clean up
@@ -138,7 +136,7 @@ peer_config_t *setup_relay_peer_nut(const char *prefix) {
 
 	create_peers(peers, 3, prefix);
 	setup_lan_topology(peers, 3);
-	invite_peers(peers, 3);
+	link_peers(peers, 3);
 
 	return peers;
 }