mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename DLT_PPP_WITHDIRECTION to DLT_PPP_PPPD

Browse Source 
In libpcap DLT_PPP_WITHDIRECTION was renamed to
DLT_LINUX_PPP_WITHDIRECTION and after to DLT_PPP_PPPD.

Rename other #defines to match.
This commit is contained in:
Francois-Xavier Le Bail 2020-08-08 14:45:10 +02:00
parent 4482e16802
commit f5aa04085e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ppp.h
View File

@ -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 */

4
print-ppp.c
View File

@ -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;

4
print.c
View File

@ -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 },