Merge in 1.3 and post 1.3 fixes; some of them might be applicable to

[ppp.git] / pppd / ipxcp.c

diff --git a/pppd/ipxcp.c b/pppd/ipxcp.c
index 9de3462f61d8e2c2ebc270000707ffa9e17481d2..dc64551d873a9044b3ec07b01175d51b39c2cfe9 100644 (file)
--- a/pppd/ipxcp.c
+++ b/pppd/ipxcp.c
@@ -19,7 +19,7 @@
 
 #ifdef IPX_CHANGE
 #ifndef lint
-static char rcsid[] = "$Id: ipxcp.c,v 1.5 1997/03/04 03:39:32 paulus Exp $";
+static char rcsid[] = "$Id: ipxcp.c,v 1.7 1998/05/13 05:49:18 paulus Exp $";
 #endif
 
 /*
@@ -29,6 +29,7 @@ static char rcsid[] = "$Id: ipxcp.c,v 1.5 1997/03/04 03:39:32 paulus Exp $";
 #include <stdio.h>
 #include <string.h>
 #include <syslog.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -37,6 +38,7 @@ static char rcsid[] = "$Id: ipxcp.c,v 1.5 1997/03/04 03:39:32 paulus Exp $";
 #include "fsm.h"
 #include "ipxcp.h"
 #include "pathnames.h"
+#include "magic.h"
 
 /* global vars */
 ipxcp_options ipxcp_wantoptions[NUM_PPP];      /* Options that we want to request */
@@ -163,7 +165,7 @@ ipx_ntoa(ipxaddr)
 u_int32_t ipxaddr;
 {
     static char b[64];
-    sprintf(b, "%lx", ipxaddr);
+    sprintf(b, "%x", ipxaddr);
     return b;
 }
 
@@ -336,9 +338,6 @@ static void
 ipxcp_resetci(f)
     fsm *f;
 {
-    u_int32_t network;
-    int unit = f->unit;
-
     wo->req_node = wo->neg_node && ao->neg_node;
     wo->req_nn  = wo->neg_nn   && ao->neg_nn;
 
@@ -387,7 +386,6 @@ static int
 ipxcp_cilen(f)
     fsm *f;
 {
-    int unit = f->unit;
     int len;
 
     len         = go->neg_nn       ? CILEN_NETN     : 0;
@@ -411,8 +409,6 @@ ipxcp_addci(f, ucp, lenp)
     u_char *ucp;
     int *lenp;
 {
-    int len = *lenp;
-    int unit = f->unit;
 /*
  * Add the options to the record.
  */
@@ -462,7 +458,6 @@ ipxcp_ackci(f, p, len)
     u_char *p;
     int len;
 {
-    int unit = f->unit;
     u_short cilen, citype, cishort;
     u_char cichar;
     u_int32_t cilong;
@@ -571,7 +566,6 @@ ipxcp_nakci(f, p, len)
     u_char *p;
     int len;
 {
-    int unit = f->unit;
     u_char citype, cilen, *next;
     u_short s;
     u_int32_t l;
@@ -690,7 +684,6 @@ ipxcp_rejci(f, p, len)
     u_char *p;
     int len;
 {
-    int unit = f->unit;
     u_short cilen, citype, cishort;
     u_char cichar;
     u_int32_t cilong;
@@ -807,17 +800,15 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
     int *len;                  /* Length of requested CIs */
     int reject_if_disagree;
 {
-    int unit = f->unit;
     u_char *cip, *next;                /* Pointer to current and next CIs */
     u_short cilen, citype;     /* Parsed len, type */
-    u_short cishort, ts;       /* Parsed short value */
-    u_int32_t tl, cinetwork, outnet;/* Parsed address values */
+    u_short cishort;           /* Parsed short value */
+    u_int32_t cinetwork;       /* 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 */
     u_char *ucp = inp;         /* Pointer to current output char */
     int l = *len;              /* Length left */
-    u_char maxslotindex, cflag;
 
     /*
      * Reset all his options.
@@ -1094,7 +1085,6 @@ endswitch:
 
     if (rc != CONFREJ && !ho->neg_node &&
        wo->req_nn && !reject_if_disagree) {
-       u_char *ps;
        if (rc == CONFACK) {
            rc = CONFNAK;
            wo->req_nn = 0;             /* don't ask again */
@@ -1197,8 +1187,6 @@ static void
 ipxcp_down(f)
     fsm *f;
 {
-    u_int32_t ournn, network;
-
     IPXCPDEBUG((LOG_INFO, "ipxcp: down"));
 
     cipxfaddr (f->unit);
@@ -1216,7 +1204,6 @@ ipxcp_script(f, script)
     fsm *f;
     char *script;
 {
-    int         unit = f->unit;
     char strspeed[32],  strlocal[32],     strremote[32];
     char strnetwork[32], strpid[32];
     char *argv[14],     strproto_lcl[32], strproto_rmt[32];