NDOize OSPFv3 decoder

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 4bc8ad3a3d2e4738209c9065b143978bd1976693..efbb8cfdbb591aac5eab40135eb734b90ae561ef 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -18,10 +18,6 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.106 2008-02-06 10:47:53 guy Exp $ (LBL)";
-#endif

 
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H


@@ -30,16 +26,13 @@ static const char rcsid[] _U_ =
 
 #include <tcpdump-stdinc.h>
 
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <pcap.h>
-

 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "ether.h"
 
 #include "interface.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 #include "ether.h"
 

-const struct tok ethertype_values[] = { 
+const struct tok ethertype_values[] = {

     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },
     { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },
     { ETHERTYPE_IP,            "IPv4" },
     { ETHERTYPE_MPLS,          "MPLS unicast" },
     { ETHERTYPE_MPLS_MULTI,    "MPLS multicast" },


@@ -84,7 +77,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
     { ETHERTYPE_LLDP,           "LLDP" },
     { ETHERTYPE_CFM_OLD,        "CFM (old)" },
     { ETHERTYPE_CFM,            "CFM" },
     { ETHERTYPE_LLDP,           "LLDP" },

-    { ETHERTYPE_TIPC,           "TIPC"},       
+    { ETHERTYPE_TIPC,           "TIPC"},

     { ETHERTYPE_GEONET_OLD,     "GeoNet (old)"},
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_GEONET_OLD,     "GeoNet (old)"},
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},


@@ -100,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"));
-                else 
-                         (void)ND_PRINT((ndo, ", ethertype %s (0x%04x)",
+                         ND_PRINT((ndo, ", 802.3"));
+                else
+                         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"));
-                else 
-                          (void)ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
+                          ND_PRINT((ndo, ", 802.3"));
+                else
+                          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));

 }
 
 /*
 }
 
 /*


@@ -163,7 +156,7 @@ recurse:
         */
        if (ether_type <= ETHERMTU) {
                /* Try to print the LLC-layer header & higher layers */
         */
        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) {
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!ndo->ndo_eflag) {


@@ -173,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 ||


@@ -214,7 +207,7 @@ recurse:
                 * there's an LLC header and payload.
                 */
                /* Try to print the LLC-layer header & higher layers */
                 * 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) {
                    &extracted_ether_type) == 0) {
                        /* ether_type not known, print raw packet */
                        if (!ndo->ndo_eflag) {


@@ -224,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) {


@@ -236,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);

                }
        }
 }
                }
        }
 }


@@ -273,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) {
         * 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);
        }
 
                return (h->caplen);
        }
 


@@ -303,7 +296,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
         * preamble, and SOF.
         */
        if (h->len < 12 || h->caplen < 12) {
         * preamble, and SOF.
         */
        if (h->len < 12 || h->caplen < 12) {

-               printf("[|netanalyzer-transparent]");
+               ND_PRINT((ndo, "[|netanalyzer-transparent]"));

                return (h->caplen);
        }
 
                return (h->caplen);
        }
 


@@ -348,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);
 


@@ -358,7 +351,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_IPX:
                ND_PRINT((ndo, "(NOV-ETHII) "));
 
        case ETHERTYPE_IPX:
                ND_PRINT((ndo, "(NOV-ETHII) "));

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

                return (1);
 
         case ETHERTYPE_ISO:
                return (1);
 
         case ETHERTYPE_ISO:


@@ -369,7 +362,7 @@ ethertype_print(netdissect_options *ndo,
        case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:
        case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:

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

                return (1);
 
        case ETHERTYPE_EAPOL:
                return (1);
 
        case ETHERTYPE_EAPOL:


@@ -382,17 +375,17 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_PPP:
                if (length) {
 
        case ETHERTYPE_PPP:
                if (length) {

-                       printf(": ");
+                       ND_PRINT((ndo, ": "));

                        ppp_print(/*ndo,*/p, length);
                }
                return (1);
 
        case ETHERTYPE_MPCP:
                        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:
                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:


@@ -405,11 +398,12 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
         case ETHERTYPE_LOOPBACK:
                return (1);
 
         case ETHERTYPE_LOOPBACK:

+               loopback_print(ndo, p, length);

                 return (1);
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:
                 return (1);
 
        case ETHERTYPE_MPLS:
        case ETHERTYPE_MPLS_MULTI:

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

                return (1);
 
        case ETHERTYPE_TIPC:
                return (1);
 
        case ETHERTYPE_TIPC: