X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fccp.c;h=ad82330b45bea0bcd479ac891a1bf1444c12587f;hp=355ba1d9450709e20f80e018b42e30da810734d3;hb=642b44a17f5b83cbfbbbca87d85ec0e4d83762cd;hpb=2bd94c4a4277cb05b770bdb3aac3a76f4110d9b4 diff --git a/pppd/ccp.c b/pppd/ccp.c index 355ba1d..ad82330 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -26,9 +26,10 @@ */ #ifndef lint -static char rcsid[] = "$Id: ccp.c,v 1.12 1995/10/27 03:42:52 paulus Exp $"; +static char rcsid[] = "$Id: ccp.c,v 1.17 1996/07/01 01:11:36 paulus Exp $"; #endif +#include #include #include #include @@ -37,6 +38,39 @@ static char rcsid[] = "$Id: ccp.c,v 1.12 1995/10/27 03:42:52 paulus Exp $"; #include "fsm.h" #include "ccp.h" +/* + * Protocol entry points from main code. + */ +static void ccp_init __P((int unit)); +static void ccp_open __P((int unit)); +static void ccp_close __P((int unit, char *)); +static void ccp_lowerup __P((int unit)); +static void ccp_lowerdown __P((int)); +static void ccp_input __P((int unit, u_char *pkt, int len)); +static void ccp_protrej __P((int unit)); +static int ccp_printpkt __P((u_char *pkt, int len, + void (*printer) __P((void *, char *, ...)), + void *arg)); +static void ccp_datainput __P((int unit, u_char *pkt, int len)); + +struct protent ccp_protent = { + PPP_CCP, + ccp_init, + ccp_input, + ccp_protrej, + ccp_lowerup, + ccp_lowerdown, + ccp_open, + ccp_close, + ccp_printpkt, + ccp_datainput, + 1, + "CCP", + NULL, + NULL, + NULL +}; + 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 */ @@ -57,6 +91,7 @@ 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 char *method_name __P((ccp_options *, ccp_options *)); static fsm_callbacks ccp_callbacks = { ccp_resetci, @@ -96,7 +131,7 @@ static int all_rejected[NUM_PPP]; /* we rejected all peer's options */ /* * ccp_init - initialize CCP. */ -void +static void ccp_init(unit) int unit; { @@ -112,11 +147,17 @@ ccp_init(unit) memset(&ccp_allowoptions[unit], 0, sizeof(ccp_options)); memset(&ccp_hisoptions[unit], 0, sizeof(ccp_options)); - ccp_wantoptions[0].bsd_compress = 1; - ccp_wantoptions[0].bsd_bits = 12; /* default value */ + ccp_wantoptions[0].deflate = 1; + ccp_wantoptions[0].deflate_size = DEFLATE_MAX_SIZE; + ccp_allowoptions[0].deflate = 1; + ccp_allowoptions[0].deflate_size = DEFLATE_MAX_SIZE; + ccp_wantoptions[0].bsd_compress = 1; + ccp_wantoptions[0].bsd_bits = BSD_MAX_BITS; ccp_allowoptions[0].bsd_compress = 1; ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS; + + ccp_allowoptions[0].predictor_1 = 1; } /* @@ -130,26 +171,34 @@ ccp_open(unit) if (f->state != OPENED) ccp_flags_set(unit, 1, 0); - if (!ANY_COMPRESS(ccp_wantoptions[unit])) + + /* + * Find out which compressors the kernel supports before + * deciding whether to open in silent mode. + */ + ccp_resetci(f); + if (!ANY_COMPRESS(ccp_gotoptions[unit])) f->flags |= OPT_SILENT; + fsm_open(f); } /* * ccp_close - Terminate CCP. */ -void -ccp_close(unit) +static void +ccp_close(unit, reason) int unit; + char *reason; { ccp_flags_set(unit, 0, 0); - fsm_close(&ccp_fsm[unit]); + fsm_close(&ccp_fsm[unit], reason); } /* * ccp_lowerup - we may now transmit CCP packets. */ -void +static void ccp_lowerup(unit) int unit; { @@ -159,7 +208,7 @@ ccp_lowerup(unit) /* * ccp_lowerdown - we may not transmit CCP packets. */ -void +static void ccp_lowerdown(unit) int unit; { @@ -169,7 +218,7 @@ ccp_lowerdown(unit) /* * ccp_input - process a received CCP packet. */ -void +static void ccp_input(unit, p, len) int unit; u_char *p; @@ -192,7 +241,7 @@ ccp_input(unit, p, len) */ if (oldstate == REQSENT && p[0] == TERMACK && !ANY_COMPRESS(ccp_gotoptions[unit])) - ccp_close(unit); + ccp_close(unit, "No compression negotiated"); } /* @@ -231,7 +280,7 @@ ccp_extcode(f, code, id, p, len) /* * ccp_protrej - peer doesn't talk CCP. */ -void +static void ccp_protrej(unit) int unit; { @@ -246,7 +295,6 @@ static void ccp_resetci(f) fsm *f; { - int ok; ccp_options *go = &ccp_gotoptions[f->unit]; u_char opt_buf[16]; @@ -380,6 +428,8 @@ ccp_addci(f, p, lenp) } } + go->method = (p > p0)? p0[0]: -1; + *lenp = p - p0; } @@ -423,6 +473,8 @@ ccp_ackci(f, p, len) if (len < CILEN_PREDICTOR_1 || p[0] != CI_PREDICTOR_1 || p[1] != CILEN_PREDICTOR_1) return 0; + p += CILEN_PREDICTOR_1; + len -= CILEN_PREDICTOR_1; /* XXX Cope with first/fast ack */ if (p == p0 && len == 0) return 1; @@ -431,6 +483,8 @@ ccp_ackci(f, p, len) if (len < CILEN_PREDICTOR_2 || p[0] != CI_PREDICTOR_2 || p[1] != CILEN_PREDICTOR_2) return 0; + p += CILEN_PREDICTOR_2; + len -= CILEN_PREDICTOR_2; /* XXX Cope with first/fast ack */ if (p == p0 && len == 0) return 1; @@ -587,6 +641,7 @@ ccp_reqci(f, p, lenp, dont_nak) len = *lenp; memset(ho, 0, sizeof(ccp_options)); + ho->method = (len > 0)? p[0]: -1; while (len > 0) { newret = CONFACK; @@ -610,38 +665,34 @@ ccp_reqci(f, p, lenp, dont_nak) ho->deflate_size = nb = DEFLATE_SIZE(p[2]); if (DEFLATE_METHOD(p[2]) != DEFLATE_METHOD_VAL || p[3] != DEFLATE_CHK_SEQUENCE - || nb > ao->deflate_size) { + || nb > ao->deflate_size || nb < DEFLATE_MIN_SIZE) { newret = CONFNAK; - nb = ao->deflate_size; - } else { - /* - * Check whether we can do Deflate with the window - * size they want. If the window is too big, reduce - * it until the kernel can cope and nak with that. - */ + if (!dont_nak) { + p[2] = DEFLATE_MAKE_OPT(ao->deflate_size); + p[3] = DEFLATE_CHK_SEQUENCE; + } + break; + } + + /* + * Check whether we can do Deflate with the window + * size they want. If the window is too big, reduce + * it until the kernel can cope and nak with that. + * We only check this for the first option. + */ + if (p == p0) { for (;;) { - if (nb < DEFLATE_MIN_SIZE) { + res = ccp_test(f->unit, p, CILEN_DEFLATE, 1); + if (res > 0) + break; /* it's OK now */ + if (res < 0 || nb == DEFLATE_MIN_SIZE || dont_nak) { newret = CONFREJ; p[2] = DEFLATE_MAKE_OPT(ho->deflate_size); break; } - p[2] = DEFLATE_MAKE_OPT(nb); - res = ccp_test(f->unit, p, CILEN_DEFLATE, 1); - if (res != 0) { - if (res < 0) - newret = CONFREJ; - break; - } newret = CONFNAK; --nb; - } - } - if (newret == CONFNAK && !dont_nak) { - if (nb >= DEFLATE_MIN_SIZE) { p[2] = DEFLATE_MAKE_OPT(nb); - p[3] = DEFLATE_CHK_SEQUENCE; - } else { - newret = CONFREJ; } } break; @@ -655,38 +706,33 @@ ccp_reqci(f, p, lenp, dont_nak) ho->bsd_compress = 1; ho->bsd_bits = nb = BSD_NBITS(p[2]); if (BSD_VERSION(p[2]) != BSD_CURRENT_VERSION - || nb > ao->bsd_bits) { + || nb > ao->bsd_bits || nb < BSD_MIN_BITS) { newret = CONFNAK; - nb = ao->bsd_bits; - } else { - /* - * Check whether we can do BSD_Compress with the code - * size they want. If the code size is too big, reduce - * it until the kernel can cope and nak with that. - */ + if (!dont_nak) + p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, ao->bsd_bits); + break; + } + + /* + * Check whether we can do BSD-Compress with the code + * size they want. If the code size is too big, reduce + * it until the kernel can cope and nak with that. + * We only check this for the first option. + */ + if (p == p0) { for (;;) { - if (nb < BSD_MIN_BITS) { + res = ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 1); + if (res > 0) + break; + if (res < 0 || nb == BSD_MIN_BITS || dont_nak) { newret = CONFREJ; p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, ho->bsd_bits); break; } - p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, nb); - res = ccp_test(f->unit, p, CILEN_BSD_COMPRESS, 1); - if (res != 0) { - if (res < 0) - newret = CONFREJ; - break; - } newret = CONFNAK; --nb; - } - } - if (newret == CONFNAK && !dont_nak) { - if (nb >= BSD_MIN_BITS) { p[2] = BSD_MAKE_OPT(BSD_CURRENT_VERSION, nb); - } else { - newret = CONFREJ; } } break; @@ -698,7 +744,8 @@ ccp_reqci(f, p, lenp, dont_nak) } ho->predictor_1 = 1; - if (ccp_test(f->unit, p, CILEN_PREDICTOR_1, 1) <= 0) { + if (p == p0 + && ccp_test(f->unit, p, CILEN_PREDICTOR_1, 1) <= 0) { newret = CONFREJ; } break; @@ -710,7 +757,8 @@ ccp_reqci(f, p, lenp, dont_nak) } ho->predictor_2 = 1; - if (ccp_test(f->unit, p, CILEN_PREDICTOR_2, 1) <= 0) { + if (p == p0 + && ccp_test(f->unit, p, CILEN_PREDICTOR_2, 1) <= 0) { newret = CONFREJ; } break; @@ -746,7 +794,43 @@ ccp_reqci(f, p, lenp, dont_nak) } /* - * CCP has come up - inform the kernel driver. + * Make a string name for a compression method (or 2). + */ +static char * +method_name(opt, opt2) + ccp_options *opt, *opt2; +{ + static char result[64]; + + if (!ANY_COMPRESS(*opt)) + return "(none)"; + switch (opt->method) { + case CI_DEFLATE: + if (opt2 != NULL && opt2->deflate_size != opt->deflate_size) + sprintf(result, "Deflate (%d/%d)", opt->deflate_size, + opt2->deflate_size); + else + sprintf(result, "Deflate (%d)", opt->deflate_size); + break; + case CI_BSD_COMPRESS: + if (opt2 != NULL && opt2->bsd_bits != opt->bsd_bits) + sprintf(result, "BSD-Compress (%d/%d)", opt->bsd_bits, + opt2->bsd_bits); + else + sprintf(result, "BSD-Compress (%d)", opt->bsd_bits); + break; + case CI_PREDICTOR_1: + return "Predictor 1"; + case CI_PREDICTOR_2: + return "Predictor 2"; + default: + sprintf(result, "Method %d", opt->method); + } + return result; +} + +/* + * CCP has come up - inform the kernel driver and log a message. */ static void ccp_up(f) @@ -754,12 +838,25 @@ ccp_up(f) { ccp_options *go = &ccp_gotoptions[f->unit]; ccp_options *ho = &ccp_hisoptions[f->unit]; + char method1[64]; ccp_flags_set(f->unit, 1, 1); - if (ANY_COMPRESS(*go) || ANY_COMPRESS(*ho)) - syslog(LOG_NOTICE, "%s enabled", - ANY_COMPRESS(*go)? ANY_COMPRESS(*ho)? "Compression": - "Receive compression": "Transmit compression"); + if (ANY_COMPRESS(*go)) { + if (ANY_COMPRESS(*ho)) { + if (go->method == ho->method) { + syslog(LOG_NOTICE, "%s compression enabled", + method_name(go, ho)); + } else { + strcpy(method1, method_name(go, NULL)); + syslog(LOG_NOTICE, "%s / %s compression enabled", + method1, method_name(ho, NULL)); + } + } else + syslog(LOG_NOTICE, "%s receive compression enabled", + method_name(go, NULL)); + } else + syslog(LOG_NOTICE, "%s transmit compression enabled", + method_name(ho, NULL)); } /* @@ -778,14 +875,14 @@ ccp_down(f) /* * Print the contents of a CCP packet. */ -char *ccp_codenames[] = { +static char *ccp_codenames[] = { "ConfReq", "ConfAck", "ConfNak", "ConfRej", "TermReq", "TermAck", "CodeRej", NULL, NULL, NULL, NULL, NULL, NULL, "ResetReq", "ResetAck", }; -int +static int ccp_printpkt(p, plen, printer, arg) u_char *p; int plen; @@ -864,6 +961,15 @@ ccp_printpkt(p, plen, printer, arg) printer(arg, ">"); } break; + + case TERMACK: + case TERMREQ: + if (len > 0 && *p >= ' ' && *p < 0x7f) { + print_string(p, len, printer, arg); + p += len; + len = 0; + } + break; } /* dump out the rest of the packet in hex */ @@ -900,7 +1006,7 @@ ccp_datainput(unit, pkt, len) * Disable compression by taking CCP down. */ syslog(LOG_ERR, "Lost compression sync: disabling compression"); - ccp_close(unit); + ccp_close(unit, "Lost compression sync"); } else { /* * Send a reset-request to reset the peer's compressor.