Remove the requirement that redistributions in binary form reproduce

[ppp.git] / pppd / sys-bsd.c

diff --git a/pppd/sys-bsd.c b/pppd/sys-bsd.c
index 60a7927489868dbe4e963c40e9071a8d2aaa4a33..da186a44bd1c738ab4148cd9045c483e07b63cfe 100644 (file)
--- a/pppd/sys-bsd.c
+++ b/pppd/sys-bsd.c
@@ -2,28 +2,75 @@
  * sys-bsd.c - System-dependent procedures for setting up
  * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.)
  *
  * sys-bsd.c - System-dependent procedures for setting up
  * PPP interfaces on bsd-4.4-ish systems (including 386BSD, NetBSD, etc.)
  *

- * Copyright (c) 1989 Carnegie Mellon University.
- * Copyright (c) 1995 The Australian National University.
- * All rights reserved.
+ * Copyright (c) 1993-2002 Paul Mackerras. All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University and The Australian National University.
- * The names of the Universities may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. The name(s) of the authors of this software must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission.
+ *
+ * 3. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Paul Mackerras
+ *     <paulus@samba.org>".
+ *
+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Derived from main.c and pppd.h, which are:
+ *
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Office of Technology Transfer
+ *      Carnegie Mellon University
+ *      5000 Forbes Avenue
+ *      Pittsburgh, PA  15213-3890
+ *      (412) 268-4387, fax: (412) 268-7395
+ *      tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 
  */
 

-#ifndef lint
-static char rcsid[] = "$Id: sys-bsd.c,v 1.42 1999/04/01 07:20:10 paulus Exp $";
+#define RCSID  "$Id: sys-bsd.c,v 1.50 2004/11/04 10:02:26 paulus Exp $"

 /*     $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */
 /*     $NetBSD: sys-bsd.c,v 1.1.1.3 1997/09/26 18:53:04 christos Exp $ */

-#endif

 
 /*
  * TODO:
 
 /*
  * TODO:


@@ -74,6 +121,8 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.42 1999/04/01 07:20:10 paulus Exp $";
 #include "fsm.h"
 #include "ipcp.h"
 
 #include "fsm.h"
 #include "ipcp.h"
 

+static const char rcsid[] = RCSID;
+

 static int initdisc = -1;      /* Initial TTY discipline for ppp_fd */
 static int initfdflags = -1;   /* Initial file descriptor flags for ppp_fd */
 static int ppp_fd = -1;                /* fd which is set to PPP discipline */
 static int initdisc = -1;      /* Initial TTY discipline for ppp_fd */
 static int initfdflags = -1;   /* Initial file descriptor flags for ppp_fd */
 static int ppp_fd = -1;                /* fd which is set to PPP discipline */


@@ -83,8 +132,6 @@ static int restore_term;     /* 1 => we've munged the terminal */
 static struct termios inittermios; /* Initial TTY termios */
 static struct winsize wsinfo;  /* Initial window size info */
 
 static struct termios inittermios; /* Initial TTY termios */
 static struct winsize wsinfo;  /* Initial window size info */
 

-static char *lock_file;                /* name of lock file created */
-

 static int loop_slave = -1;
 static int loop_master;
 static char loop_name[20];
 static int loop_slave = -1;
 static int loop_master;
 static char loop_name[20];


@@ -229,13 +276,13 @@ establish_ppp(fd)
        /*
         * Find out which interface we were given.
         */
        /*
         * Find out which interface we were given.
         */

-       if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0) {    
+       if (ioctl(fd, PPPIOCGUNIT, &ifunit) < 0)

            fatal("ioctl(PPPIOCGUNIT): %m");
     } else {
        /*
         * Check that we got the same unit again.
         */
            fatal("ioctl(PPPIOCGUNIT): %m");
     } else {
        /*
         * Check that we got the same unit again.
         */

-       if (ioctl(fd, PPPIOCGUNIT, &x) < 0) { 
+       if (ioctl(fd, PPPIOCGUNIT, &x) < 0)

            fatal("ioctl(PPPIOCGUNIT): %m");
        if (x != ifunit)
            fatal("transfer_ppp failed: wanted unit %d, got %d", ifunit, x);
            fatal("ioctl(PPPIOCGUNIT): %m");
        if (x != ifunit)
            fatal("transfer_ppp failed: wanted unit %d, got %d", ifunit, x);


@@ -594,6 +641,8 @@ wait_input(timo)
 void add_fd(fd)
     int fd;
 {
 void add_fd(fd)
     int fd;
 {

+    if (fd >= FD_SETSIZE)
+       fatal("internal error: file descriptor too large (%d)", fd);

     FD_SET(fd, &in_fds);
     if (fd > max_in_fd)
        max_in_fd = fd;
     FD_SET(fd, &in_fds);
     if (fd > max_in_fd)
        max_in_fd = fd;


@@ -622,6 +671,8 @@ wait_loop_output(timo)
     int n;
 
     FD_ZERO(&ready);
     int n;
 
     FD_ZERO(&ready);

+    if (loop_master >= FD_SETSIZE)
+       fatal("internal error: file descriptor too large (%d)", loop_master);

     FD_SET(loop_master, &ready);
     n = select(loop_master + 1, &ready, NULL, &ready, timo);
     if (n < 0 && errno != EINTR)
     FD_SET(loop_master, &ready);
     n = select(loop_master + 1, &ready, NULL, &ready, timo);
     if (n < 0 && errno != EINTR)


@@ -714,6 +765,7 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
        fatal("ioctl (PPPIOCGFLAGS): %m");
     x = pcomp? x | SC_COMP_PROT: x &~ SC_COMP_PROT;
     x = accomp? x | SC_COMP_AC: x &~ SC_COMP_AC;
        fatal("ioctl (PPPIOCGFLAGS): %m");
     x = pcomp? x | SC_COMP_PROT: x &~ SC_COMP_PROT;
     x = accomp? x | SC_COMP_AC: x &~ SC_COMP_AC;

+    x = sync_serial ? x | SC_SYNC : x & ~SC_SYNC;

     if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0)
        fatal("ioctl(PPPIOCSFLAGS): %m");
 }
     if (ioctl(ppp_fd, PPPIOCSFLAGS, (caddr_t) &x) < 0)
        fatal("ioctl(PPPIOCSFLAGS): %m");
 }


@@ -835,7 +887,7 @@ get_ppp_stats(u, stats)
     struct ifpppstatsreq req;
 
     memset (&req, 0, sizeof (req));
     struct ifpppstatsreq req;
 
     memset (&req, 0, sizeof (req));

-    strlcpy(req.ifr_name, interface, sizeof(req.ifr_name));
+    strlcpy(req.ifr_name, ifname, sizeof(req.ifr_name));

     if (ioctl(sockfd, SIOCGPPPSTATS, &req) < 0) {
        error("Couldn't get PPP statistics: %m");
        return 0;
     if (ioctl(sockfd, SIOCGPPPSTATS, &req) < 0) {
        error("Couldn't get PPP statistics: %m");
        return 0;


@@ -1447,11 +1499,14 @@ get_host_seed()
     return gethostid();
 }
 
     return gethostid();
 }
 

+#if 0

 /*
  * lock - create a lock file for the named lock device
  */
 #define        LOCK_PREFIX     "/var/spool/lock/LCK.."
 
 /*
  * lock - create a lock file for the named lock device
  */
 #define        LOCK_PREFIX     "/var/spool/lock/LCK.."
 

+static char *lock_file;                /* name of lock file created */
+

 int
 lock(dev)
     char *dev;
 int
 lock(dev)
     char *dev;


@@ -1521,3 +1576,4 @@ unlock()
        lock_file = NULL;
     }
 }
        lock_file = NULL;
     }
 }

+#endif