NDOize OSPFv3 decoder

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index c1ebcae9e14f82e7b425bccf9871f3705a78cc50..efbb8cfdbb591aac5eab40135eb734b90ae561ef 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -93,26 +93,26 @@ ether_hdr_print(netdissect_options *ndo,
 
        ep = (const struct ether_header *)bp;
 
 
        ep = (const struct ether_header *)bp;
 

-       (void)ND_PRINT((ndo, "%s > %s",
+       ND_PRINT((ndo, "%s > %s",

                     etheraddr_string(ESRC(ep)),
                     etheraddr_string(EDST(ep))));
 
        ether_type = EXTRACT_16BITS(&ep->ether_type);
        if (!ndo->ndo_qflag) {
                if (ether_type <= ETHERMTU)
                     etheraddr_string(ESRC(ep)),
                     etheraddr_string(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
                 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)
                                       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
                 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)
                        }
 
                        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 ||
                }
        } else if (ether_type == ETHERTYPE_8021Q  ||
                 ether_type == ETHERTYPE_8021Q9100 ||


@@ -217,7 +217,7 @@ recurse:
                        }
 
                        if (!ndo->ndo_suppress_default_print)
                        }
 
                        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) {
                }
        } else {
                if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {


@@ -229,7 +229,7 @@ recurse:
                        }
 
                        if (!ndo->ndo_suppress_default_print)
                        }
 
                        if (!ndo->ndo_suppress_default_print)

-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);

                }
        }
 }
                }
        }
 }


@@ -341,7 +341,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_ATALK:
                if (ndo->ndo_vflag)
 
        case ETHERTYPE_ATALK:
                if (ndo->ndo_vflag)

-                       fputs("et1 ", stdout);
+                       ND_PRINT((ndo, "et1 "));

                atalk_print(/*ndo,*/p, length);
                return (1);
 
                atalk_print(/*ndo,*/p, length);
                return (1);
 


@@ -385,7 +385,7 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_SLOW:
                return (1);
 
        case ETHERTYPE_SLOW:

-               slow_print(/*ndo,*/p, length);
+               slow_print(ndo, p, length);

                return (1);
 
        case ETHERTYPE_CFM:
                return (1);
 
        case ETHERTYPE_CFM: