diff options
author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-08-08 14:45:10 +0200 |
---|---|---|
committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-08-08 14:45:10 +0200 |
commit | f5aa04085ef784abf76e4b6b419343e0843b7f32 (patch) | |
tree | a95094cc6cfb37610a93d0566ff5e84c62982763 | |
parent | 4482e168021655614b4224f5b8e8aefb387dd2ae (diff) | |
download | tcpdump-f5aa04085ef784abf76e4b6b419343e0843b7f32.tar.gz |
Rename DLT_PPP_WITHDIRECTION to DLT_PPP_PPPD
In libpcap DLT_PPP_WITHDIRECTION was renamed to
DLT_LINUX_PPP_WITHDIRECTION and after to DLT_PPP_PPPD.
Rename other #defines to match.
-rw-r--r-- | ppp.h | 4 | ||||
-rw-r--r-- | print-ppp.c | 4 | ||||
-rw-r--r-- | print.c | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -19,8 +19,8 @@ #define PPP_ADDRESS 0xff /* The address byte value */ #define PPP_CONTROL 0x03 /* The control byte value */ -#define PPP_WITHDIRECTION_IN 0x00 /* non-standard for DLT_PPP_WITHDIRECTION */ -#define PPP_WITHDIRECTION_OUT 0x01 /* non-standard for DLT_PPP_WITHDIRECTION */ +#define PPP_PPPD_IN 0x00 /* non-standard for DLT_PPP_PPPD */ +#define PPP_PPPD_OUT 0x01 /* non-standard for DLT_PPP_PPPD */ /* Protocol numbers */ #define PPP_IP 0x0021 /* Raw IP */ diff --git a/print-ppp.c b/print-ppp.c index 4409ee78..8e2024de 100644 --- a/print-ppp.c +++ b/print-ppp.c @@ -1578,13 +1578,13 @@ ppp_print(netdissect_options *ndo, ppp_header = GET_BE_U_2(p); switch(ppp_header) { - case (PPP_WITHDIRECTION_IN << 8 | PPP_CONTROL): + case (PPP_PPPD_IN << 8 | PPP_CONTROL): if (ndo->ndo_eflag) ND_PRINT("In "); p += 2; length -= 2; hdr_len += 2; break; - case (PPP_WITHDIRECTION_OUT << 8 | PPP_CONTROL): + case (PPP_PPPD_OUT << 8 | PPP_CONTROL): if (ndo->ndo_eflag) ND_PRINT("Out "); p += 2; length -= 2; @@ -201,8 +201,8 @@ static const struct printer printers[] = { { ppp_hdlc_if_print, DLT_PPP_SERIAL }, #endif { ppp_if_print, DLT_PPP }, -#ifdef DLT_PPP_WITHDIRECTION - { ppp_if_print, DLT_PPP_WITHDIRECTION }, +#ifdef DLT_PPP_PPPD + { ppp_if_print, DLT_PPP_PPPD }, #endif #ifdef DLT_PPP_ETHER { pppoe_if_print, DLT_PPP_ETHER }, |