X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fccp.c;h=90a7ff190156c72bbf68d536b0c94944c00096f9;hp=24bf6ccd0e3393dd691dde490048e5feb62e4055;hb=cd28744f82dfd8cfddc67dcf12ca57b91ca6f4c2;hpb=a3396b002507d72b3e1f1169bd02ae018539654b diff --git a/pppd/ccp.c b/pppd/ccp.c index 24bf6cc..90a7ff1 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -26,21 +26,22 @@ */ #ifndef lint -static char rcsid[] = "$Id: ccp.c,v 1.5 1994/09/21 06:47:37 paulus Exp $"; +static char rcsid[] = "$Id: ccp.c,v 1.7 1995/04/24 06:01:18 paulus Exp $"; #endif #include #include +#include #include "pppd.h" #include "fsm.h" #include "ccp.h" -fsm ccp_fsm[N_PPP]; -ccp_options ccp_wantoptions[N_PPP]; /* what to request the peer to use */ -ccp_options ccp_gotoptions[N_PPP]; /* what the peer agreed to do */ -ccp_options ccp_allowoptions[N_PPP]; /* what we'll agree to do */ -ccp_options ccp_hisoptions[N_PPP]; /* 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. @@ -75,25 +76,6 @@ static fsm_callbacks ccp_callbacks = { "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? */ @@ -102,7 +84,7 @@ static fsm_callbacks ccp_callbacks = { /* * Local state (mainly for handling reset-reqs and reset-acks */ -static int ccp_localstate[N_PPP]; +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 */ @@ -212,15 +194,15 @@ ccp_extcode(f, code, id, p, len) 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); @@ -258,9 +240,9 @@ ccp_resetci(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; } } @@ -274,7 +256,7 @@ ccp_cilen(f) { ccp_options *go = &ccp_gotoptions[f->unit]; - return (go->bsd_compress? CILEN_BSD: 0); + return (go->bsd_compress? CILEN_BSD_COMPRESS: 0); } /* @@ -291,10 +273,10 @@ ccp_addci(f, p, lenp) 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; } @@ -314,11 +296,12 @@ ccp_ackci(f, p, len) 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; @@ -342,8 +325,8 @@ ccp_nakci(f, p, len) 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 @@ -353,8 +336,8 @@ ccp_nakci(f, p, len) 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; } /* @@ -383,13 +366,13 @@ ccp_rejci(f, p, len) 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) @@ -438,7 +421,7 @@ ccp_reqci(f, p, lenp, dont_nak) switch (type) { case CI_BSD_COMPRESS: - if (!ao->bsd_compress || clen != CILEN_BSD) { + if (!ao->bsd_compress || clen != CILEN_BSD_COMPRESS) { newret = CONFREJ; break; } @@ -451,7 +434,7 @@ ccp_reqci(f, p, lenp, dont_nak) nb = ao->bsd_bits; } else if (nb < MIN_BSD_BITS) { newret = CONFREJ; - } else if (!ccp_test(f->unit, p, CILEN_BSD, 1)) { + } else if (!ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 1)) { if (nb > MIN_BSD_BITS) { --nb; newret = CONFNAK; @@ -471,6 +454,8 @@ ccp_reqci(f, p, lenp, dont_nak) 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); @@ -571,10 +556,10 @@ ccp_printpkt(p, plen, printer, arg) 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; } @@ -627,7 +612,7 @@ ccp_datainput(unit, pkt, len) * 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 @@ -646,7 +631,7 @@ ccp_rack_timeout(arg) 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