* ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
* OR MODIFICATIONS.
- *
- * $Id: ccp.c,v 1.3 1994/09/01 00:16:20 paulus Exp $
*/
#ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.3 1994/09/01 00:16:20 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,
};
/*
- * Length of configuration options, which describe possible
- * compression methods.
- */
-#define CILEN_BSD 3
-
-/*
- * Configuration option values for compression methods.
+ * Do we want / did we get any compression?
*/
-#define CI_BSD_COMPRESS 0x21
+#define ANY_COMPRESS(opt) ((opt).bsd_compress)
/*
* 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;
}
/*
if (f->state != OPENED)
ccp_flags_set(unit, 1, 0);
- if (!ccp_wantoptions[unit].bsd_compress)
+ if (!ANY_COMPRESS(ccp_wantoptions[unit]))
f->flags |= OPT_SILENT;
fsm_open(f);
}
u_char *p;
int len;
{
- fsm_input(&ccp_fsm[unit], p, len);
+ fsm *f = &ccp_fsm[unit];
+ int oldstate;
+
+ /*
+ * Check for a terminate-request so we can print a message.
+ */
+ oldstate = f->state;
+ fsm_input(f, p, len);
+ if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED)
+ syslog(LOG_NOTICE, "Compression disabled by peer.");
}
/*
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[2] = go->bsd_bits;
- if (!ccp_test(f->unit, opt_buf, 3, 0))
+ 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_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[2] = go->bsd_bits;
- p += 3;
+ p[1] = CILEN_BSD_COMPRESS;
+ p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, go->bsd_bits);
+ if (ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 0))
+ p += CILEN_BSD_COMPRESS;
+ else
+ go->bsd_compress = 0;
}
*lenp = p - p0;
}
ccp_options *go = &ccp_gotoptions[f->unit];
if (go->bsd_compress) {
- if (len != 3 || p[0] != CI_BSD_COMPRESS
- || p[1] != CILEN_BSD || p[2] != go->bsd_bits)
+ 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 += 3;
- len -= 3;
+ p += CILEN_BSD_COMPRESS;
+ len -= CILEN_BSD_COMPRESS;
}
if (len != 0)
return 0;
memset(&no, 0, sizeof(no));
try = *go;
- if (go->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.
+ * Peer wants us to use a different number of bits
+ * or a different version.
*/
- if (p[2] < go->bsd_bits)
- try.bsd_bits = p[2];
- p += CILEN_BSD;
- len -= CILEN_BSD;
+ if (BSD_VERSION(p[2]) != BSD_CURRENT_VERSION)
+ try.bsd_compress = 0;
+ else if (BSD_NBITS(p[2]) < go->bsd_bits)
+ try.bsd_bits = BSD_NBITS(p[2]);
+ 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 (p[2] != go->bsd_bits)
+ 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)
{
int ret, newret;
u_char *p0, *retp;
- int len, clen, type;
+ int len, clen, type, nb;
ccp_options *ho = &ccp_hisoptions[f->unit];
ccp_options *ao = &ccp_allowoptions[f->unit];
switch (type) {
case CI_BSD_COMPRESS:
- if (!ao->bsd_compress || clen != CILEN_BSD) {
+ if (!ao->bsd_compress || clen != CILEN_BSD_COMPRESS) {
newret = CONFREJ;
break;
}
ho->bsd_compress = 1;
- ho->bsd_bits = p[2];
- if (ho->bsd_bits < MIN_BSD_BITS
- || ho->bsd_bits > ao->bsd_bits) {
+ ho->bsd_bits = nb = BSD_NBITS(p[2]);
+ if (BSD_VERSION(p[2]) != BSD_CURRENT_VERSION
+ || nb > ao->bsd_bits) {
newret = CONFNAK;
- } else if (!ccp_test(f->unit, p, CILEN_BSD, 1)) {
- if (ho->bsd_bits > MIN_BSD_BITS)
+ nb = ao->bsd_bits;
+ } else if (nb < BSD_MIN_BITS) {
+ newret = CONFREJ;
+ } else if (!ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 1)) {
+ if (nb > BSD_MIN_BITS) {
+ --nb;
newret = CONFNAK;
- else
+ } else
newret = CONFREJ;
}
if (newret == CONFNAK && !dont_nak) {
- p[2] = (ho->bsd_bits < ao->bsd_bits? MIN_BSD_BITS:
- ao->bsd_bits);
+ p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, nb);
}
break;
}
}
+ 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 has come up - inform the kernel driver.
*/
-static char *up_strings[] = {
- "no ", "receive ", "transmit ", ""
-};
-
static void
ccp_up(f)
fsm *f;
ccp_options *ho = &ccp_hisoptions[f->unit];
ccp_flags_set(f->unit, 1, 1);
- syslog(LOG_INFO, "%scompression enabled",
- up_strings[(go->bsd_compress? 1: 0) + (ho->bsd_compress? 2: 0)]);
+ if (go->bsd_compress || ho->bsd_compress)
+ syslog(LOG_NOTICE, "%s enabled",
+ go->bsd_compress? ho->bsd_compress? "Compression":
+ "Receive compression": "Transmit compression");
}
/*
UNTIMEOUT(ccp_rack_timeout, (caddr_t) f);
ccp_localstate[f->unit] = 0;
ccp_flags_set(f->unit, 1, 0);
- syslog(LOG_NOTICE, "Compression disabled.");
}
/*
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) {
- printer(arg, "bsd %d", p[2]);
- p += CILEN_BSD;
+ if (optlen >= CILEN_BSD_COMPRESS) {
+ printer(arg, "bsd v%d %d", BSD_VERSION(p[2]),
+ BSD_NBITS(p[2]));
+ p += CILEN_BSD_COMPRESS;
}
break;
}
/*
* We have received a packet that the decompressor failed to
- * decompress. Here we would expect to issue a reset-request,
- * but Motorola has a patent on that, so instead we log a message
- * and take CCP down :-(. (See US patent 5,130,993; international
- * patent publication number WO 91/10289; Australian patent 73296/91.)
+ * decompress. Here we would expect to issue a reset-request, but
+ * Motorola has a patent on resetting the compressor as a result of
+ * detecting an error in the decompressed data after decompression.
+ * (See US patent 5,130,993; international patent publication number
+ * WO 91/10289; Australian patent 73296/91.)
+ *
+ * So we ask the kernel whether the error was detected after
+ * decompression; if it was, we take CCP down, thus disabling
+ * compression :-(, otherwise we issue the reset-request.
*/
void
ccp_datainput(unit, pkt, len)
f = &ccp_fsm[unit];
if (f->state == OPENED) {
- syslog(LOG_ERR, "Lost compression sync: disabling compression");
- ccp_close(unit);
- }
-}
-
-/*
- * ccp_req_reset - Request that the peer reset the compression
- * dictionary.
- */
-void
-ccp_req_reset(f)
- fsm *f;
-{
- if (f->state == OPENED) {
- if (!(ccp_localstate[f->unit] & RACK_PENDING)) {
- fsm_sdata(f, RESETREQ, f->reqid = ++f->id, NULL, 0);
- TIMEOUT(ccp_rack_timeout, (caddr_t) f, RACKTIMEOUT);
- ccp_localstate[f->unit] |= RACK_PENDING;
- } else
- ccp_localstate[f->unit] |= RREQ_REPEAT;
+ if (ccp_fatal_error(unit)) {
+ /*
+ * Disable compression by taking CCP down.
+ */
+ syslog(LOG_ERR, "Lost compression sync: disabling compression");
+ ccp_close(unit);
+ } else {
+ /*
+ * Send a reset-request to reset the peer's compressor.
+ * We don't do that if we are still waiting for an
+ * acknowledgement to a previous reset-request.
+ */
+ if (!(ccp_localstate[f->unit] & RACK_PENDING)) {
+ 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
+ ccp_localstate[f->unit] |= RREQ_REPEAT;
+ }
}
}
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