NDOize 8 more small decoders

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 4bc8ad3a3d2e4738209c9065b143978bd1976693..b2ca0d13ae4d99b980aa4f87887e29da537ae9ef 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


@@ -31,7 +27,6 @@ static const char rcsid[] _U_ =
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>
 #include <tcpdump-stdinc.h>
 
 #include <stdio.h>

-#include <pcap.h>

 
 #include "interface.h"
 #include "extract.h"
 
 #include "interface.h"
 #include "extract.h"


@@ -39,7 +34,7 @@ static const char rcsid[] _U_ =
 #include "ethertype.h"
 #include "ether.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 +79,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"},


@@ -108,14 +103,14 @@ ether_hdr_print(netdissect_options *ndo,
        if (!ndo->ndo_qflag) {
                if (ether_type <= ETHERMTU)
                          (void)ND_PRINT((ndo, ", 802.3"));
        if (!ndo->ndo_qflag) {
                if (ether_type <= ETHERMTU)
                          (void)ND_PRINT((ndo, ", 802.3"));

-                else 
+                else

                          (void)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"));
                          (void)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"));

-                else 
+                else

                           (void)ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
         }
 
                           (void)ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
         }
 


@@ -358,7 +353,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 +364,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:


@@ -405,11 +400,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: