Update WinDump.dsp

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 231c072842b343cea7b115de5bf4db4bf176c2b8..7e9f78bea2881c99a6ecf55538cf2de2a37ec763 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -89,30 +89,30 @@ ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {
        register const struct ether_header *ep;
-       u_int16_t ether_type;
+       uint16_t ether_type;
 
        ep = (const struct ether_header *)bp;
 
-       (void)ND_PRINT((ndo, "%s > %s",
-                    etheraddr_string(ESRC(ep)),
-                    etheraddr_string(EDST(ep))));
+       ND_PRINT((ndo, "%s > %s",
+                    etheraddr_string(ndo, ESRC(ep)),
+                    etheraddr_string(ndo, EDST(ep))));
 
        ether_type = EXTRACT_16BITS(&ep->ether_type);
        if (!ndo->ndo_qflag) {
                if (ether_type <= ETHERMTU)
-                         (void)ND_PRINT((ndo, ", 802.3"));
+                         ND_PRINT((ndo, ", 802.3"));
                 else
-                         (void)ND_PRINT((ndo, ", ethertype %s (0x%04x)",
+                         ND_PRINT((ndo, ", ethertype %s (0x%04x)",
                                       tok2str(ethertype_values,"Unknown", ether_type),
                                        ether_type));
         } else {
                 if (ether_type <= ETHERMTU)
-                          (void)ND_PRINT((ndo, ", 802.3"));
+                          ND_PRINT((ndo, ", 802.3"));
                 else
-                          (void)ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
+                          ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
         }
 
-       (void)ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT((ndo, ", length %u: ", length));
 }
 
 /*
@@ -166,7 +166,7 @@ recurse:
                        }
 
                        if (!ndo->ndo_suppress_default_print)
-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);
                }
        } else if (ether_type == ETHERTYPE_8021Q  ||
                 ether_type == ETHERTYPE_8021Q9100 ||
@@ -181,7 +181,7 @@ recurse:
                        return;
                }
                if (ndo->ndo_eflag) {
-                       u_int16_t tag = EXTRACT_16BITS(p);
+                       uint16_t tag = EXTRACT_16BITS(p);
 
                        ND_PRINT((ndo, "vlan %u, p %u%s, ",
                            tag & 0xfff,
@@ -217,7 +217,7 @@ recurse:
                        }
 
                        if (!ndo->ndo_suppress_default_print)
-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);
                }
        } else {
                if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
@@ -229,7 +229,7 @@ recurse:
                        }
 
                        if (!ndo->ndo_suppress_default_print)
-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);
                }
        }
 }
@@ -336,17 +336,17 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_DN:
-               decnet_print(/*ndo,*/p, length, caplen);
+               decnet_print(ndo, p, length, caplen);
                return (1);
 
        case ETHERTYPE_ATALK:
                if (ndo->ndo_vflag)
-                       fputs("et1 ", stdout);
-               atalk_print(/*ndo,*/p, length);
+                       ND_PRINT((ndo, "et1 "));
+               atalk_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_AARP:
-               aarp_print(/*ndo,*/p, length);
+               aarp_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_IPX:
@@ -354,9 +354,9 @@ ethertype_print(netdissect_options *ndo,
                ipx_print(ndo, p, length);
                return (1);
 
-        case ETHERTYPE_ISO:
-                isoclns_print(/*ndo,*/p+1, length-1, length-1);
-                return(1);
+       case ETHERTYPE_ISO:
+               isoclns_print(ndo, p + 1, length - 1, length - 1);
+               return(1);
 
        case ETHERTYPE_PPPOED:
        case ETHERTYPE_PPPOES:
@@ -376,7 +376,7 @@ ethertype_print(netdissect_options *ndo,
        case ETHERTYPE_PPP:
                if (length) {
                        ND_PRINT((ndo, ": "));
-                       ppp_print(/*ndo,*/p, length);
+                       ppp_print(ndo, p, length);
                }
                return (1);
 
@@ -390,11 +390,11 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_CFM:
        case ETHERTYPE_CFM_OLD:
-               cfm_print(/*ndo,*/p, length);
+               cfm_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_LLDP:
-               lldp_print(/*ndo,*/p, length);
+               lldp_print(ndo, p, length);
                return (1);
 
         case ETHERTYPE_LOOPBACK: