X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipcp.c;h=334d8922a2e6046e147b151bfd563d66438bdc05;hp=94929cc6a8b38d47845cbea8510abe1f951fe47e;hb=af60ef5263008c980a3077203e09a54a0fa8003c;hpb=f42b7328c73feeedf045f02e02e2c7e86cccbd15

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 94929cc..334d892 100644
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.4 1994/04/11 07:19:06 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.10 1994/09/01 00:22:38 paulus Exp $";
 #endif
 
 /*
@@ -26,18 +26,10 @@ static char rcsid[] = "$Id: ipcp.c,v 1.4 1994/04/11 07:19:06 paulus Exp $";
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <syslog.h>
-#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/time.h>
-
-#include <net/if.h>
-#include <net/if_ppp.h>
-#include <net/route.h>
-#include <netinet/in.h>
-
-#include <string.h>
 
 #include "pppd.h"
 #include "ppp.h"
@@ -51,10 +43,6 @@ ipcp_options ipcp_gotoptions[NPPP];	/* Options that peer ack'd */
 ipcp_options ipcp_allowoptions[NPPP];	/* Options we allow peer to request */
 ipcp_options ipcp_hisoptions[NPPP];	/* Options that we ack'd */
 
-extern char ifname[];
-extern char devname[];
-extern int baud_rate;
-
 /* local vars */
 static int cis_received[NPPP];		/* # Conf-Reqs received */
 
@@ -111,7 +99,7 @@ static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */
  */
 char *
 ip_ntoa(ipaddr)
-u_long ipaddr;
+uint32 ipaddr;
 {
     static char b[64];
 
@@ -304,7 +292,7 @@ ipcp_addci(f, ucp, lenp)
     if (neg) { \
 	int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \
 	if (len >= addrlen) { \
-	    u_long l; \
+	    uint32 l; \
 	    PUTCHAR(opt, ucp); \
 	    PUTCHAR(addrlen, ucp); \
 	    l = ntohl(val1); \
@@ -367,7 +355,7 @@ ipcp_ackci(f, p, len)
 {
     ipcp_options *go = &ipcp_gotoptions[f->unit];
     u_short cilen, citype, cishort;
-    u_long cilong;
+    uint32 cilong;
     u_char cimaxslotindex, cicflag;
 
     /*
@@ -402,7 +390,7 @@ ipcp_ackci(f, p, len)
 #define ACKCIADDR(opt, neg, old, val1, val2) \
     if (neg) { \
 	int addrlen = (old? CILEN_ADDRS: CILEN_ADDR); \
-	u_long l; \
+	uint32 l; \
 	if ((len -= addrlen) < 0) \
 	    goto bad; \
 	GETCHAR(citype, p); \
@@ -459,7 +447,7 @@ ipcp_nakci(f, p, len)
     u_char cimaxslotindex, cicflag;
     u_char citype, cilen, *next;
     u_short cishort;
-    u_long ciaddr1, ciaddr2, l;
+    uint32 ciaddr1, ciaddr2, l;
     ipcp_options no;		/* options we've seen Naks for */
     ipcp_options try;		/* options to request next time */
 
@@ -498,10 +486,6 @@ ipcp_nakci(f, p, len)
 	len -= cilen; \
 	INCPTR(2, p); \
 	GETSHORT(cishort, p); \
-	if (cilen == CILEN_VJ) { \
-	    GETCHAR(cimaxslotindex, p); \
-            GETCHAR(cicflag, p); \
-        } \
 	no.neg = 1; \
         code \
     }
@@ -531,6 +515,8 @@ ipcp_nakci(f, p, len)
      */
     NAKCIVJ(CI_COMPRESSTYPE, neg_vj,
 	    if (cilen == CILEN_VJ) {
+		GETCHAR(cimaxslotindex, p);
+		GETCHAR(cicflag, p);
 		if (cishort == IPCP_VJ_COMP) {
 		    try.old_vj = 0;
 		    if (cimaxslotindex < go->maxslotindex)
@@ -633,7 +619,7 @@ ipcp_rejci(f, p, len)
     ipcp_options *go = &ipcp_gotoptions[f->unit];
     u_char cimaxslotindex, ciflag, cilen;
     u_short cishort;
-    u_long cilong;
+    uint32 cilong;
     ipcp_options try;		/* options to request next time */
 
     try = *go;
@@ -647,7 +633,7 @@ ipcp_rejci(f, p, len)
 	len >= (cilen = old? CILEN_ADDRS: CILEN_ADDR) && \
 	p[1] == cilen && \
 	p[0] == opt) { \
-	u_long l; \
+	uint32 l; \
 	len -= cilen; \
 	INCPTR(2, p); \
 	GETLONG(l, p); \
@@ -732,7 +718,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
     u_char *cip, *next;		/* Pointer to current and next CIs */
     u_short cilen, citype;	/* Parsed len, type */
     u_short cishort;		/* Parsed short value */
-    u_long tl, ciaddr1, ciaddr2;/* Parsed address values */
+    uint32 tl, ciaddr1, ciaddr2;/* Parsed address values */
     int rc = CONFACK;		/* Final packet return code */
     int orc;			/* Individual option return code */
     u_char *p;			/* Pointer to next char to parse */
@@ -970,7 +956,7 @@ static void
 ipcp_up(f)
     fsm *f;
 {
-    u_long mask;
+    uint32 mask;
     ipcp_options *ho = &ipcp_hisoptions[f->unit];
     ipcp_options *go = &ipcp_gotoptions[f->unit];
 
@@ -1057,7 +1043,7 @@ static void
 ipcp_down(f)
     fsm *f;
 {
-    u_long ouraddr, hisaddr;
+    uint32 ouraddr, hisaddr;
 
     IPCPDEBUG((LOG_INFO, "ipcp: down"));
 
@@ -1093,7 +1079,7 @@ ipcp_script(f, script)
 
     argv[0] = script;
     argv[1] = ifname;
-    argv[2] = devname;
+    argv[2] = devnam;
     argv[3] = strspeed;
     argv[4] = strlocal;
     argv[5] = strremote;
@@ -1119,7 +1105,7 @@ ipcp_printpkt(p, plen, printer, arg)
     int code, id, len, olen;
     u_char *pstart, *optend;
     u_short cishort;
-    u_long cilong;
+    uint32 cilong;
 
     if (plen < HEADERLEN)
 	return 0;
@@ -1157,9 +1143,9 @@ ipcp_printpkt(p, plen, printer, arg)
 		if (olen == CILEN_ADDRS) {
 		    p += 2;
 		    GETLONG(cilong, p);
-		    printer(arg, "addrs %s", ip_ntoa(cilong));
+		    printer(arg, "addrs %s", ip_ntoa(htonl(cilong)));
 		    GETLONG(cilong, p);
-		    printer(arg, " %s", ip_ntoa(cilong));
+		    printer(arg, " %s", ip_ntoa(htonl(cilong)));
 		}
 		break;
 	    case CI_COMPRESSTYPE:
@@ -1183,7 +1169,7 @@ ipcp_printpkt(p, plen, printer, arg)
 		if (olen == CILEN_ADDR) {
 		    p += 2;
 		    GETLONG(cilong, p);
-		    printer(arg, "addr %s", ip_ntoa(cilong));
+		    printer(arg, "addr %s", ip_ntoa(htonl(cilong)));
 		}
 		break;
 	    }