Add the ndo_protocol field in the netdissect_options structure

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 0a331d188b8f10c344379b8bc0626a091be6ecd4..112c6e812ba22e82877da053d1537eacbc0cb55e 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -157,6 +157,7 @@ ether_print(netdissect_options *ndo,
        int llc_hdrlen;
        struct lladdr_info src, dst;
 
+       ndo->ndo_protocol = "ether";
        if (caplen < ETHER_HDRLEN) {
                ND_PRINT("[|ether]");
                return (caplen);
@@ -274,6 +275,7 @@ u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
                const u_char *p)
 {
+       ndo->ndo_protocol = "ether_if";
        return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));
 }
 
@@ -293,6 +295,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header.
         */
+       ndo->ndo_protocol = "netanalyzer_if";
        if (h->len < 4 || h->caplen < 4) {
                ND_PRINT("[|netanalyzer]");
                return (h->caplen);
@@ -321,6 +324,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
         * Fail if we don't have enough data for the Hilscher pseudo-header,
         * preamble, and SOF.
         */
+       ndo->ndo_protocol = "netanalyzer_transparent_if";
        if (h->len < 12 || h->caplen < 12) {
                ND_PRINT("[|netanalyzer-transparent]");
                return (h->caplen);