typo

[ppp.git] / pppd / ipxcp.c

diff --git a/pppd/ipxcp.c b/pppd/ipxcp.c
index 47d7af7f633f8cfa303959a0701d500c8aadf294..937dea1095cc55dac734b8173b0cf0e3546b78dd 100644 (file)
--- a/pppd/ipxcp.c
+++ b/pppd/ipxcp.c
@@ -18,9 +18,8 @@
  */
 
 #ifdef IPX_CHANGE
  */
 
 #ifdef IPX_CHANGE

-#ifndef lint
-static char rcsid[] = "$Id: ipxcp.c,v 1.10 1999/03/16 03:15:15 paulus Exp $";
-#endif
+
+#define RCSID  "$Id: ipxcp.c,v 1.17 1999/08/13 06:46:14 paulus Exp $"

 
 /*
  * TODO:
 
 /*
  * TODO:


@@ -40,6 +39,8 @@ static char rcsid[] = "$Id: ipxcp.c,v 1.10 1999/03/16 03:15:15 paulus Exp $";
 #include "pathnames.h"
 #include "magic.h"
 
 #include "pathnames.h"
 #include "magic.h"
 

+static const char rcsid[] = RCSID;
+

 /* global vars */
 ipxcp_options ipxcp_wantoptions[NUM_PPP];      /* Options that we want to request */
 ipxcp_options ipxcp_gotoptions[NUM_PPP];       /* Options that peer ack'd */
 /* global vars */
 ipxcp_options ipxcp_wantoptions[NUM_PPP];      /* Options that we want to request */
 ipxcp_options ipxcp_gotoptions[NUM_PPP];       /* Options that peer ack'd */


@@ -63,6 +64,7 @@ static int  ipxcp_rejci __P((fsm *, u_char *, int));  /* Peer rej'd our CI */
 static int  ipxcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
 static void ipxcp_up __P((fsm *));             /* We're UP */
 static void ipxcp_down __P((fsm *));           /* We're DOWN */
 static int  ipxcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */
 static void ipxcp_up __P((fsm *));             /* We're UP */
 static void ipxcp_down __P((fsm *));           /* We're DOWN */

+static void ipxcp_finished __P((fsm *));       /* Don't need lower layer */

 static void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */
 
 fsm ipxcp_fsm[NUM_PPP];                /* IPXCP fsm structure */
 static void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */
 
 fsm ipxcp_fsm[NUM_PPP];                /* IPXCP fsm structure */


@@ -78,7 +80,7 @@ static fsm_callbacks ipxcp_callbacks = { /* IPXCP callback routines */
     ipxcp_up,                  /* Called when fsm reaches OPENED state */
     ipxcp_down,                        /* Called when fsm leaves OPENED state */
     NULL,                      /* Called when we want the lower layer up */
     ipxcp_up,                  /* Called when fsm reaches OPENED state */
     ipxcp_down,                        /* Called when fsm leaves OPENED state */
     NULL,                      /* Called when we want the lower layer up */

-    NULL,                      /* Called when we want the lower layer down */
+    ipxcp_finished,            /* Called when we want the lower layer down */

     NULL,                      /* Called when Protocol-Reject received */
     NULL,                      /* Retransmission is necessary */
     NULL,                      /* Called to handle protocol-specific codes */
     NULL,                      /* Called when Protocol-Reject received */
     NULL,                      /* Retransmission is necessary */
     NULL,                      /* Called to handle protocol-specific codes */


@@ -100,7 +102,7 @@ static option_t ipxcp_option_list[] = {
       "Disable IPXCP (and IPX)" },
     { "-ipx", o_bool, &ipxcp_protent.enabled_flag,
       "Disable IPXCP (and IPX)" } ,
       "Disable IPXCP (and IPX)" },
     { "-ipx", o_bool, &ipxcp_protent.enabled_flag,
       "Disable IPXCP (and IPX)" } ,

-    { "ipx-network", o_int, &ipxcp_wantoptions[0].our_network,
+    { "ipx-network", o_uint32, &ipxcp_wantoptions[0].our_network,

       "Set our IPX network number", 0, &ipxcp_wantoptions[0].neg_nn },
     { "ipxcp-accept-network", o_bool, &ipxcp_wantoptions[0].accept_network,
       "Accept peer IPX network number", 1,
       "Set our IPX network number", 0, &ipxcp_wantoptions[0].neg_nn },
     { "ipxcp-accept-network", o_bool, &ipxcp_wantoptions[0].accept_network,
       "Accept peer IPX network number", 1,


@@ -156,6 +158,7 @@ struct protent ipxcp_protent = {
     NULL,
     0,
     "IPXCP",
     NULL,
     0,
     "IPXCP",

+    "IPX",

     ipxcp_option_list,
     NULL,
     NULL,
     ipxcp_option_list,
     NULL,
     NULL,


@@ -177,6 +180,10 @@ struct protent ipxcp_protent = {
 #define CODENAME(x)    ((x) == CONFACK ? "ACK" : \
                         (x) == CONFNAK ? "NAK" : "REJ")
 
 #define CODENAME(x)    ((x) == CONFACK ? "ACK" : \
                         (x) == CONFNAK ? "NAK" : "REJ")
 

+static int ipxcp_is_up;
+
+static char *ipx_ntoa __P((u_int32_t));
+

 /* Used in printing the node number */
 #define NODE(base) base[0], base[1], base[2], base[3], base[4], base[5]
 
 /* Used in printing the node number */
 #define NODE(base) base[0], base[1], base[2], base[3], base[4], base[5]
 


@@ -193,7 +200,7 @@ short int internal;
 {
     short int  external;
 
 {
     short int  external;
 

-    if (internal & IPX_NONE)
+    if (internal & BIT(IPX_NONE) )

         external = IPX_NONE;
     else
         external = RIP_SAP;
         external = IPX_NONE;
     else
         external = RIP_SAP;


@@ -205,7 +212,7 @@ short int internal;
  * Make a string representation of a network IP address.
  */
 
  * Make a string representation of a network IP address.
  */
 

-char *
+static char *

 ipx_ntoa(ipxaddr)
 u_int32_t ipxaddr;
 {
 ipx_ntoa(ipxaddr)
 u_int32_t ipxaddr;
 {


@@ -660,9 +667,8 @@ ipxcp_ackci(f, p, len)
        ACKCINETWORK  (IPX_NETWORK_NUMBER,  go->neg_nn,     go->our_network);
        ACKCINODE     (IPX_NODE_NUMBER,     go->neg_node,   go->our_node);
        ACKCINAME     (IPX_ROUTER_NAME,     go->neg_name,   go->name);
        ACKCINETWORK  (IPX_NETWORK_NUMBER,  go->neg_nn,     go->our_network);
        ACKCINODE     (IPX_NODE_NUMBER,     go->neg_node,   go->our_node);
        ACKCINAME     (IPX_ROUTER_NAME,     go->neg_name,   go->name);

-       ACKCIPROTO    (IPX_ROUTER_PROTOCOL, go->neg_router, go->router);
-       ACKCIPROTO    (IPX_ROUTER_PROTOCOL, go->neg_router, go->router);
-       ACKCIPROTO    (IPX_ROUTER_PROTOCOL, go->neg_router, go->router);
+       if (len > 0)
+               ACKCIPROTO    (IPX_ROUTER_PROTOCOL, go->neg_router, go->router);

 /*
  * This is the end of the record.
  */
 /*
  * This is the end of the record.
  */


@@ -766,10 +772,6 @@ ipxcp_nakci(f, p, len)
        p = next;
     }
 
        p = next;
     }
 

-    /* If there is still anything left, this packet is bad. */
-    if (len != 0)
-       goto bad;
-

     /*
      * Do not permit the peer to force a router protocol which we do not
      * support. However, default to the condition that will accept "NONE".
     /*
      * Do not permit the peer to force a router protocol which we do not
      * support. However, default to the condition that will accept "NONE".


@@ -783,6 +785,7 @@ ipxcp_nakci(f, p, len)
     
     /*
      * OK, the Nak is good.  Now we can update state.
     
     /*
      * OK, the Nak is good.  Now we can update state.

+     * If there are any options left, we ignore them.

      */
     if (f->state != OPENED)
        *go = try;
      */
     if (f->state != OPENED)
        *go = try;


@@ -1272,6 +1275,9 @@ ipxcp_up(f)
        return;
     }
 
        return;
     }
 

+    ipxcp_is_up = 1;
+    np_up(f->unit, PPP_IPX);
+

     /*
      * Execute the ipx-up script, like this:
      * /etc/ppp/ipx-up interface tty speed local-IPX remote-IPX
     /*
      * Execute the ipx-up script, like this:
      * /etc/ppp/ipx-up interface tty speed local-IPX remote-IPX


@@ -1293,12 +1299,27 @@ ipxcp_down(f)
 {
     IPXCPDEBUG(("ipxcp: down"));
 
 {
     IPXCPDEBUG(("ipxcp: down"));
 

+    if (ipxcp_is_up) {
+       ipxcp_is_up = 0;
+       np_down(f->unit, PPP_IPX);
+    }

     cipxfaddr (f->unit);
     sifdown(f->unit);
     ipxcp_script (f, _PATH_IPXDOWN);
 }
 
 
     cipxfaddr (f->unit);
     sifdown(f->unit);
     ipxcp_script (f, _PATH_IPXDOWN);
 }
 
 

+/*
+ * ipxcp_finished - possibly shut down the lower layers.
+ */
+static void
+ipxcp_finished(f)
+    fsm *f;
+{
+    np_finished(f->unit, PPP_IPX);
+}
+
+

 /*
  * ipxcp_script - Execute a script with arguments
  * interface-name tty-name speed local-IPX remote-IPX networks.
 /*
  * ipxcp_script - Execute a script with arguments
  * interface-name tty-name speed local-IPX remote-IPX networks.


@@ -1318,38 +1339,34 @@ ipxcp_script(f, script)
     strproto_lcl[0] = '\0';
     if (go->neg_router && ((go->router & BIT(IPX_NONE)) == 0)) {
        if (go->router & BIT(RIP_SAP))
     strproto_lcl[0] = '\0';
     if (go->neg_router && ((go->router & BIT(IPX_NONE)) == 0)) {
        if (go->router & BIT(RIP_SAP))

-           strlcpy (strproto_lcl, sizeof(strproto_lcl), "RIP ");
+           strlcpy (strproto_lcl, "RIP ", sizeof(strproto_lcl));

        if (go->router & BIT(NLSP))
        if (go->router & BIT(NLSP))

-           strlcat (strproto_lcl, sizeof(strproto_lcl), "NLSP ");
+           strlcat (strproto_lcl, "NLSP ", sizeof(strproto_lcl));

     }
 
     if (strproto_lcl[0] == '\0')
     }
 
     if (strproto_lcl[0] == '\0')

-       strlcpy (strproto_lcl, sizeof(strproto_lcl), "NONE ");
+       strlcpy (strproto_lcl, "NONE ", sizeof(strproto_lcl));

 
     strproto_lcl[strlen (strproto_lcl)-1] = '\0';
 
     strproto_rmt[0] = '\0';
     if (ho->neg_router && ((ho->router & BIT(IPX_NONE)) == 0)) {
        if (ho->router & BIT(RIP_SAP))
 
     strproto_lcl[strlen (strproto_lcl)-1] = '\0';
 
     strproto_rmt[0] = '\0';
     if (ho->neg_router && ((ho->router & BIT(IPX_NONE)) == 0)) {
        if (ho->router & BIT(RIP_SAP))

-           strlcpy (strproto_rmt, sizeof(strproto_rmt), "RIP ");
+           strlcpy (strproto_rmt, "RIP ", sizeof(strproto_rmt));

        if (ho->router & BIT(NLSP))
        if (ho->router & BIT(NLSP))

-           strlcat (strproto_rmt, sizeof(strproto_rmt), "NLSP ");
+           strlcat (strproto_rmt, "NLSP ", sizeof(strproto_rmt));

     }
 
     if (strproto_rmt[0] == '\0')
     }
 
     if (strproto_rmt[0] == '\0')

-       strlcpy (strproto_rmt, sizeof(strproto_rmt), "NONE ");
+       strlcpy (strproto_rmt, "NONE ", sizeof(strproto_rmt));

 
     strproto_rmt[strlen (strproto_rmt)-1] = '\0';
 
 
     strproto_rmt[strlen (strproto_rmt)-1] = '\0';
 

-    strlcpy (strnetwork, sizeof(strnetwork), ipx_ntoa (go->network));
+    strlcpy (strnetwork, ipx_ntoa (go->network), sizeof(strnetwork));

 
 

-    slprintf (strlocal, sizeof(strlocal),
-             "%02X%02X%02X%02X%02X%02X",
-             NODE(go->our_node));
+    slprintf (strlocal, sizeof(strlocal), "%0.6B", go->our_node);

 
 

-    slprintf (strremote, sizeof(strremote),
-             "%02X%02X%02X%02X%02X%02X",
-             NODE(ho->his_node));
+    slprintf (strremote, sizeof(strremote), "%0.6B", ho->his_node);

 
     argv[0]  = script;
     argv[1]  = ifname;
 
     argv[0]  = script;
     argv[1]  = ifname;