fixes for mtu setting on SVR4; add filtering stuff

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

diff --git a/pppd/sys-svr4.c b/pppd/sys-svr4.c
index 258cfae7d9d6ee853b9747c8f8edadc862dc53e5..f82a2163e1d34707fe6a235f327d0d66943a1a81 100644 (file)
--- a/pppd/sys-svr4.c
+++ b/pppd/sys-svr4.c
@@ -26,14 +26,18 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: sys-svr4.c,v 1.11 1996/05/27 00:01:53 paulus Exp $";
+static char rcsid[] = "$Id: sys-svr4.c,v 1.15 1997/03/04 03:43:54 paulus Exp $";
 #endif
 
 #include <limits.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
+#if defined(SNI) || defined(__USLC__)
+extern void *alloca(size_t);
+#else
 #include <alloca.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -130,7 +134,7 @@ sys_init()
        syslog(LOG_ERR, "Can't open /dev/ppp: %m");
        die(1);
     }
-    if (kdebugflag) {
+    if (kdebugflag & 1) {
        x = PPPDBG_LOG + PPPDBG_DRIVER;
        strioctl(pppfd, PPPIO_DEBUG, &x, sizeof(int), 0);
     }
@@ -151,7 +155,7 @@ sys_init()
        syslog(LOG_ERR, "Can't open /dev/ppp (2): %m");
        die(1);
     }
-    if (kdebugflag) {
+    if (kdebugflag & 1) {
        x = PPPDBG_LOG + PPPDBG_DRIVER;
        strioctl(ifd, PPPIO_DEBUG, &x, sizeof(int), 0);
     }
@@ -200,7 +204,7 @@ sys_cleanup()
     if (if_is_up)
        sifdown(0);
     if (default_route_gateway)
-       cifdefaultroute(0, default_route_gateway);
+       cifdefaultroute(0, default_route_gateway, default_route_gateway);
     if (proxy_arp_addr)
        cifproxyarp(0, proxy_arp_addr);
 }
@@ -281,10 +285,18 @@ establish_ppp(fd)
        syslog(LOG_ERR, "Couldn't push PPP Async HDLC module: %m");
        die(1);
     }
+    if (kdebugflag & 4) {
+       i = PPPDBG_LOG + PPPDBG_AHDLC;
+       strioctl(pppfd, PPPIO_DEBUG, &i, sizeof(int), 0);
+    }
     if (ioctl(fd, I_PUSH, "ppp_comp") < 0) {
        syslog(LOG_ERR, "Couldn't push PPP compression module: %m");
 /*     die(1); */
     }
+    if (kdebugflag & 2) {
+       i = PPPDBG_LOG + PPPDBG_COMP;
+       strioctl(pppfd, PPPIO_DEBUG, &i, sizeof(int), 0);
+    }
 
     /* Link the serial port under the PPP multiplexor. */
     if ((fdmuxid = ioctl(pppfd, I_LINK, fd)) < 0) {
@@ -793,13 +805,16 @@ ppp_send_config(unit, mtu, asyncmap, pcomp, accomp)
            return;
        syslog(LOG_ERR, "Couldn't set MTU: %m");
     }
-    if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
-       syslog(LOG_ERR, "Couldn't set transmit ACCM: %m");
-    }
-    cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0);
-    cf[1] = COMP_PROT | COMP_AC;
-    if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
-       syslog(LOG_ERR, "Couldn't set prot/AC compression: %m");
+    if (fdmuxid >= 0) {
+       /* can't set these if we don't have a stream attached below /dev/ppp */
+       if (strioctl(pppfd, PPPIO_XACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
+           syslog(LOG_ERR, "Couldn't set transmit ACCM: %m");
+       }
+       cf[0] = (pcomp? COMP_PROT: 0) + (accomp? COMP_AC: 0);
+       cf[1] = COMP_PROT | COMP_AC;
+       if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
+           syslog(LOG_ERR, "Couldn't set prot/AC compression: %m");
+       }
     }
 }
 
@@ -811,7 +826,8 @@ ppp_set_xaccm(unit, accm)
     int unit;
     ext_accm accm;
 {
-    if (strioctl(pppfd, PPPIO_XACCM, accm, sizeof(ext_accm), 0) < 0) {
+    if (fdmuxid >= 0
+       && strioctl(pppfd, PPPIO_XACCM, accm, sizeof(ext_accm), 0) < 0) {
        if (!hungup || errno != ENXIO)
            syslog(LOG_WARNING, "Couldn't set extended ACCM: %m");
     }
@@ -835,13 +851,16 @@ ppp_recv_config(unit, mru, asyncmap, pcomp, accomp)
            return;
        syslog(LOG_ERR, "Couldn't set MRU: %m");
     }
-    if (strioctl(pppfd, PPPIO_RACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
-       syslog(LOG_ERR, "Couldn't set receive ACCM: %m");
-    }
-    cf[0] = (pcomp? DECOMP_PROT: 0) + (accomp? DECOMP_AC: 0);
-    cf[1] = DECOMP_PROT | DECOMP_AC;
-    if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
-       syslog(LOG_ERR, "Couldn't set prot/AC decompression: %m");
+    if (fdmuxid >= 0) {
+       /* can't set these if we don't have a stream attached below /dev/ppp */
+       if (strioctl(pppfd, PPPIO_RACCM, &asyncmap, sizeof(asyncmap), 0) < 0) {
+           syslog(LOG_ERR, "Couldn't set receive ACCM: %m");
+       }
+       cf[0] = (pcomp? DECOMP_PROT: 0) + (accomp? DECOMP_AC: 0);
+       cf[1] = DECOMP_PROT | DECOMP_AC;
+       if (strioctl(pppfd, PPPIO_CFLAGS, cf, sizeof(cf), sizeof(int)) < 0) {
+           syslog(LOG_ERR, "Couldn't set prot/AC decompression: %m");
+       }
     }
 }
 
@@ -1079,8 +1098,10 @@ cifaddr(u, o, h)
     int u;
     u_int32_t o, h;
 {
-#if 0
+#if defined(__USLC__)          /* was: #if 0 */
+    cifroute(unit, ouraddr, hisaddr);
     if (ipmuxid >= 0) {
+       syslog(LOG_NOTICE, "Removing ppp interface unit");
        if (ioctl(ipfd, I_UNLINK, ipmuxid) < 0) {
            syslog(LOG_ERR, "Can't remove ppp interface unit: %m");
            return 0;
@@ -1095,12 +1116,15 @@ cifaddr(u, o, h)
  * sifdefaultroute - assign a default route through the address given.
  */
 int
-sifdefaultroute(u, g)
+sifdefaultroute(u, l, g)
     int u;
-    u_int32_t g;
+    u_int32_t l, g;
 {
     struct rtentry rt;
 
+#if defined(__USLC__)
+    g = l;                     /* use the local address as gateway */
+#endif
     memset(&rt, 0, sizeof(rt));
     rt.rt_dst.sa_family = AF_INET;
     INET_ADDR(rt.rt_dst) = 0;
@@ -1121,12 +1145,15 @@ sifdefaultroute(u, g)
  * cifdefaultroute - delete a default route through the address given.
  */
 int
-cifdefaultroute(u, g)
+cifdefaultroute(u, l, g)
     int u;
-    u_int32_t g;
+    u_int32_t l, g;
 {
     struct rtentry rt;
 
+#if defined(__USLC__)
+    g = l;                     /* use the local address as gateway */
+#endif
     memset(&rt, 0, sizeof(rt));
     rt.rt_dst.sa_family = AF_INET;
     INET_ADDR(rt.rt_dst) = 0;
@@ -1473,9 +1500,9 @@ GetMask(addr)
 /*
  * logwtmp - write an accounting record to the /var/adm/wtmp file.
  */
-int
+void
 logwtmp(line, name, host)
-    char *line, *name, *host;
+    const char *line, *name, *host;
 {
     static struct utmpx utmpx;
 
@@ -1491,7 +1518,6 @@ logwtmp(line, name, host)
     }
     gettimeofday(&utmpx.ut_tv, NULL);
     updwtmpx("/var/adm/wtmpx", &utmpx);
-    return 0;
 }
 
 /*
@@ -1604,3 +1630,29 @@ unlock()
        lock_file[0] = 0;
     }
 }
+
+
+/*
+ * cifroute - delete a route through the addresses given.
+ */
+int
+cifroute(u, our, his)
+    int u;
+    u_int32_t our, his;
+{
+    struct rtentry rt;
+
+    memset(&rt, 0, sizeof(rt));
+    rt.rt_dst.sa_family = AF_INET;
+    INET_ADDR(rt.rt_dst) = his;
+    rt.rt_gateway.sa_family = AF_INET;
+    INET_ADDR(rt.rt_gateway) = our;
+    rt.rt_flags = RTF_HOST;
+
+    if (ioctl(ipfd, SIOCDELRT, &rt) < 0) {
+       syslog(LOG_ERR, "Can't delete route: %m");
+       return 0;
+    }
+
+    return 1;
+}