X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fsys-bsd.c;h=708b9b03cd0964d34c9dcae1d4278097cf7bead5;hp=f07a3b7351b7fa8462f8d2700d3c77ff4018b56d;hb=306cd74939c466d0ecdd9fe3fb18d83bbd8b0fc8;hpb=31e531a04e1f20c89aef30b0744bed4eb0c1806a

diff --git a/pppd/sys-bsd.c b/pppd/sys-bsd.c
index f07a3b7..708b9b0 100644
--- a/pppd/sys-bsd.c
+++ b/pppd/sys-bsd.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-bsd.c,v 1.9 1994/08/22 00:41:00 paulus Exp $";
+static char rcsid[] = "$Id: sys-bsd.c,v 1.15 1994/10/23 11:45:47 paulus Exp $";
 #endif
 
 /*
@@ -27,6 +27,8 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.9 1994/08/22 00:41:00 paulus Exp $";
  */
 
 #include <syslog.h>
+#include <string.h>
+#include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -34,6 +36,7 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.9 1994/08/22 00:41:00 paulus Exp $";
 #include <sys/errno.h>
 
 #include <net/if.h>
+#include <net/ppp_defs.h>
 #include <net/if_ppp.h>
 #include <net/route.h>
 #include <net/if_dl.h>
@@ -44,12 +47,59 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.9 1994/08/22 00:41:00 paulus Exp $";
 #endif
 
 #include "pppd.h"
-#include "ppp.h"
 
-static int initdisc = -1;		/* Initial TTY discipline */
-extern int kdebugflag;
+static int initdisc = -1;	/* Initial TTY discipline */
 static int rtm_seq;
 
+static int	restore_term;	/* 1 => we've munged the terminal */
+static struct termios inittermios; /* Initial TTY termios */
+
+/*
+ * sys_init - System-dependent initialization.
+ */
+void
+sys_init()
+{
+    openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
+    setlogmask(LOG_UPTO(LOG_INFO));
+    if (debug)
+	setlogmask(LOG_UPTO(LOG_DEBUG));
+}
+
+/*
+ * note_debug_level - note a change in the debug level.
+ */
+void
+note_debug_level()
+{
+    if (debug) {
+	syslog(LOG_INFO, "Debug turned ON, Level %d", debug);
+	setlogmask(LOG_UPTO(LOG_DEBUG));
+    } else {
+	setlogmask(LOG_UPTO(LOG_WARNING));
+    }
+}
+
+/*
+ * ppp_available - check whether the system has any ppp interfaces
+ * (in fact we check whether we can do an ioctl on ppp0).
+ */
+int
+ppp_available()
+{
+    int s, ok;
+    struct ifreq ifr;
+
+    if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+	return 1;		/* can't tell - maybe we're not root */
+
+    strncpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name));
+    ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0;
+    close(s);
+
+    return ok;
+}
+
 /*
  * establish_ppp - Turn the serial port into a ppp interface.
  */
@@ -132,6 +182,99 @@ disestablish_ppp()
 }
 
 
+/*
+ * set_up_tty: Set up the serial port on `fd' for 8 bits, no parity,
+ * at the requested speed, etc.  If `local' is true, set CLOCAL
+ * regardless of whether the modem option was specified.
+ *
+ * For *BSD, we assume that speed_t values numerically equal bits/second.
+ */
+set_up_tty(fd, local)
+    int fd, local;
+{
+    struct termios tios;
+
+    if (tcgetattr(fd, &tios) < 0) {
+	syslog(LOG_ERR, "tcgetattr: %m");
+	die(1);
+    }
+
+    if (!restore_term)
+	inittermios = tios;
+
+    tios.c_cflag &= ~(CSIZE | CSTOPB | PARENB | CLOCAL);
+    if (crtscts > 0)
+	tios.c_cflag |= CRTSCTS;
+    else if (crtscts < 0)
+	tios.c_cflag &= ~CRTSCTS;
+
+    tios.c_cflag |= CS8 | CREAD | HUPCL;
+    if (local || !modem)
+	tios.c_cflag |= CLOCAL;
+    tios.c_iflag = IGNBRK | IGNPAR;
+    tios.c_oflag = 0;
+    tios.c_lflag = 0;
+    tios.c_cc[VMIN] = 1;
+    tios.c_cc[VTIME] = 0;
+
+    if (crtscts == 2) {
+	tios.c_iflag |= IXOFF;
+	tios.c_cc[VSTOP] = 0x13;	/* DC3 = XOFF = ^S */
+	tios.c_cc[VSTART] = 0x11;	/* DC1 = XON  = ^Q */
+    }
+
+    if (inspeed) {
+	cfsetospeed(&tios, inspeed);
+	cfsetispeed(&tios, inspeed);
+    } else {
+	inspeed = cfgetospeed(&tios);
+	/*
+	 * We can't proceed if the serial port speed is 0,
+	 * since that implies that the serial port is disabled.
+	 */
+	if (inspeed == 0) {
+	    syslog(LOG_ERR, "Baud rate for %s is 0; need explicit baud rate",
+		   devnam);
+	    die(1);
+	}
+    }
+    baud_rate = inspeed;
+
+    if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) {
+	syslog(LOG_ERR, "tcsetattr: %m");
+	die(1);
+    }
+
+    restore_term = 1;
+}
+
+/*
+ * restore_tty - restore the terminal to the saved settings.
+ */
+void
+restore_tty()
+{
+    if (restore_term) {
+	if (tcsetattr(fd, TCSAFLUSH, &inittermios) < 0)
+	    if (errno != ENXIO)
+		syslog(LOG_WARNING, "tcsetattr: %m");
+	restore_term = 0;
+    }
+}
+
+/*
+ * setdtr - control the DTR line on the serial port.
+ * This is called from die(), so it shouldn't call die().
+ */
+setdtr(fd, on)
+int fd, on;
+{
+    int modembits = TIOCM_DTR;
+
+    ioctl(fd, (on? TIOCMBIS: TIOCMBIC), &modembits);
+}
+
+
 /*
  * output - Output PPP packet.
  */
@@ -183,9 +326,9 @@ read_packet(buf)
 {
     int len;
 
-    if ((len = read(fd, buf, MTU + DLLHEADERLEN)) < 0) {
-	if (errno == EWOULDBLOCK) {
-	    MAINDEBUG((LOG_DEBUG, "read(fd): EWOULDBLOCK"));
+    if ((len = read(fd, buf, PPP_MTU + PPP_HDRLEN)) < 0) {
+	if (errno == EWOULDBLOCK || errno == EINTR) {
+	    MAINDEBUG((LOG_DEBUG, "read(fd): %m"));
 	    return -1;
 	}
 	syslog(LOG_ERR, "read(fd): %m");
@@ -202,7 +345,7 @@ read_packet(buf)
 void
 ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
     int unit, mtu;
-    u_long asyncmap;
+    u_int32_t asyncmap;
     int pcomp, accomp;
 {
     u_int x;
@@ -253,7 +396,7 @@ ppp_set_xaccm(unit, accm)
 void
 ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
     int unit, mru;
-    u_long asyncmap;
+    u_int32_t asyncmap;
     int pcomp, accomp;
 {
     int x;
@@ -285,7 +428,7 @@ ccp_test(unit, opt_ptr, opt_len, for_transmit)
     int unit, opt_len, for_transmit;
     u_char *opt_ptr;
 {
-    struct ppp_comp_data data;
+    struct ppp_option_data data;
 
     data.ptr = opt_ptr;
     data.length = opt_len;
@@ -312,6 +455,24 @@ ccp_flags_set(unit, isopen, isup)
 	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
 }
 
+/*
+ * ccp_fatal_error - returns 1 if decompression was disabled as a
+ * result of an error detected after decompression of a packet,
+ * 0 otherwise.  This is necessary because of patent nonsense.
+ */
+int
+ccp_fatal_error(unit)
+    int unit;
+{
+    int x;
+
+    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
+	syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m");
+	return 0;
+    }
+    return x & SC_DC_FERROR;
+}
+
 /*
  * sifvjcomp - config tcp header compression
  */
@@ -341,12 +502,17 @@ sifvjcomp(u, vjcomp, cidcomp, maxcid)
 /*
  * sifup - Config the interface up and enable IP packets to pass.
  */
+#ifndef SC_ENABLE_IP
+#define SC_ENABLE_IP	0x100	/* compat for old versions of kernel code */
+#endif
+
 int
 sifup(u)
     int u;
 {
     struct ifreq ifr;
     u_int x;
+    struct npioctl npi;
 
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
@@ -358,14 +524,23 @@ sifup(u)
 	syslog(LOG_ERR, "ioctl(SIOCSIFFLAGS): %m");
 	return 0;
     }
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	return 0;
-    }
-    x |= SC_ENABLE_IP;
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
-	return 0;
+    npi.protocol = PPP_IP;
+    npi.mode = NPMODE_PASS;
+    if (ioctl(fd, PPPIOCSNPMODE, &npi) < 0) {
+	if (errno != ENOTTY) {
+	    syslog(LOG_ERR, "ioctl(PPPIOCSNPMODE): %m");
+	    return 0;
+	}
+	/* for backwards compatibility */
+	if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
+	    syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
+	    return 0;
+	}
+	x |= SC_ENABLE_IP;
+	if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
+	    syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
+	    return 0;
+	}
     }
     return 1;
 }
@@ -380,18 +555,30 @@ sifdown(u)
     struct ifreq ifr;
     u_int x;
     int rv;
+    struct npioctl npi;
 
     rv = 1;
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
-	syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
-	rv = 0;
-    } else {
-	x &= ~SC_ENABLE_IP;
-	if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
-	    syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
+    npi.protocol = PPP_IP;
+    npi.mode = NPMODE_ERROR;
+    if (ioctl(fd, PPPIOCSNPMODE, (caddr_t) &npi) < 0) {
+	if (errno != ENOTTY) {
+	    syslog(LOG_ERR, "ioctl(PPPIOCSNPMODE): %m");
 	    rv = 0;
+	} else {
+	    /* backwards compatibility */
+	    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) < 0) {
+		syslog(LOG_ERR, "ioctl (PPPIOCGFLAGS): %m");
+		rv = 0;
+	    } else {
+		x &= ~SC_ENABLE_IP;
+		if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &x) < 0) {
+		    syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
+		    rv = 0;
+		}
+	    }
 	}
     }
+
     strncpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
     if (ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) < 0) {
 	syslog(LOG_ERR, "ioctl (SIOCGIFFLAGS): %m");
@@ -421,7 +608,7 @@ sifdown(u)
 int
 sifaddr(u, o, h, m)
     int u;
-    u_long o, h, m;
+    u_int32_t o, h, m;
 {
     struct ifaliasreq ifra;
 
@@ -452,7 +639,7 @@ sifaddr(u, o, h, m)
 int
 cifaddr(u, o, h)
     int u;
-    u_long o, h;
+    u_int32_t o, h;
 {
     struct ifaliasreq ifra;
 
@@ -475,7 +662,7 @@ cifaddr(u, o, h)
 int
 sifdefaultroute(u, g)
     int u;
-    u_long g;
+    u_int32_t g;
 {
     return dodefaultroute(g, 's');
 }
@@ -486,7 +673,7 @@ sifdefaultroute(u, g)
 int
 cifdefaultroute(u, g)
     int u;
-    u_long g;
+    u_int32_t g;
 {
     return dodefaultroute(g, 'c');
 }
@@ -496,7 +683,7 @@ cifdefaultroute(u, g)
  */
 int
 dodefaultroute(g, cmd)
-    u_long g;
+    u_int32_t g;
     int cmd;
 {
     int routes;
@@ -554,7 +741,7 @@ static int arpmsg_valid;
 int
 sifproxyarp(unit, hisaddr)
     int unit;
-    u_long hisaddr;
+    u_int32_t hisaddr;
 {
     int routes;
     int l;
@@ -604,7 +791,7 @@ sifproxyarp(unit, hisaddr)
 int
 cifproxyarp(unit, hisaddr)
     int unit;
-    u_long hisaddr;
+    u_int32_t hisaddr;
 {
     int routes;
 
@@ -638,7 +825,7 @@ cifproxyarp(unit, hisaddr)
 int
 sifproxyarp(unit, hisaddr)
     int unit;
-    u_long hisaddr;
+    u_int32_t hisaddr;
 {
     struct arpreq arpreq;
     struct {
@@ -677,7 +864,7 @@ sifproxyarp(unit, hisaddr)
 int
 cifproxyarp(unit, hisaddr)
     int unit;
-    u_long hisaddr;
+    u_int32_t hisaddr;
 {
     struct arpreq arpreq;
 
@@ -701,11 +888,11 @@ cifproxyarp(unit, hisaddr)
 
 int
 get_ether_addr(ipaddr, hwaddr)
-    u_long ipaddr;
+    u_int32_t ipaddr;
     struct sockaddr_dl *hwaddr;
 {
     struct ifreq *ifr, *ifend, *ifp;
-    u_long ina, mask;
+    u_int32_t ina, mask;
     struct sockaddr_dl *dla;
     struct ifreq ifreq;
     struct ifconf ifc;
@@ -723,7 +910,8 @@ get_ether_addr(ipaddr, hwaddr)
      * address on the same subnet as `ipaddr'.
      */
     ifend = (struct ifreq *) (ifc.ifc_buf + ifc.ifc_len);
-    for (ifr = ifc.ifc_req; ifr < ifend; ) {
+    for (ifr = ifc.ifc_req; ifr < ifend; ifr = (struct ifreq *)
+	 	((char *)&ifr->ifr_addr + ifr->ifr_addr.sa_len)) {
 	if (ifr->ifr_addr.sa_family == AF_INET) {
 	    ina = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr;
 	    strncpy(ifreq.ifr_name, ifr->ifr_name, sizeof(ifreq.ifr_name));
@@ -748,7 +936,6 @@ get_ether_addr(ipaddr, hwaddr)
 
 	    break;
 	}
-	ifr = (struct ifreq *) ((char *)&ifr->ifr_addr + ifr->ifr_addr.sa_len);
     }
 
     if (ifr >= ifend)
@@ -775,24 +962,3 @@ get_ether_addr(ipaddr, hwaddr)
 
     return 0;
 }
-
-
-/*
- * ppp_available - check whether the system has any ppp interfaces
- * (in fact we check whether we can do an ioctl on ppp0).
- */
-int
-ppp_available()
-{
-    int s, ok;
-    struct ifreq ifr;
-
-    if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-	return 1;		/* can't tell - maybe we're not root */
-
-    strncpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name));
-    ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0;
-    close(s);
-
-    return ok;
-}