abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

PPP, CCP, updated ANY_COMPRESS() to use ccp_options*

Browse Source
This commit is contained in:
Sylvain Rochet 2015-03-19 00:48:28 +01:00
parent 611b3c4c2c
commit 151995f88c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/netif/ppp/ccp.c
View File

@ -248,9 +248,9 @@ static const fsm_callbacks ccp_callbacks = {
/* /*
* Do we want / did we get any compression? * Do we want / did we get any compression?
*/ */
#define ANY_COMPRESS(opt) ((opt).deflate || (opt).bsd_compress \ #define ANY_COMPRESS(opt) ((opt)->deflate || (opt)->bsd_compress \
|| (opt).predictor_1 || (opt).predictor_2 \ || (opt)->predictor_1 || (opt)->predictor_2 \
|| (opt).mppe) || (opt)->mppe)
/* /*
* Local state (mainly for handling reset-reqs and reset-acks). * Local state (mainly for handling reset-reqs and reset-acks).
@ -1327,7 +1327,7 @@ static int ccp_reqci(fsm *f, u_char *p, int *lenp, int dont_nak) {
static char *method_name(ccp_options *opt, ccp_options *opt2) { static char *method_name(ccp_options *opt, ccp_options *opt2) {
static char result[64]; static char result[64];
if (!ANY_COMPRESS(*opt)) if (!ANY_COMPRESS(opt))
return "(none)"; return "(none)";
switch (opt->method) { switch (opt->method) {
#ifdef MPPE #ifdef MPPE
@ -1393,8 +1393,8 @@ static void ccp_up(fsm *f) {
char method1[64]; char method1[64];
ccp_flags_set(pcb, 1, 1); ccp_flags_set(pcb, 1, 1);
if (ANY_COMPRESS(*go)) { if (ANY_COMPRESS(go)) {
if (ANY_COMPRESS(*ho)) { if (ANY_COMPRESS(ho)) {
if (go->method == ho->method) { if (go->method == ho->method) {
notice("%s compression enabled", method_name(go, ho)); notice("%s compression enabled", method_name(go, ho));
} else { } else {
@ -1404,7 +1404,7 @@ static void ccp_up(fsm *f) {
} }
} else } else
notice("%s receive compression enabled", method_name(go, NULL)); notice("%s receive compression enabled", method_name(go, NULL));
} else if (ANY_COMPRESS(*ho)) } else if (ANY_COMPRESS(ho))
notice("%s transmit compression enabled", method_name(ho, NULL)); notice("%s transmit compression enabled", method_name(ho, NULL));
#ifdef MPPE #ifdef MPPE
if (go->mppe) { if (go->mppe) {