*/
#ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.4 1994/09/16 02:14:31 paulus Exp $";
+static char rcsid[] = "$Id: ccp.c,v 1.9 1995/05/19 03:17:09 paulus Exp $";
#endif
#include <syslog.h>
#include <sys/ioctl.h>
+#include <net/ppp-comp.h>
#include "pppd.h"
-#include "ppp.h"
#include "fsm.h"
#include "ccp.h"
-fsm ccp_fsm[NPPP];
-ccp_options ccp_wantoptions[NPPP]; /* what to request the peer to use */
-ccp_options ccp_gotoptions[NPPP]; /* what the peer agreed to do */
-ccp_options ccp_allowoptions[NPPP]; /* what we'll agree to do */
-ccp_options ccp_hisoptions[NPPP]; /* what we agreed to do */
+fsm ccp_fsm[NUM_PPP];
+ccp_options ccp_wantoptions[NUM_PPP]; /* what to request the peer to use */
+ccp_options ccp_gotoptions[NUM_PPP]; /* what the peer agreed to do */
+ccp_options ccp_allowoptions[NUM_PPP]; /* what we'll agree to do */
+ccp_options ccp_hisoptions[NUM_PPP]; /* what we agreed to do */
/*
* Callbacks for fsm code.
*/
-static void ccp_resetci __ARGS((fsm *));
-static int ccp_cilen __ARGS((fsm *));
-static void ccp_addci __ARGS((fsm *, u_char *, int *));
-static int ccp_ackci __ARGS((fsm *, u_char *, int));
-static int ccp_nakci __ARGS((fsm *, u_char *, int));
-static int ccp_rejci __ARGS((fsm *, u_char *, int));
-static int ccp_reqci __ARGS((fsm *, u_char *, int *, int));
-static void ccp_up __ARGS((fsm *));
-static void ccp_down __ARGS((fsm *));
-static int ccp_extcode __ARGS((fsm *, int, int, u_char *, int));
-static void ccp_rack_timeout __ARGS(());
+static void ccp_resetci __P((fsm *));
+static int ccp_cilen __P((fsm *));
+static void ccp_addci __P((fsm *, u_char *, int *));
+static int ccp_ackci __P((fsm *, u_char *, int));
+static int ccp_nakci __P((fsm *, u_char *, int));
+static int ccp_rejci __P((fsm *, u_char *, int));
+static int ccp_reqci __P((fsm *, u_char *, int *, int));
+static void ccp_up __P((fsm *));
+static void ccp_down __P((fsm *));
+static int ccp_extcode __P((fsm *, int, int, u_char *, int));
+static void ccp_rack_timeout __P(());
static fsm_callbacks ccp_callbacks = {
ccp_resetci,
"CCP"
};
-/*
- * Length of configuration options, which describe possible
- * compression methods.
- */
-#define CILEN_BSD 3
-
-/*
- * Configuration option values for compression methods.
- */
-#define CI_BSD_COMPRESS 0x21
-
-/*
- * Information relating to BSD Compress configuration options.
- */
-#define BSD_NBITS(x) ((x) & 0x1F)
-#define BSD_VERSION(x) ((x) >> 5)
-#define BSD_CURRENT_VERSION 1
-#define BSD_MAKE_OPT(v, n) (((v) << 5) | (n))
-
/*
* Do we want / did we get any compression?
*/
/*
* Local state (mainly for handling reset-reqs and reset-acks
*/
-static int ccp_localstate[NPPP];
+static int ccp_localstate[NUM_PPP];
#define RACK_PENDING 1 /* waiting for reset-ack */
#define RREQ_REPEAT 2 /* send another reset-req if no reset-ack */
fsm *f = &ccp_fsm[unit];
f->unit = unit;
- f->protocol = CCP;
+ f->protocol = PPP_CCP;
f->callbacks = &ccp_callbacks;
fsm_init(f);
ccp_wantoptions[0].bsd_bits = 12; /* default value */
ccp_allowoptions[0].bsd_compress = 1;
- ccp_allowoptions[0].bsd_bits = MAX_BSD_BITS;
+ ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS;
}
/*
int len;
{
switch (code) {
- case RESETREQ:
+ case CCP_RESETREQ:
if (f->state != OPENED)
break;
/* send a reset-ack, which the transmitter will see and
reset its compression state. */
- fsm_sdata(f, RESETACK, id, NULL, 0);
+ fsm_sdata(f, CCP_RESETACK, id, NULL, 0);
break;
- case RESETACK:
+ case CCP_RESETACK:
if (ccp_localstate[f->unit] & RACK_PENDING && id == f->reqid) {
ccp_localstate[f->unit] &= ~(RACK_PENDING | RREQ_REPEAT);
UNTIMEOUT(ccp_rack_timeout, (caddr_t) f);
*go = ccp_wantoptions[f->unit];
if (go->bsd_compress) {
opt_buf[0] = CI_BSD_COMPRESS;
- opt_buf[1] = CILEN_BSD;
+ opt_buf[1] = CILEN_BSD_COMPRESS;
opt_buf[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, go->bsd_bits);
- if (!ccp_test(f->unit, opt_buf, CILEN_BSD, 0))
+ if (!ccp_test(f->unit, opt_buf, CILEN_BSD_COMPRESS, 0))
go->bsd_compress = 0;
}
}
{
ccp_options *go = &ccp_gotoptions[f->unit];
- return (go->bsd_compress? CILEN_BSD: 0);
+ return (go->bsd_compress? CILEN_BSD_COMPRESS: 0);
}
/*
if (go->bsd_compress) {
p[0] = CI_BSD_COMPRESS;
- p[1] = CILEN_BSD;
+ p[1] = CILEN_BSD_COMPRESS;
p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, go->bsd_bits);
- if (ccp_test(f->unit, p, CILEN_BSD, 0))
- p += CILEN_BSD;
+ if (ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 0))
+ p += CILEN_BSD_COMPRESS;
else
go->bsd_compress = 0;
}
ccp_options *go = &ccp_gotoptions[f->unit];
if (go->bsd_compress) {
- if (len < CILEN_BSD || p[0] != CI_BSD_COMPRESS || p[1] != CILEN_BSD
+ if (len < CILEN_BSD_COMPRESS
+ || p[0] != CI_BSD_COMPRESS || p[1] != CILEN_BSD_COMPRESS
|| p[2] != BSD_MAKE_OPT(BSD_CURRENT_VERSION, go->bsd_bits))
return 0;
- p += CILEN_BSD;
- len -= CILEN_BSD;
+ p += CILEN_BSD_COMPRESS;
+ len -= CILEN_BSD_COMPRESS;
}
if (len != 0)
return 0;
memset(&no, 0, sizeof(no));
try = *go;
- if (go->bsd_compress && !no.bsd_compress && len >= CILEN_BSD
- && p[0] == CI_BSD_COMPRESS && p[1] == CILEN_BSD) {
+ if (go->bsd_compress && !no.bsd_compress && len >= CILEN_BSD_COMPRESS
+ && p[0] == CI_BSD_COMPRESS && p[1] == CILEN_BSD_COMPRESS) {
no.bsd_compress = 1;
/*
* Peer wants us to use a different number of bits
try.bsd_compress = 0;
else if (BSD_NBITS(p[2]) < go->bsd_bits)
try.bsd_bits = BSD_NBITS(p[2]);
- p += CILEN_BSD;
- len -= CILEN_BSD;
+ p += CILEN_BSD_COMPRESS;
+ len -= CILEN_BSD_COMPRESS;
}
/*
try = *go;
- if (go->bsd_compress && len >= CILEN_BSD
- && p[0] == CI_BSD_COMPRESS && p[1] == CILEN_BSD) {
+ if (go->bsd_compress && len >= CILEN_BSD_COMPRESS
+ && p[0] == CI_BSD_COMPRESS && p[1] == CILEN_BSD_COMPRESS) {
if (p[2] != BSD_MAKE_OPT(BSD_CURRENT_VERSION, go->bsd_bits))
return 0;
try.bsd_compress = 0;
- p += CILEN_BSD;
- len -= CILEN_BSD;
+ p += CILEN_BSD_COMPRESS;
+ len -= CILEN_BSD_COMPRESS;
}
if (len != 0)
switch (type) {
case CI_BSD_COMPRESS:
- if (!ao->bsd_compress || clen != CILEN_BSD) {
+ if (!ao->bsd_compress || clen != CILEN_BSD_COMPRESS) {
newret = CONFREJ;
break;
}
|| nb > ao->bsd_bits) {
newret = CONFNAK;
nb = ao->bsd_bits;
- } else if (nb < MIN_BSD_BITS) {
+ } else if (nb < BSD_MIN_BITS) {
newret = CONFREJ;
- } else if (!ccp_test(f->unit, p, CILEN_BSD, 1)) {
- if (nb > MIN_BSD_BITS) {
+ } else if (!ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 1)) {
+ if (nb > BSD_MIN_BITS) {
--nb;
newret = CONFNAK;
} else
}
}
+ if (newret == CONFNAK && dont_nak)
+ newret = CONFREJ;
if (!(newret == CONFACK || newret == CONFNAK && ret == CONFREJ)) {
/* we're returning this option */
+ if (newret == CONFREJ && ret == CONFNAK)
+ retp = p0;
ret = newret;
if (p != retp)
BCOPY(p, retp, clen);
ccp_printpkt(p, plen, printer, arg)
u_char *p;
int plen;
- void (*printer) __ARGS((void *, char *, ...));
+ void (*printer) __P((void *, char *, ...));
void *arg;
{
u_char *p0, *optend;
optend = p + optlen;
switch (code) {
case CI_BSD_COMPRESS:
- if (optlen >= CILEN_BSD) {
+ if (optlen >= CILEN_BSD_COMPRESS) {
printer(arg, "bsd v%d %d", BSD_VERSION(p[2]),
BSD_NBITS(p[2]));
- p += CILEN_BSD;
+ p += CILEN_BSD_COMPRESS;
}
break;
}
* acknowledgement to a previous reset-request.
*/
if (!(ccp_localstate[f->unit] & RACK_PENDING)) {
- fsm_sdata(f, RESETREQ, f->reqid = ++f->id, NULL, 0);
+ fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0);
TIMEOUT(ccp_rack_timeout, (caddr_t) f, RACKTIMEOUT);
ccp_localstate[f->unit] |= RACK_PENDING;
} else
fsm *f = (fsm *) arg;
if (f->state == OPENED && ccp_localstate[f->unit] & RREQ_REPEAT) {
- fsm_sdata(f, RESETREQ, f->reqid, NULL, 0);
+ fsm_sdata(f, CCP_RESETREQ, f->reqid, NULL, 0);
TIMEOUT(ccp_rack_timeout, (caddr_t) f, RACKTIMEOUT);
ccp_localstate[f->unit] &= ~RREQ_REPEAT;
} else
projects / ppp.git / blobdiff