X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=b344eebc3e78b60a09cdbc967ded70c11d94abcf;hb=b3b89e46b1b84fa6cf1726fabe9e9c7bb0d3d831;hp=67bcc8ace9ae6636421a02f0029e5061bdb5ea68;hpb=4c819a6e3a59da17142bc7bafd0455ca4bf049ac;p=meshlink diff --git a/src/net_setup.c b/src/net_setup.c index 67bcc8ac..b344eebc 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -26,7 +26,6 @@ #include "conf.h" #include "connection.h" #include "control.h" -#include "device.h" #include "digest.h" #include "ecdsa.h" #include "graph.h" @@ -44,8 +43,6 @@ #include "xalloc.h" char *myport; -static io_t device_io; -devops_t devops; char *proxyhost; char *proxyport; @@ -1019,8 +1016,6 @@ bool setup_network(void) { char *envp[5] = {NULL}; xasprintf(&envp[0], "NETNAME=%s", netname ? : ""); - xasprintf(&envp[1], "DEVICE=%s", device ? : ""); - xasprintf(&envp[2], "INTERFACE=%s", iface ? : ""); xasprintf(&envp[3], "NAME=%s", myself->name); execute_script("tinc-up", envp); @@ -1067,8 +1062,6 @@ void close_network_connections(void) { char *envp[5] = {NULL}; xasprintf(&envp[0], "NETNAME=%s", netname ? : ""); - xasprintf(&envp[1], "DEVICE=%s", device ? : ""); - xasprintf(&envp[2], "INTERFACE=%s", iface ? : ""); xasprintf(&envp[3], "NAME=%s", myself->name); exit_requests(); @@ -1084,8 +1077,6 @@ void close_network_connections(void) { for(int i = 0; i < 4; i++) free(envp[i]); - devops.close(); - exit_control(); return;