summaryrefslogtreecommitdiffstats
path: root/c/src/libnetworking/pppd/ipxcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/libnetworking/pppd/ipxcp.c')
-rw-r--r--c/src/libnetworking/pppd/ipxcp.c298
1 files changed, 174 insertions, 124 deletions
diff --git a/c/src/libnetworking/pppd/ipxcp.c b/c/src/libnetworking/pppd/ipxcp.c
index d55ace569e..4e408a00f9 100644
--- a/c/src/libnetworking/pppd/ipxcp.c
+++ b/c/src/libnetworking/pppd/ipxcp.c
@@ -18,9 +18,8 @@
*/
#ifdef IPX_CHANGE
-#ifndef lint
-/* static char rcsid[] = "$Id$"; */
-#endif
+
+#define RCSID "$Id$"
/*
* TODO:
@@ -28,7 +27,8 @@
#include <stdio.h>
#include <string.h>
-#include <syslog.h>
+#include <unistd.h>
+#include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -37,6 +37,9 @@
#include "fsm.h"
#include "ipxcp.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 */
@@ -61,7 +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 void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */
+static void ipxcp_finished __P((fsm *)); /* Don't need lower layer */
fsm ipxcp_fsm[NUM_PPP]; /* IPXCP fsm structure */
@@ -76,7 +79,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 */
- 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 */
@@ -84,6 +87,50 @@ static fsm_callbacks ipxcp_callbacks = { /* IPXCP callback routines */
};
/*
+ * Command-line options.
+ */
+static int setipxnode __P((char **));
+static int setipxname __P((char **));
+
+static option_t ipxcp_option_list[] = {
+ { "ipx", o_bool, &ipxcp_protent.enabled_flag,
+ "Enable IPXCP (and IPX)", 1 },
+ { "+ipx", o_bool, &ipxcp_protent.enabled_flag,
+ "Enable IPXCP (and IPX)", 1 },
+ { "noipx", o_bool, &ipxcp_protent.enabled_flag,
+ "Disable IPXCP (and IPX)" },
+ { "-ipx", o_bool, &ipxcp_protent.enabled_flag,
+ "Disable IPXCP (and IPX)" } ,
+ { "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,
+ &ipxcp_allowoptions[0].accept_network },
+ { "ipx-node", o_special, setipxnode,
+ "Set IPX node number" },
+ { "ipxcp-accept-local", o_bool, &ipxcp_wantoptions[0].accept_local,
+ "Accept our IPX address", 1,
+ &ipxcp_allowoptions[0].accept_local },
+ { "ipxcp-accept-remote", o_bool, &ipxcp_wantoptions[0].accept_remote,
+ "Accept peer's IPX address", 1,
+ &ipxcp_allowoptions[0].accept_remote },
+ { "ipx-routing", o_int, &ipxcp_wantoptions[0].router,
+ "Set IPX routing proto number", 0,
+ &ipxcp_wantoptions[0].neg_router },
+ { "ipx-router-name", o_special, setipxname,
+ "Set IPX router name" },
+ { "ipxcp-restart", o_int, &ipxcp_fsm[0].timeouttime,
+ "Set timeout for IPXCP" },
+ { "ipxcp-max-terminate", o_int, &ipxcp_fsm[0].maxtermtransmits,
+ "Set max #xmits for IPXCP term-reqs" },
+ { "ipxcp-max-configure", o_int, &ipxcp_fsm[0].maxconfreqtransmits,
+ "Set max #xmits for IPXCP conf-reqs" },
+ { "ipxcp-max-failure", o_int, &ipxcp_fsm[0].maxnakloops,
+ "Set max #conf-naks for IPXCP" },
+ { NULL }
+};
+
+/*
* Protocol entry points.
*/
@@ -110,6 +157,8 @@ struct protent ipxcp_protent = {
NULL,
0,
"IPXCP",
+ "IPX",
+ ipxcp_option_list,
NULL,
NULL,
NULL
@@ -130,6 +179,10 @@ struct protent ipxcp_protent = {
#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]
@@ -146,7 +199,7 @@ short int internal;
{
short int external;
- if (internal & IPX_NONE)
+ if (internal & BIT(IPX_NONE) )
external = IPX_NONE;
else
external = RIP_SAP;
@@ -158,16 +211,97 @@ short int internal;
* Make a string representation of a network IP address.
*/
-char *
+static char *
ipx_ntoa(ipxaddr)
u_int32_t ipxaddr;
{
static char b[64];
- sprintf(b, "%x", ipxaddr);
+ slprintf(b, sizeof(b), "%x", ipxaddr);
return b;
}
+static u_char *
+setipxnodevalue(src,dst)
+u_char *src, *dst;
+{
+ int indx;
+ int item;
+
+ for (;;) {
+ if (!isxdigit (*src))
+ break;
+
+ for (indx = 0; indx < 5; ++indx) {
+ dst[indx] <<= 4;
+ dst[indx] |= (dst[indx + 1] >> 4) & 0x0F;
+ }
+
+ item = toupper (*src) - '0';
+ if (item > 9)
+ item -= 7;
+
+ dst[5] = (dst[5] << 4) | item;
+ ++src;
+ }
+ return src;
+}
+
+static int
+setipxnode(argv)
+ char **argv;
+{
+ char *end;
+
+ memset (&ipxcp_wantoptions[0].our_node[0], 0, 6);
+ memset (&ipxcp_wantoptions[0].his_node[0], 0, 6);
+
+ end = setipxnodevalue (*argv, &ipxcp_wantoptions[0].our_node[0]);
+ if (*end == ':')
+ end = setipxnodevalue (++end, &ipxcp_wantoptions[0].his_node[0]);
+
+ if (*end == '\0') {
+ ipxcp_wantoptions[0].neg_node = 1;
+ return 1;
+ }
+
+ option_error("invalid parameter '%s' for ipx-node option", *argv);
+ return 0;
+}
+
+static int
+setipxname (argv)
+ char **argv;
+{
+ char *dest = ipxcp_wantoptions[0].name;
+ char *src = *argv;
+ int count;
+ char ch;
+
+ ipxcp_wantoptions[0].neg_name = 1;
+ ipxcp_allowoptions[0].neg_name = 1;
+ memset (dest, '\0', sizeof (ipxcp_wantoptions[0].name));
+
+ count = 0;
+ while (*src) {
+ ch = *src++;
+ if (! isalnum (ch) && ch != '_') {
+ option_error("IPX router name must be alphanumeric or _");
+ return 0;
+ }
+
+ if (count >= sizeof (ipxcp_wantoptions[0].name)) {
+ option_error("IPX router name is limited to %d characters",
+ sizeof (ipxcp_wantoptions[0].name) - 1);
+ return 0;
+ }
+
+ dest[count++] = toupper (ch);
+ }
+
+ return 1;
+}
+
/*
* ipxcp_init - Initialize IPXCP.
*/
@@ -532,9 +666,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);
- 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.
*/
@@ -544,7 +677,7 @@ ipxcp_ackci(f, p, len)
/*
* The frame is invalid
*/
- IPXCPDEBUG((LOG_INFO, "ipxcp_ackci: received bad Ack!"));
+ IPXCPDEBUG(("ipxcp_ackci: received bad Ack!"));
return (0);
}
@@ -588,7 +721,6 @@ ipxcp_nakci(f, p, len)
no.neg_nn = 1;
GETLONG(l, p);
- IPXCPDEBUG((LOG_INFO, "local IP address %d", l));
if (l && ao->accept_network)
try.our_network = l;
break;
@@ -598,10 +730,6 @@ ipxcp_nakci(f, p, len)
goto bad;
no.neg_node = 1;
- IPXCPDEBUG((LOG_INFO,
- "local node number %02X%02X%02X%02X%02X%02X",
- NODE(p)));
-
if (!zero_node (p) && ao->accept_local &&
! compare_node (p, ho->his_node))
copy_node (p, try.our_node);
@@ -629,8 +757,6 @@ ipxcp_nakci(f, p, len)
no.router |= s;
try.router |= s;
try.neg_router = 1;
-
- IPXCPDEBUG((LOG_INFO, "Router protocol number %d", s));
break;
/* These, according to the RFC, must never be NAKed. */
@@ -645,10 +771,6 @@ ipxcp_nakci(f, p, len)
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".
@@ -662,6 +784,7 @@ ipxcp_nakci(f, p, len)
/*
* 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;
@@ -669,7 +792,7 @@ ipxcp_nakci(f, p, len)
return 1;
bad:
- IPXCPDEBUG((LOG_INFO, "ipxcp_nakci: received bad Nak!"));
+ IPXCPDEBUG(("ipxcp_nakci: received bad Nak!"));
return 0;
}
@@ -699,7 +822,6 @@ ipxcp_rejci(f, p, len)
GETLONG(cilong, p); \
if (cilong != val) \
break; \
- IPXCPDEBUG((LOG_INFO,"ipxcp_rejci rejected long opt %d", opt)); \
neg = 0; \
}
@@ -721,14 +843,13 @@ ipxcp_rejci(f, p, len)
}\
if (indx != count) \
break; \
- IPXCPDEBUG((LOG_INFO,"ipxcp_rejci rejected opt %d", opt)); \
neg = 0; \
}
#define REJCINODE(opt,neg,val) REJCICHARS(opt,neg,val,sizeof(val))
#define REJCINAME(opt,neg,val) REJCICHARS(opt,neg,val,strlen(val))
-#define REJCIVOID(gpt, neg) \
+#define REJCIVOID(opt, neg) \
if (neg && p[0] == opt) { \
if ((len -= CILEN_VOID) < 0) \
break; \
@@ -736,7 +857,6 @@ ipxcp_rejci(f, p, len)
GETCHAR(cilen, p); \
if (cilen != CILEN_VOID || citype != opt) \
break; \
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci rejected void opt %d", opt)); \
neg = 0; \
}
@@ -753,7 +873,6 @@ ipxcp_rejci(f, p, len)
GETSHORT(cishort, p); \
if (cishort != to_external (val) || cishort == RIP_SAP) \
break; \
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci short opt %d", opt)); \
neg = 0; \
}
/*
@@ -780,7 +899,7 @@ ipxcp_rejci(f, p, len)
/*
* The frame is invalid at this point.
*/
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci: received bad Reject!"));
+ IPXCPDEBUG(("ipxcp_rejci: received bad Reject!"));
return 0;
}
@@ -823,7 +942,7 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
if (l < 2 || /* Not enough data for CI header or */
p[1] < 2 || /* CI length too small or */
p[1] > l) { /* CI length too big? */
- IPXCPDEBUG((LOG_INFO, "ipxcp_reqci: bad CI length!"));
+ IPXCPDEBUG(("ipxcp_reqci: bad CI length!"));
orc = CONFREJ; /* Reject bad CI */
cilen = l; /* Reject till end of packet */
l = 0; /* Don't loop again */
@@ -839,8 +958,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
* The network number must match. Choose the larger of the two.
*/
case IPX_NETWORK_NUMBER:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Network Number request"));
-
/* if we wont negotiate the network number or the length is wrong
then reject the option */
if ( !ao->neg_nn || cilen != CILEN_NETN ) {
@@ -848,7 +965,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
break;
}
GETLONG(cinetwork, p);
- IPXCPDEBUG((LOG_INFO,"Remote proposed IPX network number is %8Lx",tl));
/* If the network numbers match then acknowledge them. */
if (cinetwork != 0) {
@@ -885,8 +1001,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
* The node number is required
*/
case IPX_NODE_NUMBER:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Node Number request"));
-
/* if we wont negotiate the node number or the length is wrong
then reject the option */
if ( cilen != CILEN_NODEN ) {
@@ -944,7 +1058,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
* Compression is not desired at this time. It is always rejected.
*/
case IPX_COMPRESSION_PROTOCOL:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Compression Protocol request "));
orc = CONFREJ;
break;
/*
@@ -959,9 +1072,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
}
GETSHORT (cishort, p);
- IPXCPDEBUG((LOG_INFO,
- "Remote router protocol number 0x%04x",
- cishort));
if (wo->neg_router == 0) {
wo->neg_router = 1;
@@ -1006,7 +1116,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
* The router name is advisorary. Just accept it if it is not too large.
*/
case IPX_ROUTER_NAME:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Router Name request"));
if (cilen >= CILEN_NAME) {
int name_size = cilen - CILEN_NAME;
if (name_size > sizeof (ho->name))
@@ -1024,7 +1133,6 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
* This is advisorary.
*/
case IPX_COMPLETE:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Complete request"));
if (cilen != CILEN_COMPLETE)
orc = CONFREJ;
else {
@@ -1036,14 +1144,10 @@ ipxcp_reqci(f, inp, len, reject_if_disagree)
* All other entries are not known at this time.
*/
default:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Complete request"));
orc = CONFREJ;
break;
}
-
endswitch:
- IPXCPDEBUG((LOG_INFO, " (%s)\n", CODENAME(orc)));
-
if (orc == CONFACK && /* Good CI */
rc != CONFACK) /* but prior CI wasnt? */
continue; /* Don't send this one */
@@ -1099,7 +1203,7 @@ endswitch:
}
*len = ucp - inp; /* Compute output length */
- IPXCPDEBUG((LOG_INFO, "ipxcp: returning Configure-%s", CODENAME(rc)));
+ IPXCPDEBUG(("ipxcp: returning Configure-%s", CODENAME(rc)));
return (rc); /* Return final code */
}
@@ -1115,7 +1219,7 @@ ipxcp_up(f)
{
int unit = f->unit;
- IPXCPDEBUG((LOG_INFO, "ipxcp: up"));
+ IPXCPDEBUG(("ipxcp: up"));
/* The default router protocol is RIP/SAP. */
if (ho->router == 0)
@@ -1136,7 +1240,8 @@ ipxcp_up(f)
if (zero_node (go->our_node)) {
static char errmsg[] = "Could not determine local IPX node address";
- IPXCPDEBUG((LOG_ERR, errmsg));
+ if (debug)
+ error(errmsg);
ipxcp_close(f->unit, errmsg);
return;
}
@@ -1147,31 +1252,30 @@ ipxcp_up(f)
if (go->network == 0) {
static char errmsg[] = "Can not determine network number";
- IPXCPDEBUG((LOG_ERR, errmsg));
+ if (debug)
+ error(errmsg);
ipxcp_close (unit, errmsg);
return;
}
/* bring the interface up */
if (!sifup(unit)) {
- IPXCPDEBUG((LOG_WARNING, "sifup failed"));
+ if (debug)
+ warn("sifup failed (IPX)");
ipxcp_close(unit, "Interface configuration failed");
return;
}
+ ipxcp_is_up = 1;
/* set the network number for IPX */
if (!sipxfaddr(unit, go->network, go->our_node)) {
- IPXCPDEBUG((LOG_WARNING, "sipxfaddr failed"));
+ if (debug)
+ warn("sipxfaddr failed");
ipxcp_close(unit, "Interface configuration failed");
return;
}
- /*
- * Execute the ipx-up script, like this:
- * /etc/ppp/ipx-up interface tty speed local-IPX remote-IPX
- */
-
- ipxcp_script (f, _PATH_IPXUP);
+ np_up(f->unit, PPP_IPX);
}
/*
@@ -1185,83 +1289,29 @@ static void
ipxcp_down(f)
fsm *f;
{
- IPXCPDEBUG((LOG_INFO, "ipxcp: down"));
+ IPXCPDEBUG(("ipxcp: down"));
- cipxfaddr (f->unit);
+ if (!ipxcp_is_up)
+ return;
+ ipxcp_is_up = 0;
+ np_down(f->unit, PPP_IPX);
+ cipxfaddr(f->unit);
+ sifnpmode(f->unit, PPP_IPX, NPMODE_DROP);
sifdown(f->unit);
- ipxcp_script (f, _PATH_IPXDOWN);
}
/*
- * ipxcp_script - Execute a script with arguments
- * interface-name tty-name speed local-IPX remote-IPX networks.
+ * ipxcp_finished - possibly shut down the lower layers.
*/
static void
-ipxcp_script(f, script)
+ipxcp_finished(f)
fsm *f;
- char *script;
{
- char strspeed[32], strlocal[32], strremote[32];
- char strnetwork[32], strpid[32];
- char *argv[14], strproto_lcl[32], strproto_rmt[32];
-
- sprintf (strpid, "%d", getpid());
- sprintf (strspeed, "%d", baud_rate);
-
- strproto_lcl[0] = '\0';
- if (go->neg_router && ((go->router & BIT(IPX_NONE)) == 0)) {
- if (go->router & BIT(RIP_SAP))
- strcpy (strproto_lcl, "RIP ");
- if (go->router & BIT(NLSP))
- strcat (strproto_lcl, "NLSP ");
- }
-
- if (strproto_lcl[0] == '\0')
- strcpy (strproto_lcl, "NONE ");
-
- 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))
- strcpy (strproto_rmt, "RIP ");
- if (ho->router & BIT(NLSP))
- strcat (strproto_rmt, "NLSP ");
- }
-
- if (strproto_rmt[0] == '\0')
- strcpy (strproto_rmt, "NONE ");
-
- strproto_rmt[strlen (strproto_rmt)-1] = '\0';
-
- strcpy (strnetwork, ipx_ntoa (go->network));
-
- sprintf (strlocal,
- "%02X%02X%02X%02X%02X%02X",
- NODE(go->our_node));
-
- sprintf (strremote,
- "%02X%02X%02X%02X%02X%02X",
- NODE(ho->his_node));
-
- argv[0] = script;
- argv[1] = ifname;
- argv[2] = devnam;
- argv[3] = strspeed;
- argv[4] = strnetwork;
- argv[5] = strlocal;
- argv[6] = strremote;
- argv[7] = strproto_lcl;
- argv[8] = strproto_rmt;
- argv[9] = go->name;
- argv[10] = ho->name;
- argv[11] = ipparam;
- argv[12] = strpid;
- argv[13] = NULL;
- run_program(script, argv, 0);
+ np_finished(f->unit, PPP_IPX);
}
+
/*
* ipxcp_printpkt - print the contents of an IPXCP packet.
*/