X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=src%2Fnet_setup.c;h=67bcc8ace9ae6636421a02f0029e5061bdb5ea68;hb=997f4aea764ac23c2c630b16eb313d2a4aa8b1d1;hp=daa296bd693d4318a22c4ebd4e29bf278fa15f41;hpb=38adc8bf548c2c465d5f4147866c3d3f9112d3a8;p=meshlink diff --git a/src/net_setup.c b/src/net_setup.c index daa296bd..67bcc8ac 100644 --- 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 + 2000-2014 Guus Sliepen 2006 Scott Lamb 2010 Brandon Black @@ -723,7 +723,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 +891,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")) {