Remove files not used by MeshLink.

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index daa296bd693d4318a22c4ebd4e29bf278fa15f41..b344eebc3e78b60a09cdbc967ded70c11d94abcf 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -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;
@@ -723,7 +720,7 @@ static bool add_listen_address(char *address, bool bindto) {
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
-static bool setup_myself(void) {
+bool setup_myself(void) {
        char *name, *hostname, *cipher, *digest, *type;
        char *address = NULL;
        bool port_specified = false;
@@ -891,33 +888,6 @@ static bool setup_myself(void) {
        else if(autoconnect)
                load_all_nodes();
 
-       /* Open device */
-
-       devops = os_devops;
-
-       if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
-               if(!strcasecmp(type, "dummy"))
-                       devops = dummy_devops;
-               else if(!strcasecmp(type, "raw_socket"))
-                       devops = raw_socket_devops;
-               else if(!strcasecmp(type, "multicast"))
-                       devops = multicast_devops;
-#ifdef ENABLE_UML
-               else if(!strcasecmp(type, "uml"))
-                       devops = uml_devops;
-#endif
-#ifdef ENABLE_VDE
-               else if(!strcasecmp(type, "vde"))
-                       devops = vde_devops;
-#endif
-       }
-
-       if(!devops.setup())
-               return false;
-
-       if(device_fd >= 0)
-               io_add(&device_io, handle_device_data, NULL, device_fd, IO_READ);
-
        /* Open sockets */
 
        if(!do_detach && getenv("LISTEN_FDS")) {
@@ -1046,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);
@@ -1094,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();
@@ -1111,8 +1077,6 @@ void close_network_connections(void) {
        for(int i = 0; i < 4; i++)
                free(envp[i]);
 
-       devops.close();
-
        exit_control();
 
        return;