$NetBSD: patch-am,v 1.1 2003/09/30 08:59:20 hfath Exp $

--- l2tpd.c.orig	2002-08-19 16:12:17.000000000 +0200
+++ l2tpd.c
@@ -21,7 +21,9 @@
 #include <errno.h>
 #include <unistd.h>
 #if (__GLIBC__ < 2)
-# if defined(FREEBSD)
+# if defined(__NetBSD__)
+#  include <signal.h>
+# elif defined(FREEBSD)
 #  include <sys/signal.h>
 # elif defined(LINUX)
 #  include <bsd/signal.h>
@@ -34,8 +36,6 @@
 #include <netdb.h>
 #include <string.h>
 #include <fcntl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #ifdef USE_KERNEL
 #include <sys/ioctl.h>
 #endif
@@ -46,6 +46,7 @@ int max_tunnels = DEF_MAX_TUNNELS;
 struct utsname uts;
 int ppd = 1;                    /* Packet processing delay */
 int control_fd;                 /* descriptor of control area */
+int control_fdw;                 /* descriptor of control area */
 char *args;
 
 char *dial_no_tmp;              /* jz: Dialnumber for Outgoing Call */
@@ -384,6 +385,7 @@ int start_pppd (struct call *c, struct p
 
         /* close the control pipe fd */
         close (control_fd);
+	close (control_fdw);
 
         execv (PPPD, stropt);
         log (LOG_WARN, "%s: Exec of %s failed!\n", __FUNCTION__, PPPD);
@@ -764,8 +766,8 @@ void do_control ()
     struct lac *lac;
     int call;
     int tunl;
-    int cnt = -1;
-    while (cnt)
+    int cnt = 1;
+    while (cnt > 0)
     {
         cnt = read (control_fd, buf, sizeof (buf));
         if (cnt > 0)
@@ -920,7 +922,9 @@ void do_control ()
     }
     /* Otherwise select goes nuts */
     close (control_fd);
+    close (control_fdw);
     control_fd = open (CONTROL_PIPE, O_RDONLY | O_NONBLOCK, 0600);
+    control_fdw = open (CONTROL_PIPE, O_WRONLY | O_NONBLOCK, 0600);
 }
 
 void usage(void) {
@@ -985,6 +989,7 @@ void daemonize() {
     char buf[STRLEN];
     int pidfilewritten=0;
 
+#ifndef __FreeBSD__
     if((pid = fork()) < 0) {
         log(LOG_LOG, "%s: Unable to fork ()\n",__FUNCTION__);
         close(server_socket);
@@ -998,6 +1003,12 @@ void daemonize() {
                          to do a proper fix for this */
     close(1);
     close(2);
+#else
+    if (daemon(0, 0) != 0) {
+	log(LOG_LOG, "%s: daemon () failed\n", __FUNCTION__);
+	exit(1);
+    }
+#endif
 
     /* Read previous pid file. */
     if ((i = open(gconfig.pidfile,O_RDONLY)) > 0) {
@@ -1075,6 +1086,7 @@ void init (int argc,char *argv[])
     init_scheduler ();
     mkfifo (CONTROL_PIPE, 0600);
     control_fd = open (CONTROL_PIPE, O_RDONLY | O_NONBLOCK, 0600);
+    control_fdw = open (CONTROL_PIPE, O_WRONLY | O_NONBLOCK, 0600);
     if (control_fd < 0)
     {
         log (LOG_CRIT, "%s: Unable to open " CONTROL_PIPE " for reading.",
@@ -1086,9 +1098,9 @@ void init (int argc,char *argv[])
     log (LOG_LOG,
          "Written by Mark Spencer, Copyright (C) 1998, Adtran, Inc.\n");
     log (LOG_LOG, "Forked by Scott Balmos and David Stipp, (C) 2001\n");
-    log (LOG_LOG, "Inhereted by Jeff McAdams, (C) 2002\n");
-    log (LOG_LOG, "%s version %s on a %s, port %d\n", uts.sysname,
-         uts.release, uts.machine, gconfig.port);
+    log (LOG_LOG, "Inherited by Jeff McAdams, (C) 2002\n");
+    log (LOG_LOG, "%s version %s on a %s, addr %s, port %d\n", uts.sysname,
+         uts.release, uts.machine, inet_ntoa(gconfig.addr), gconfig.port);
     lac = laclist;
     while (lac)
     {