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.

diff --git a/ppp.h b/ppp.h
index 9d53423f3b7c4c253d5080606bc54585871958d8..2bf93402493eb2ab8a02717f8e6f03bfe579f8e8 100644 (file)
--- a/ppp.h
+++ b/ppp.h
@@ -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 4409ee7868cfd8a6e0a96f419be51d29108170a9..8e2024de0e110337df27623411463b462a20316c 100644 (file)
--- 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;

diff --git a/print.c b/print.c
index 5b776d612644e296b6763db22b337ce61d1f9e0d..ee64843e2c3fcf6fc9689968babd513d2ceaedfc 100644 (file)
--- a/print.c
+++ b/print.c
@@ -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 },