X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipcp.c;h=8e20c525e8379753c8d5116b8075b7617f5f616c;hb=0f2a00893e822ae0b55a6355b1efef6c41d97e6e;hp=94929cc6a8b38d47845cbea8510abe1f951fe47e;hpb=f42b7328c73feeedf045f02e02e2c7e86cccbd15;p=ppp.git

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 94929cc..8e20c52 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.9 1994/08/22 00:36: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"
@@ -52,7 +44,7 @@ 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 char devnam[];
 extern int baud_rate;
 
 /* local vars */
@@ -498,10 +490,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 +519,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)
@@ -1093,7 +1083,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;
@@ -1157,9 +1147,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 +1173,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;
 	    }