NDOize LLC decoder

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 84ad77d85ac57d60b4525a9000ed3d8a7c75195c..c1ebcae9e14f82e7b425bccf9871f3705a78cc50 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -26,8 +26,6 @@
 
 #include <tcpdump-stdinc.h>
 
-#include <stdio.h>
-
 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -158,7 +156,7 @@ recurse:
         */
        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
+               if (llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep),
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!ndo->ndo_eflag) {
@@ -209,7 +207,7 @@ recurse:
                 * there's an LLC header and payload.
                 */
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
+               if (llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep),
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!ndo->ndo_eflag) {
@@ -268,7 +266,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.
         */
        if (h->len < 4 || h->caplen < 4) {
-               printf("[|netanalyzer]");
+               ND_PRINT((ndo, "[|netanalyzer]"));
                return (h->caplen);
        }
 
@@ -298,7 +296,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
         * preamble, and SOF.
         */
        if (h->len < 12 || h->caplen < 12) {
-               printf("[|netanalyzer-transparent]");
+               ND_PRINT((ndo, "[|netanalyzer-transparent]"));
                return (h->caplen);
        }
 
@@ -353,7 +351,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_IPX:
                ND_PRINT((ndo, "(NOV-ETHII) "));
-               ipx_print(/*ndo,*/p, length);
+               ipx_print(ndo, p, length);
                return (1);
 
         case ETHERTYPE_ISO:
@@ -364,7 +362,7 @@ ethertype_print(netdissect_options *ndo,
        case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:
-               pppoe_print(/*ndo,*/p, length);
+               pppoe_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_EAPOL:
@@ -377,13 +375,13 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_PPP:
                if (length) {
-                       printf(": ");
+                       ND_PRINT((ndo, ": "));
                        ppp_print(/*ndo,*/p, length);
                }
                return (1);
 
        case ETHERTYPE_MPCP:
-               mpcp_print(/*ndo,*/p, length);
+               mpcp_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_SLOW:
@@ -405,7 +403,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
-               mpls_print(/*ndo,*/p, length);
+               mpls_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_TIPC: