From: Guus Sliepen Date: Wed, 22 Nov 2000 22:05:37 +0000 (+0000) Subject: - More porting to FreeBSD and Solaris. X-Git-Tag: release-1.0pre4~143 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=6f373e690236334d8f8333710b61f97ccad54bf1;p=tinc - More porting to FreeBSD and Solaris. --- diff --git a/configure.in b/configure.in index d4b61e6d..07a03471 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.13.2.20 2000/11/20 19:56:01 zarq Exp $ +dnl $Id: configure.in,v 1.13.2.21 2000/11/22 22:05:36 guus Exp $ AC_INIT(src/tincd.c) AM_INIT_AUTOMAKE(tinc, 1.0pre4-cvs) @@ -48,7 +48,7 @@ AC_FUNC_MEMCMP AC_FUNC_ALLOCA AC_TYPE_SIGNAL AC_CHECK_FUNCS([ftime socket select strtol strerror flock unsetenv \ -asprintf putenv strdup]) +asprintf putenv strdup fcloseall daemon]) jm_FUNC_MALLOC jm_FUNC_REALLOC diff --git a/lib/list.c b/lib/list.c index 6ade9e8a..39b5b3bb 100644 --- a/lib/list.c +++ b/lib/list.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: list.c,v 1.1.2.3 2000/11/20 22:13:00 guus Exp $ + $Id: list.c,v 1.1.2.4 2000/11/22 22:05:36 guus Exp $ */ #include "config.h" @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/src/process.c b/src/process.c index 29e49fa4..8fad5b0c 100644 --- a/src/process.c +++ b/src/process.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: process.c,v 1.1.2.10 2000/11/22 19:14:08 guus Exp $ + $Id: process.c,v 1.1.2.11 2000/11/22 22:05:37 guus Exp $ */ #include "config.h" @@ -31,7 +31,9 @@ #include #include #include +#include #include +#include #include #include @@ -69,6 +71,63 @@ void memory_full(int size) exit(1); } +/* Some functions the less gifted operating systems might lack... */ + +#ifndef HAVE_FCLOSEALL +int fcloseall(void) +{ + fflush(stdin); + fflush(stdout); + fflush(stderr); + fclose(stdin); + fclose(stdout); + fclose(stderr); +} +#endif + +#ifndef HAVE_DAEMON +int daemon(int nochdir, int noclose) +{ + pid_t pid; + int fd; + + ppid = getpid(); + + if((pid = fork()) < 0) + { + perror("fork"); + return -1; + } + if(pid) /* parent process */ + { + signal(SIGTERM, parent_exit); + sleep(600); /* wait 10 minutes */ + exit(1); + } + + if((fd = open("/dev/tty", O_RDWR)) >= 0) + { + if(ioctl(fd, TIOCNOTTY, NULL)) + { + perror("ioctl"); + return -1; + } + close(fd); + } + + if(setsid() < 0) + return -1; + + kill(ppid, SIGTERM); + + if(!nochdir) + chdir("/"); + + if(!noclose) + fcloseall(); +} +#endif + /* Close network connections, and terminate neatly */ diff --git a/src/protocol.c b/src/protocol.c index 735a14c1..11ce65f0 100644 --- a/src/protocol.c +++ b/src/protocol.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: protocol.c,v 1.28.4.65 2000/11/22 20:25:27 guus Exp $ + $Id: protocol.c,v 1.28.4.66 2000/11/22 22:05:37 guus Exp $ */ #include "config.h" @@ -846,7 +846,7 @@ cp /* Check if somebody tries to add ourself */ - if(!strcmp(new->name, myself->name)) + if(!strcmp(name, myself->name)) { syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"), cl->name, cl->hostname); sighup = 1;