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

[ppp.git] / pppd / ipcp.c

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index c8150a44592bff5ce38157174cbefe29f7ad44ee..d8f1933ba98ac8dd3542d819ab2016ea798570ac 100644 (file)
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.25 1996/05/28 00:40:47 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.26 1996/07/01 01:13:53 paulus Exp $";
 #endif
 
 /*
@@ -29,9 +29,13 @@ static char rcsid[] = "$Id: ipcp.c,v 1.25 1996/05/28 00:40:47 paulus Exp $";
 #include <string.h>
 #include <syslog.h>
 #include <netdb.h>
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
 
 #include "pppd.h"
 #include "fsm.h"
@@ -84,11 +88,38 @@ static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */
     "IPCP"                     /* String name of protocol */
 };
 
+/*
+ * Protocol entry points from main code.
+ */
+static void ipcp_init __P((int));
+static void ipcp_open __P((int));
+static void ipcp_close __P((int, char *));
+static void ipcp_lowerup __P((int));
+static void ipcp_lowerdown __P((int));
+static void ipcp_input __P((int, u_char *, int));
+static void ipcp_protrej __P((int));
+static int  ipcp_printpkt __P((u_char *, int,
+                              void (*) __P((void *, char *, ...)), void *));
+static void ip_check_options __P((void));
+static int  ip_demand_conf __P((int));
+static int  ip_active_pkt __P((u_char *, int));
+
 struct protent ipcp_protent = {
-    PPP_IPCP, ipcp_init, ipcp_input, ipcp_protrej,
-    ipcp_lowerup, ipcp_lowerdown, ipcp_open, ipcp_close,
-    ipcp_printpkt, NULL, 1, "IPCP",
-    ip_check_options, ip_demand_conf,
+    PPP_IPCP,
+    ipcp_init,
+    ipcp_input,
+    ipcp_protrej,
+    ipcp_lowerup,
+    ipcp_lowerdown,
+    ipcp_open,
+    ipcp_close,
+    ipcp_printpkt,
+    NULL,
+    1,
+    "IPCP",
+    ip_check_options,
+    ip_demand_conf,
+    ip_active_pkt
 };
 
 /*
@@ -128,7 +159,7 @@ u_int32_t ipaddr;
 /*
  * ipcp_init - Initialize IPCP.
  */
-void
+static void
 ipcp_init(unit)
     int unit;
 {
@@ -171,7 +202,7 @@ ipcp_init(unit)
 /*
  * ipcp_open - IPCP is allowed to come up.
  */
-void
+static void
 ipcp_open(unit)
     int unit;
 {
@@ -182,7 +213,7 @@ ipcp_open(unit)
 /*
  * ipcp_close - Take IPCP down.
  */
-void
+static void
 ipcp_close(unit, reason)
     int unit;
     char *reason;
@@ -194,7 +225,7 @@ ipcp_close(unit, reason)
 /*
  * ipcp_lowerup - The lower layer is up.
  */
-void
+static void
 ipcp_lowerup(unit)
     int unit;
 {
@@ -205,7 +236,7 @@ ipcp_lowerup(unit)
 /*
  * ipcp_lowerdown - The lower layer is down.
  */
-void
+static void
 ipcp_lowerdown(unit)
     int unit;
 {
@@ -216,7 +247,7 @@ ipcp_lowerdown(unit)
 /*
  * ipcp_input - Input IPCP packet.
  */
-void
+static void
 ipcp_input(unit, p, len)
     int unit;
     u_char *p;
@@ -231,7 +262,7 @@ ipcp_input(unit, p, len)
  *
  * Pretend the lower layer went down, so we shut up.
  */
-void
+static void
 ipcp_protrej(unit)
     int unit;
 {
@@ -1005,7 +1036,7 @@ endswitch:
  * ip_check_options - check that any IP-related options are OK,
  * and assign appropriate defaults.
  */
-void
+static void
 ip_check_options()
 {
     struct hostent *hp;
@@ -1047,7 +1078,7 @@ ip_check_options()
  * ip_demand_conf - configure the interface as though
  * IPCP were up, for use with dial-on-demand.
  */
-int
+static int
 ip_demand_conf(u)
     int u;
 {
@@ -1133,9 +1164,11 @@ ipcp_up(f)
        }
        demand_rexmit(PPP_IP);
        sifnpmode(f->unit, PPP_IP, NPMODE_PASS);
-
-    } else {
-
+    }
+#ifndef _linux_  /* Linux destroys routes when the device goes down. */
+    else         /* always use the code which adds the routes. */
+#endif
+    {
        /*
         * Set IP addresses and (if specified) netmask.
         */
@@ -1260,16 +1293,16 @@ ipcp_script(f, script)
 /*
  * ipcp_printpkt - print the contents of an IPCP packet.
  */
-char *ipcp_codenames[] = {
+static char *ipcp_codenames[] = {
     "ConfReq", "ConfAck", "ConfNak", "ConfRej",
     "TermReq", "TermAck", "CodeRej"
 };
 
-int
+static int
 ipcp_printpkt(p, plen, printer, arg)
     u_char *p;
     int plen;
-    void (*printer)();
+    void (*printer) __P((void *, char *, ...));
     void *arg;
 {
     int code, id, len, olen;
@@ -1350,6 +1383,16 @@ ipcp_printpkt(p, plen, printer, arg)
            printer(arg, ">");
        }
        break;
+
+    case TERMACK:
+    case TERMREQ:
+       if (len > 0 && *p >= ' ' && *p < 0x7f) {
+           printer(arg, " ");
+           print_string(p, len, printer, arg);
+           p += len;
+           len = 0;
+       }
+       break;
     }
 
     /* print the rest of the bytes in the packet */
@@ -1360,3 +1403,37 @@ ipcp_printpkt(p, plen, printer, arg)
 
     return p - pstart;
 }
+
+/*
+ * ip_active_pkt - see if this IP packet is worth bringing the link up for.
+ * We don't bring the link up for IP fragments or for TCP FIN packets
+ * with no data.
+ */
+#ifndef IP_OFFMASK
+#define IP_OFFMASK     0x1fff
+#endif
+
+static int
+ip_active_pkt(pkt, len)
+    u_char *pkt;
+    int len;
+{
+    struct ip *ip;
+    struct tcphdr *tcp;
+    int hlen;
+
+    if (len < sizeof(struct ip) + PPP_HDRLEN)
+       return 0;
+    ip = (struct ip *) (pkt + PPP_HDRLEN);
+    if ((ntohs(ip->ip_off) & IP_OFFMASK) != 0)
+       return 0;
+    if (ip->ip_p != IPPROTO_TCP)
+       return 1;
+    hlen = ip->ip_hl * 4;
+    if (len < hlen + sizeof(struct tcphdr) + PPP_HDRLEN)
+       return 0;
+    tcp = (struct tcphdr *) (pkt + PPP_HDRLEN + hlen);
+    if ((tcp->th_flags & TH_FIN) != 0 && hlen + tcp->th_off * 4 == len)
+       return 0;
+    return 1;
+}