moved protos here from ipcp.h; print reason on terminate-request;

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

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index 5c3132979f397f8cf4ba851e05b69b5b4358fc78..f790b8cdbe089698e11112e1ca59b66b3fd04b32 100644 (file)
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -66,6 +66,7 @@ static struct termios inittermios;    /* Initial TTY termios */
 static int sockfd;             /* socket for doing interface ioctls */
 
 static int     if_is_up;       /* Interface has been marked up */
+static u_int32_t ipaddrs[2];   /* Local and remote addrs we've set */
 static u_int32_t default_route_gateway;        /* Gateway for default route added */
 static u_int32_t proxy_arp_addr;       /* Addr for proxy arp entry added */
 
@@ -115,7 +116,7 @@ static int get_flags (void)
   {    
     int flags;
 
-    if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &flags) < 0)
+    if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &flags) < 0)
       {
        syslog(LOG_ERR, "ioctl(PPPIOCGFLAGS): %m");
        quit();
@@ -129,7 +130,7 @@ static void set_flags (int flags)
   {    
     MAINDEBUG ((LOG_DEBUG, "set flags = %x\n", flags));
 
-    if (ioctl(fd, PPPIOCSFLAGS, (caddr_t) &flags) < 0)
+    if (ioctl(ttyfd, PPPIOCSFLAGS, (caddr_t) &flags) < 0)
       {
        syslog(LOG_ERR, "ioctl(PPPIOCSFLAGS, %x): %m", flags);
        quit();
@@ -142,13 +143,6 @@ static void set_flags (int flags)
 
 void sys_init(void)
   {
-    openlog("pppd", LOG_PID | LOG_NDELAY, LOG_PPP);
-    setlogmask(LOG_UPTO(LOG_INFO));
-    if (debug)
-      {
-       setlogmask(LOG_UPTO(LOG_DEBUG));
-      }
-    
     /* Get an internet socket for doing socket ioctls. */
     sockfd = socket(AF_INET, SOCK_DGRAM, 0);
     if (sockfd < 0)
@@ -169,6 +163,8 @@ void sys_cleanup()
 
     if (if_is_up)
        sifdown(0);
+    if (ipaddrs[0])
+       cifaddr(0, ipaddrs[0], ipaddrs[1]);
     /* XXX maybe we need to delete the route through the interface */
     if (has_default_route)
        cifdefaultroute(0, default_route_gateway);
@@ -176,30 +172,13 @@ void sys_cleanup()
        cifproxyarp(0, proxy_arp_addr);
 }
 
-/*
- * note_debug_level - note a change in the debug level.
- */
-
-void note_debug_level (void)
-  {
-    if (debug)
-      {
-       MAINDEBUG ((LOG_INFO, "Debug turned ON, Level %d", debug));
-       setlogmask(LOG_UPTO(LOG_DEBUG));
-      }
-    else
-      {
-       setlogmask(LOG_UPTO(LOG_WARNING));
-      }
-  }
-
 /*
  * set_kdebugflag - Define the debugging level for the kernel
  */
 
 int set_kdebugflag (int requested_level)
   {
-    if (ioctl(fd, PPPIOCGDEBUG, &prev_kdebugflag) < 0)
+    if (ioctl(ttyfd, PPPIOCGDEBUG, &prev_kdebugflag) < 0)
       {
        syslog(LOG_ERR, "ioctl(PPPIOCGDEBUG): %m");
        return (0);
@@ -207,7 +186,7 @@ int set_kdebugflag (int requested_level)
     
     if (prev_kdebugflag != requested_level)
       {
-       if (ioctl(fd, PPPIOCSDEBUG, &requested_level) < 0)
+       if (ioctl(ttyfd, PPPIOCSDEBUG, &requested_level) < 0)
          {
            syslog (LOG_ERR, "ioctl(PPPIOCSDEBUG): %m");
            return (0);
@@ -222,7 +201,7 @@ int set_kdebugflag (int requested_level)
  * establish_ppp - Turn the serial port into a ppp interface.
  */
 
-void establish_ppp (void)
+void establish_ppp (int fd)
   {
     int pppdisc = N_PPP;
     int sig    = SIGIO;
@@ -273,7 +252,7 @@ void establish_ppp (void)
  * This shouldn't call die() because it's called from die().
  */
 
-void disestablish_ppp(void)
+void disestablish_ppp(int fd)
   {
     int x;
     char *s;
@@ -283,13 +262,32 @@ void disestablish_ppp(void)
        syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
     initfdflags = -1;
 
+    if (still_ppp() && initdisc >= 0)
+      {
+       set_kdebugflag (prev_kdebugflag);
+       
+       if (ioctl(fd, TIOCSETD, &initdisc) < 0)
+         {
+           syslog(LOG_WARNING, "ioctl(TIOCSETD): %m");
+         }
+       
+       if (ioctl(fd, TIOCNXCL, 0) < 0)
+         {
+           syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
+         }
+      }
+    initdisc = -1;
+  }
+
 /*
- * Fetch the flags for the device and generate appropriate error
- * messages.
+ * clean_check - Fetch the flags for the device and generate
+ * appropriate error messages.
  */
+void clean_check(void)
+  {
     if (still_ppp() && initdisc >= 0)
       {
-       if (ioctl(fd, PPPIOCGFLAGS, (caddr_t) &x) == 0)
+       if (ioctl(ttyfd, PPPIOCGFLAGS, (caddr_t) &x) == 0)
          {
            s = NULL;
            switch (~x & (SC_RCV_B7_0|SC_RCV_B7_1|SC_RCV_EVNP|SC_RCV_ODDP))
@@ -328,21 +326,9 @@ void disestablish_ppp(void)
                syslog(LOG_WARNING, "Problem: %s", s);
              }
          }
-       
-       set_kdebugflag (prev_kdebugflag);
-       
-       if (ioctl(fd, TIOCSETD, &initdisc) < 0)
-         {
-           syslog(LOG_WARNING, "ioctl(TIOCSETD): %m");
-         }
-       
-       if (ioctl(fd, TIOCNXCL, 0) < 0)
-         {
-           syslog (LOG_WARNING, "ioctl(TIOCNXCL): %m");
-         }
       }
-    initdisc = -1;
   }
+       
 
 /*
  * List of valid speeds.
@@ -566,7 +552,7 @@ void setdtr (int fd, int on)
  * restore_tty - restore the terminal to the saved settings.
  */
 
-void restore_tty (void)
+void restore_tty (int fd)
   {
     if (restore_term)
       {
@@ -603,7 +589,7 @@ void output (int unit, unsigned char *p, int len)
         log_packet(p, len, "sent ");
       }
     
-    if (write(fd, p, len) < 0)
+    if (write(ttyfd, p, len) < 0)
       {
        if (errno == EWOULDBLOCK || errno == ENOBUFS
            || errno == ENXIO || errno == EIO)
@@ -619,7 +605,7 @@ void output (int unit, unsigned char *p, int len)
   }
 
 /*
- * wait_input - wait until there is data available on fd,
+ * wait_input - wait until there is data available on ttyfd,
  * for the length of time specified by *timo (indefinite
  * if timo is NULL).
  */
@@ -630,9 +616,9 @@ void wait_input (struct timeval *timo)
     int n;
     
     FD_ZERO(&ready);
-    FD_SET(fd, &ready);
+    FD_SET(ttyfd, &ready);
 
-    n = select(fd+1, &ready, NULL, &ready, timo);
+    n = select(ttyfd+1, &ready, NULL, &ready, timo);
     if (n < 0 && errno != EINTR)
       {
        syslog(LOG_ERR, "select: %m");
@@ -648,14 +634,14 @@ int read_packet (unsigned char *buf)
   {
     int len;
   
-    len = read(fd, buf, PPP_MTU + PPP_HDRLEN);
+    len = read(ttyfd, buf, PPP_MTU + PPP_HDRLEN);
     if (len < 0)
       {
        if (errno == EWOULDBLOCK)
          {
            return -1;
          }
-       syslog(LOG_ERR, "read(fd): %m");
+       syslog(LOG_ERR, "read: %m");
        die(1);
       }
     return len;
@@ -691,7 +677,7 @@ void ppp_send_config (int unit,int mtu,u_int32_t asyncmap,int pcomp,int accomp)
          }
        
        MAINDEBUG ((LOG_DEBUG, "send_config: asyncmap = %lx\n", asyncmap));
-       if (ioctl(fd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0)
+       if (ioctl(ttyfd, PPPIOCSASYNCMAP, (caddr_t) &asyncmap) < 0)
          {
            syslog(LOG_ERR, "ioctl(PPPIOCSASYNCMAP): %m");
            quit();
@@ -713,7 +699,7 @@ void ppp_set_xaccm (int unit, ext_accm accm)
     MAINDEBUG ((LOG_DEBUG, "set_xaccm: %08lx %08lx %08lx %08lx\n",
                accm[0], accm[1], accm[2], accm[3]));
 
-    if (ioctl(fd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
+    if (ioctl(ttyfd, PPPIOCSXASYNCMAP, accm) < 0 && errno != ENOTTY)
       {
        syslog(LOG_WARNING, "ioctl(set extended ACCM): %m");
       }
@@ -740,13 +726,13 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp)
 /*
  * Set the receiver parameters
  */
-    if (ioctl(fd, PPPIOCSMRU, (caddr_t) &mru) < 0)
+    if (ioctl(ttyfd, PPPIOCSMRU, (caddr_t) &mru) < 0)
       {
        syslog(LOG_ERR, "ioctl(PPPIOCSMRU): %m");
       }
 
     MAINDEBUG ((LOG_DEBUG, "recv_config: asyncmap = %lx\n", asyncmap));
-    if (ioctl(fd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0)
+    if (ioctl(ttyfd, PPPIOCSRASYNCMAP, (caddr_t) &asyncmap) < 0)
       {
         syslog(LOG_ERR, "ioctl(PPPIOCSRASYNCMAP): %m");
        quit();
@@ -771,7 +757,7 @@ int ccp_test (int unit, u_char *opt_ptr, int opt_len, int for_transmit)
     data.length   = opt_len;
     data.transmit = for_transmit;
 
-    if (ioctl(fd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
+    if (ioctl(ttyfd, PPPIOCSCOMPRESS, (caddr_t) &data) >= 0)
       {
        return 1;
       }
@@ -817,7 +803,7 @@ int sifvjcomp (int u, int vjcomp, int cidcomp, int maxcid)
 
     if (vjcomp)
       {
-        if (ioctl (fd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0)
+        if (ioctl (ttyfd, PPPIOCSMAXCID, (caddr_t) &maxcid) < 0)
          {
            syslog (LOG_ERR, "ioctl(PPPIOCSFLAGS): %m");
            vjcomp = 0;
@@ -954,6 +940,9 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
         syslog (LOG_ERR, "ioctl(SIOCADDRT) device route: %m");
         return (0);
       }
+
+    ipaddrs[0] = our_adr;
+    ipaddrs[1] = his_adr;
     return 1;
   }
 
@@ -965,6 +954,8 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
 int cifaddr (int unit, int our_adr, int his_adr)
   {
     struct rtentry rt;
+
+    ipaddrs[0] = 0;
 /*
  *  Delete the route through the device
  */