Revert partially the commit 21b1273

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 5b776d612644e296b6763db22b337ce61d1f9e0d..6e4cf8937a31fc7b3caa2b05bc44bdcad34533b3 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 },
@@ -403,7 +403,7 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                (ndo->ndo_if_printer)(ndo, h, sp);
        } else {
                /* A printer quit because the packet was truncated; report it */
-               ND_PRINT(" [|%s]", ndo->ndo_protocol);
+               nd_print_trunc(ndo);
        }
        hdrlen = ndo->ndo_ll_hdr_len;