#ifdef IPX_CHANGE
#ifndef lint
-static char rcsid[] = "$Id: ipxcp.c,v 1.3 1996/09/14 05:15:20 paulus Exp $";
+static char rcsid[] = "$Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
#endif
/*
NULL
};
-
/*
* Lengths of configuration options.
*/
/* Used to generate the proper bit mask */
#define BIT(num) (1 << (num))
+/*
+ * Convert from internal to external notation
+ */
+
+static short int
+to_external(internal)
+short int internal;
+{
+ short int external;
+
+ if (internal & IPX_NONE)
+ external = IPX_NONE;
+ else
+ external = RIP_SAP;
+
+ return external;
+}
+
/*
* Make a string representation of a network IP address.
*/
u_int32_t ipxaddr;
{
static char b[64];
- sprintf(b, "%lx", ipxaddr);
+ sprintf(b, "%x", ipxaddr);
return b;
}
ao->accept_local = 0;
ao->accept_remote = 0;
ao->accept_network = 0;
+
+ wo->tried_rip = 0;
+ wo->tried_nlsp = 0;
}
/*
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;
ao->accept_remote = 1;
}
/*
- * Unless router protocol is suppressed then assume that we can do RIP.
- */
- if (! (wo->router & BIT(0)))
- wo->router |= BIT(2);
-/*
- * Router protocol is only negotiated if requested. Others force the
- * negotiation.
+ * If no routing agent was specified then we do RIP/SAP according to the
+ * RFC documents. If you have specified something then OK. Otherwise, we
+ * do RIP/SAP.
*/
- if (wo->router & (BIT(2) | BIT(4)))
- wo->neg_router = 1;
+ if (ao->router == 0) {
+ ao->router |= BIT(RIP_SAP);
+ wo->router |= BIT(RIP_SAP);
+ }
+
+ /* Always specify a routing protocol unless it was REJected. */
+ wo->neg_router = 1;
/*
* Start with these default values
*/
/*
* ipxcp_cilen - Return length of our CI.
*/
+
static int
ipxcp_cilen(f)
fsm *f;
{
- int unit = f->unit;
int len;
len = go->neg_nn ? CILEN_NETN : 0;
len += go->neg_node ? CILEN_NODEN : 0;
len += go->neg_name ? CILEN_NAME + strlen (go->name) - 1 : 0;
- len += go->neg_complete ? CILEN_COMPLETE : 0;
-/*
- * Router protocol 0 is mutually exclusive with the others.
- */
- if (go->neg_router) {
- if (go->router & BIT(0))
- len += CILEN_PROTOCOL;
- else {
- if (go->router & BIT(2))
- len += CILEN_PROTOCOL;
- if (go->router & BIT(4))
- len += CILEN_PROTOCOL;
- }
- }
+
+ /* RFC says that defaults should not be included. */
+ if (go->neg_router && to_external(go->router) != RIP_SAP)
+ len += CILEN_PROTOCOL;
return (len);
}
u_char *ucp;
int *lenp;
{
- int len = *lenp;
- int unit = f->unit;
/*
* Add the options to the record.
*/
PUTCHAR (go->name [indx], ucp);
}
- if (go->neg_router && (go->router & (BIT(0) | BIT(2) | BIT(4)))) {
- if (go->router & BIT(0)) {
+ if (go->neg_router) {
+ short external = to_external (go->router);
+ if (external != RIP_SAP) {
PUTCHAR (IPX_ROUTER_PROTOCOL, ucp);
- PUTCHAR (CILEN_PROTOCOL, ucp);
- PUTSHORT (0, ucp);
- } else {
- if (go->router & BIT(2)) {
- PUTCHAR (IPX_ROUTER_PROTOCOL, ucp);
- PUTCHAR (CILEN_PROTOCOL, ucp);
- PUTSHORT (2, ucp);
- }
-
- if (go->router & BIT(4)) {
- PUTCHAR (IPX_ROUTER_PROTOCOL, ucp);
- PUTCHAR (CILEN_PROTOCOL, ucp);
- PUTSHORT (4, ucp);
- }
+ PUTCHAR (CILEN_PROTOCOL, ucp);
+ PUTSHORT (external, ucp);
}
}
-
- if (go->neg_complete) {
- PUTCHAR (IPX_COMPLETE, ucp);
- PUTCHAR (CILEN_COMPLETE, ucp);
- }
}
/*
u_char *p;
int len;
{
- int unit = f->unit;
u_short cilen, citype, cishort;
u_char cichar;
u_int32_t cilong;
break; \
}
-#define ACKCIPROTO(opt, neg, val, bit) \
- if (neg && (val & BIT(bit))) \
- { \
+#define ACKCIPROTO(opt, neg, val) \
+ if (neg) { \
if (len < 2) \
break; \
GETCHAR(citype, p); \
if (len < 0) \
break; \
GETSHORT(cishort, p); \
- if (cishort != (bit)) \
+ if (cishort != to_external (val) || cishort == RIP_SAP) \
break; \
}
/*
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, 0);
- ACKCIPROTO (IPX_ROUTER_PROTOCOL, go->neg_router, go->router, 2);
- ACKCIPROTO (IPX_ROUTER_PROTOCOL, go->neg_router, go->router, 4);
- ACKCICOMPLETE (IPX_COMPLETE, go->neg_complete);
+ 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);
/*
* This is the end of the record.
*/
u_char *p;
int len;
{
- int unit = f->unit;
u_char citype, cilen, *next;
u_short s;
u_int32_t l;
copy_node (p, try.our_node);
break;
- /* These have never been sent. Ignore the NAK frame */
+ /* This has never been sent. Ignore the NAK frame */
case IPX_COMPRESSION_PROTOCOL:
goto bad;
goto bad;
GETSHORT (s, p);
- if ((s != 0) && (s != 2) && (s != 4))
- goto bad;
+ if (s > 15) /* This is just bad, but ignore for now. */
+ break;
- if (no.router & BIT(s))
+ s = BIT(s);
+ if (no.router & s) /* duplicate NAKs are always bad */
goto bad;
if (no.router == 0) /* Reset on first NAK only */
try.router = 0;
- no.router |= BIT(s);
- try.router |= BIT(s);
+
+ no.router |= s;
+ try.router |= s;
try.neg_router = 1;
IPXCPDEBUG((LOG_INFO, "Router protocol number %d", s));
/*
* Do not permit the peer to force a router protocol which we do not
- * support.
+ * support. However, default to the condition that will accept "NONE".
*/
- try.router &= go->router;
- if (try.router == 0 && go->router != 0) {
+ try.router &= (ao->router | BIT(IPX_NONE));
+ if (try.router == 0 && ao->router != 0)
+ try.router = BIT(IPX_NONE);
+
+ if (try.router != 0)
try.neg_router = 1;
- try.router = BIT(0);
- }
/*
* OK, the Nak is good. Now we can update state.
u_char *p;
int len;
{
- int unit = f->unit;
u_short cilen, citype, cishort;
u_char cichar;
u_int32_t cilong;
ipxcp_options try; /* options to request next time */
#define REJCINETWORK(opt, neg, val) \
- if (neg) { \
- neg = 0; \
+ if (neg && p[0] == opt) { \
if ((len -= CILEN_NETN) < 0) \
break; \
GETCHAR(citype, p); \
if (cilong != val) \
break; \
IPXCPDEBUG((LOG_INFO,"ipxcp_rejci rejected long opt %d", opt)); \
+ neg = 0; \
}
#define REJCICHARS(opt, neg, val, cnt) \
- if (neg) { \
+ if (neg && p[0] == opt) { \
int indx, count = cnt; \
- neg = 0; \
len -= (count + 2); \
if (len < 0) \
break; \
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(opt, neg) \
- if (neg) { \
- neg = 0; \
+ if (neg && p[0] == opt) { \
if ((len -= CILEN_VOID) < 0) \
break; \
GETCHAR(citype, p); \
if (cilen != CILEN_VOID || citype != opt) \
break; \
IPXCPDEBUG((LOG_INFO, "ipxcp_rejci rejected void opt %d", opt)); \
+ neg = 0; \
}
+/* a reject for RIP/SAP is invalid since we don't send it and you can't
+ reject something which is not sent. (You can NAK, but you can't REJ.) */
#define REJCIPROTO(opt, neg, val, bit) \
- if (neg && (val & BIT(bit))) \
- { \
- if (len < 2) \
+ if (neg && p[0] == opt) { \
+ if ((len -= CILEN_PROTOCOL) < 0) \
break; \
GETCHAR(citype, p); \
GETCHAR(cilen, p); \
- if (cilen != CILEN_PROTOCOL || citype != opt) \
- break; \
- len -= cilen; \
- if (len < 0) \
+ if (cilen != CILEN_PROTOCOL) \
break; \
GETSHORT(cishort, p); \
- if (cishort != (bit)) \
+ if (cishort != to_external (val) || cishort == RIP_SAP) \
break; \
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci rejected router proto %d", bit)); \
- val &= ~BIT(bit); \
- if (val == 0) \
- neg = 0; \
- }
-
+ IPXCPDEBUG((LOG_INFO, "ipxcp_rejci short opt %d", opt)); \
+ neg = 0; \
+ }
/*
* Any Rejected CIs must be in exactly the same order that we sent.
* Check packet length and CI length at each step.
do {
REJCINETWORK (IPX_NETWORK_NUMBER, try.neg_nn, try.our_network);
REJCINODE (IPX_NODE_NUMBER, try.neg_node, try.our_node);
- REJCIPROTO (IPX_ROUTER_PROTOCOL, try.neg_router, try.router, 0);
- REJCIPROTO (IPX_ROUTER_PROTOCOL, try.neg_router, try.router, 2);
- REJCIPROTO (IPX_ROUTER_PROTOCOL, try.neg_router, try.router, 4);
REJCINAME (IPX_ROUTER_NAME, try.neg_name, try.name);
- REJCIVOID (IPX_COMPLETE, try.neg_complete);
+ REJCIPROTO (IPX_ROUTER_PROTOCOL, try.neg_router, try.router, 0);
/*
* This is the end of the record.
*/
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.
break;
/*
* The routing protocol is a bitmask of various types. Any combination
- * of the values 2 and 4 are permissible. '0' for no routing protocol must
- * be specified only once.
+ * of the values RIP_SAP and NLSP are permissible. 'IPX_NONE' for no
+ * routing protocol must be specified only once.
*/
case IPX_ROUTER_PROTOCOL:
if ( !ao->neg_router || cilen < CILEN_PROTOCOL ) {
GETSHORT (cishort, p);
IPXCPDEBUG((LOG_INFO,
- "Remote router protocol number %d",
+ "Remote router protocol number 0x%04x",
cishort));
- if ((cishort == 0 && ho->router != 0) || (ho->router & BIT(0))) {
- orc = CONFREJ;
- break;
+ if (wo->neg_router == 0) {
+ wo->neg_router = 1;
+ wo->router = BIT(IPX_NONE);
}
- if (cishort != 0 && cishort != 2 && cishort != 4) {
+ if ((cishort == IPX_NONE && ho->router != 0) ||
+ (ho->router & BIT(IPX_NONE))) {
orc = CONFREJ;
break;
}
- if (ho->router & BIT (cishort)) {
+ cishort = BIT(cishort);
+ if (ho->router & cishort) {
orc = CONFREJ;
break;
}
- ho->router |= BIT (cishort);
+ ho->router |= cishort;
ho->neg_router = 1;
+
+ /* Finally do not allow a router protocol which we do not
+ support. */
+
+ if ((cishort & (ao->router | BIT(IPX_NONE))) == 0) {
+ int protocol;
+
+ if (cishort == BIT(NLSP) &&
+ (ao->router & BIT(RIP_SAP)) &&
+ !wo->tried_rip) {
+ protocol = RIP_SAP;
+ wo->tried_rip = 1;
+ } else
+ protocol = IPX_NONE;
+
+ DECPTR (sizeof (u_int16_t), p);
+ PUTSHORT (protocol, p);
+ orc = CONFNAK;
+ }
break;
/*
* The router name is advisorary. Just accept it if it is not too large.
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 */
IPXCPDEBUG((LOG_INFO, "ipxcp: up"));
+ /* The default router protocol is RIP/SAP. */
+ if (ho->router == 0)
+ ho->router = BIT(RIP_SAP);
+
+ if (go->router == 0)
+ go->router = BIT(RIP_SAP);
+
+ /* Fetch the network number */
if (!ho->neg_nn)
ho->his_network = wo->his_network;
copy_node (wo->our_node, go->our_node);
if (zero_node (go->our_node)) {
- IPXCPDEBUG((LOG_ERR, "Could not determine local IPX node address"));
- ipxcp_close(f->unit, "Could not determine local IPX node address");
+ static char errmsg[] = "Could not determine local IPX node address";
+ IPXCPDEBUG((LOG_ERR, errmsg));
+ ipxcp_close(f->unit, errmsg);
return;
}
go->network = ho->his_network;
if (go->network == 0) {
- IPXCPDEBUG((LOG_ERR, "Could not determine network number"));
- ipxcp_close (unit, "Could not determine network number");
+ static char errmsg[] = "Can not determine network number";
+ IPXCPDEBUG((LOG_ERR, errmsg));
+ ipxcp_close (unit, errmsg);
return;
}
* /etc/ppp/ipx-up interface tty speed local-IPX remote-IPX
*/
- ipxcp_script (f, "/etc/ppp/ipx-up");
+ ipxcp_script (f, _PATH_IPXUP);
}
/*
ipxcp_down(f)
fsm *f;
{
- u_int32_t ournn, network;
-
IPXCPDEBUG((LOG_INFO, "ipxcp: down"));
cipxfaddr (f->unit);
sifdown(f->unit);
- ipxcp_script (f, "/etc/ppp/ipx-down");
+ ipxcp_script (f, _PATH_IPXDOWN);
}
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];
sprintf (strspeed, "%d", baud_rate);
strproto_lcl[0] = '\0';
- if (go->neg_router) {
- if (go->router & BIT(2))
+ if (go->neg_router && ((go->router & BIT(IPX_NONE)) == 0)) {
+ if (go->router & BIT(RIP_SAP))
strcpy (strproto_lcl, "RIP ");
- if (go->router & BIT(4))
- strcpy (strproto_lcl, "NLSP ");
+ if (go->router & BIT(NLSP))
+ strcat (strproto_lcl, "NLSP ");
}
if (strproto_lcl[0] == '\0')
strproto_lcl[strlen (strproto_lcl)-1] = '\0';
strproto_rmt[0] = '\0';
- if (ho->neg_router) {
- if (ho->router & BIT(2))
+ if (ho->neg_router && ((ho->router & BIT(IPX_NONE)) == 0)) {
+ if (ho->router & BIT(RIP_SAP))
strcpy (strproto_rmt, "RIP ");
- if (ho->router & BIT(4))
- strcpy (strproto_rmt, "NLSP ");
+ if (ho->router & BIT(NLSP))
+ strcat (strproto_rmt, "NLSP ");
}
if (strproto_rmt[0] == '\0')
switch (code) {
case IPX_NETWORK_NUMBER:
if (olen == CILEN_NETN) {
- p += CILEN_VOID;
+ p += 2;
GETLONG(cilong, p);
printer (arg, "network %s", ipx_ntoa (cilong));
}
break;
case IPX_NODE_NUMBER:
if (olen == CILEN_NODEN) {
- p += CILEN_VOID;
+ p += 2;
printer (arg, "node ");
while (p < optend) {
GETCHAR(code, p);
- printer(arg, "%.2x", code);
+ printer(arg, "%.2x", (int) (unsigned int) (unsigned char) code);
}
}
break;
case IPX_COMPRESSION_PROTOCOL:
if (olen == CILEN_COMPRESS) {
- p += CILEN_VOID;
+ p += 2;
GETSHORT (cishort, p);
- printer (arg, "compression %d", cishort);
+ printer (arg, "compression %d", (int) cishort);
}
break;
case IPX_ROUTER_PROTOCOL:
if (olen == CILEN_PROTOCOL) {
- p += CILEN_VOID;
+ p += 2;
GETSHORT (cishort, p);
- printer (arg, "router proto %d", cishort);
+ printer (arg, "router proto %d", (int) cishort);
}
break;
case IPX_ROUTER_NAME:
if (olen >= CILEN_NAME) {
- p += CILEN_VOID;
+ p += 2;
printer (arg, "router name \"");
while (p < optend) {
GETCHAR(code, p);
- if (code >= 0x20 && code < 0x7E)
- printer (arg, "%c", code);
+ if (code >= 0x20 && code <= 0x7E)
+ printer (arg, "%c", (int) (unsigned int) (unsigned char) code);
else
- printer (arg, " \\%.2x", code);
+ printer (arg, " \\%.2x", (int) (unsigned int) (unsigned char) code);
}
printer (arg, "\"");
}
break;
case IPX_COMPLETE:
if (olen == CILEN_COMPLETE) {
- p += CILEN_VOID;
+ p += 2;
printer (arg, "complete");
}
break;
while (p < optend) {
GETCHAR(code, p);
- printer(arg, " %.2x", code);
+ printer(arg, " %.2x", (int) (unsigned int) (unsigned char) code);
}
printer(arg, ">");
}
/* print the rest of the bytes in the packet */
for (; len > 0; --len) {
GETCHAR(code, p);
- printer(arg, " %.2x", code);
+ printer(arg, " %.2x", (int) (unsigned int) (unsigned char) code);
}
return p - pstart;
projects / ppp.git / blobdiff