From: Guus Sliepen Date: Mon, 5 Nov 2001 19:09:08 +0000 (+0000) Subject: More fixes for Solaris. X-Git-Tag: release-1.0pre5~27 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=e06415e3d9d08cd33c5983a2c49c4101377160c2;p=tinc More fixes for Solaris. --- diff --git a/lib/dropin.c b/lib/dropin.c index c26a357c..8e8f3e76 100644 --- a/lib/dropin.c +++ b/lib/dropin.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: dropin.c,v 1.1.2.5 2001/11/05 19:06:07 guus Exp $ + $Id: dropin.c,v 1.1.2.6 2001/11/05 19:09:08 guus Exp $ */ #include "config.h" @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -97,6 +98,8 @@ int daemon(int nochdir, int noclose) dup2(fd, 2); } } + + return 0; } #endif diff --git a/lib/utils.c b/lib/utils.c index fc9141f1..d79532b2 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -21,8 +21,6 @@ #include #include #include -#include -#include #include "config.h" diff --git a/src/net.c b/src/net.c index b7d340f4..320c684f 100644 --- a/src/net.c +++ b/src/net.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.35.4.147 2001/11/03 22:53:01 guus Exp $ + $Id: net.c,v 1.35.4.148 2001/11/05 19:09:08 guus Exp $ */ #include "config.h" @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -250,9 +251,11 @@ int setup_listen_socket(int port) int nfd, flags; struct sockaddr_in a; int option; - char *interface; char *address; ip_mask_t *ipmask; +#ifdef HAVE_LINUX + char *interface; +#endif cp if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { @@ -811,7 +814,9 @@ cp terminate_connection(myself->connection, 0); -// destroy_trees(); + close(udp_socket); + close(tcp_socket); + exit_edges(); exit_subnets(); exit_nodes();