#ifdef IPX_CHANGE
#ifndef lint
-static char rcsid[] = "$Id: ipxcp.c,v 1.9 1999/03/12 06:07:17 paulus Exp $";
+static char rcsid[] = "$Id: ipxcp.c,v 1.10 1999/03/16 03:15:15 paulus Exp $";
#endif
/*
#include <stdio.h>
#include <string.h>
-#include <syslog.h>
#include <unistd.h>
#include <ctype.h>
#include <sys/types.h>
u_int32_t ipxaddr;
{
static char b[64];
- sprintf(b, "%x", ipxaddr);
+ slprintf(b, sizeof(b), "%x", ipxaddr);
return b;
}
/*
* The frame is invalid
*/
- IPXCPDEBUG((LOG_INFO, "ipxcp_ackci: received bad Ack!"));
+ IPXCPDEBUG(("ipxcp_ackci: received bad Ack!"));
return (0);
}
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;
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);
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. */
return 1;
bad:
- IPXCPDEBUG((LOG_INFO, "ipxcp_nakci: received bad Nak!"));
+ IPXCPDEBUG(("ipxcp_nakci: received bad Nak!"));
return 0;
}
GETLONG(cilong, p); \
if (cilong != val) \
break; \
- IPXCPDEBUG((LOG_INFO,"ipxcp_rejci rejected long opt %d", opt)); \
neg = 0; \
}
}\
if (indx != count) \
break; \
- IPXCPDEBUG((LOG_INFO,"ipxcp_rejci rejected opt %d", opt)); \
neg = 0; \
}
GETCHAR(cilen, p); \
if (cilen != CILEN_VOID || citype != opt) \
break; \
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci rejected void opt %d", opt)); \
neg = 0; \
}
GETSHORT(cishort, p); \
if (cishort != to_external (val) || cishort == RIP_SAP) \
break; \
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci short opt %d", opt)); \
neg = 0; \
}
/*
/*
* The frame is invalid at this point.
*/
- IPXCPDEBUG((LOG_INFO, "ipxcp_rejci: received bad Reject!"));
+ IPXCPDEBUG(("ipxcp_rejci: received bad Reject!"));
return 0;
}
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 */
* 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 ) {
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) {
* 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 ) {
* 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;
/*
}
GETSHORT (cishort, p);
- IPXCPDEBUG((LOG_INFO,
- "Remote router protocol number 0x%04x",
- cishort));
if (wo->neg_router == 0) {
wo->neg_router = 1;
* 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))
* This is advisorary.
*/
case IPX_COMPLETE:
- IPXCPDEBUG((LOG_INFO, "ipxcp: received Complete request"));
if (cilen != CILEN_COMPLETE)
orc = CONFREJ;
else {
* 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 */
}
*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 */
}
{
int unit = f->unit;
- IPXCPDEBUG((LOG_INFO, "ipxcp: up"));
+ IPXCPDEBUG(("ipxcp: up"));
/* The default router protocol is RIP/SAP. */
if (ho->router == 0)
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;
}
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;
}
/* 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;
}
ipxcp_down(f)
fsm *f;
{
- IPXCPDEBUG((LOG_INFO, "ipxcp: down"));
+ IPXCPDEBUG(("ipxcp: down"));
cipxfaddr (f->unit);
sifdown(f->unit);
char strnetwork[32], strpid[32];
char *argv[14], strproto_lcl[32], strproto_rmt[32];
- sprintf (strpid, "%d", getpid());
- sprintf (strspeed, "%d", baud_rate);
+ slprintf(strpid, sizeof(strpid), "%d", getpid());
+ slprintf(strspeed, sizeof(strspeed),"%d", baud_rate);
strproto_lcl[0] = '\0';
if (go->neg_router && ((go->router & BIT(IPX_NONE)) == 0)) {
projects / ppp.git / blobdiff