RIPng: Use more ND_TCHECK_SIZE() macros

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index f4906260baad56d9cc82f9555f42b7b44e7abb48..73947a05773f4bc7b6be7a0c0c469fbd0e6bd1e6 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -19,17 +19,34 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: Ethernet printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

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

-#include "ether.h"
+
+/*
+ * Structure of an Ethernet header.
+ */
+struct ether_header {
+       nd_mac_addr     ether_dhost;
+       nd_mac_addr     ether_shost;
+       nd_uint16_t     ether_length_type;
+};
+
+/*
+ * Length of an Ethernet header; note that some compilers may pad
+ * "struct ether_header" to a multiple of 4 bytes, for example, so
+ * "sizeof (struct ether_header)" may not give the right answer.
+ */
+#define ETHER_HDRLEN           14

 
 const struct tok ethertype_values[] = {
     { ETHERTYPE_IP,            "IPv4" },
 
 const struct tok ethertype_values[] = {
     { ETHERTYPE_IP,            "IPv4" },


@@ -70,6 +87,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_RRCP,           "RRCP" },
     { ETHERTYPE_MS_NLB_HB,      "MS NLB heartbeat" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
     { ETHERTYPE_RRCP,           "RRCP" },
     { ETHERTYPE_MS_NLB_HB,      "MS NLB heartbeat" },
     { ETHERTYPE_JUMBO,          "Jumbo" },

+    { ETHERTYPE_NSH,            "NSH" },

     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_GRE_ISO,        "GRE-OSI" },


@@ -82,6 +100,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },

+    { ETHERTYPE_MEDSA,          "MEDSA" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 


@@ -89,31 +108,33 @@ static inline void
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {

-       register const struct ether_header *ep;
-       uint16_t ether_type;
+       const struct ether_header *ep;
+       uint16_t length_type;

 
        ep = (const struct ether_header *)bp;
 
 
        ep = (const struct ether_header *)bp;
 

-       ND_PRINT((ndo, "%s > %s",
-                    etheraddr_string(ndo, ESRC(ep)),
-                    etheraddr_string(ndo, EDST(ep))));
+       ND_PRINT("%s > %s",
+                    etheraddr_string(ndo, ep->ether_shost),
+                    etheraddr_string(ndo, ep->ether_dhost));

 
 

-       ether_type = EXTRACT_16BITS(&ep->ether_type);
+       length_type = EXTRACT_BE_U_2(ep->ether_length_type);

        if (!ndo->ndo_qflag) {
        if (!ndo->ndo_qflag) {

-               if (ether_type <= ETHERMTU)
-                         ND_PRINT((ndo, ", 802.3"));
-                else
-                         ND_PRINT((ndo, ", ethertype %s (0x%04x)",
-                                      tok2str(ethertype_values,"Unknown", ether_type),
-                                       ether_type));
+               if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
+                       ND_PRINT(", 802.3");
+                       length = length_type;
+               } else
+                       ND_PRINT(", ethertype %s (0x%04x)",
+                                      tok2str(ethertype_values,"Unknown", length_type),
+                                       length_type);

         } else {
         } else {

-                if (ether_type <= ETHERMTU)
-                          ND_PRINT((ndo, ", 802.3"));
-                else
-                          ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type)));
+                if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
+                        ND_PRINT(", 802.3");
+                       length = length_type;
+               } else
+                        ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type));

         }
 
         }
 

-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);

 }
 
 /*
 }
 
 /*


@@ -121,24 +142,27 @@ ether_hdr_print(netdissect_options *ndo,
  * This might be encapsulated within another frame; we might be passed
  * a pointer to a function that can print header information for that
  * frame's protocol, and an argument to pass to that function.
  * This might be encapsulated within another frame; we might be passed
  * a pointer to a function that can print header information for that
  * frame's protocol, and an argument to pass to that function.

+ *
+ * FIXME: caplen can and should be derived from ndo->ndo_snapend and p.

  */
 u_int
 ether_print(netdissect_options *ndo,
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {
  */
 u_int
 ether_print(netdissect_options *ndo,
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {

-       struct ether_header *ep;
+       const struct ether_header *ep;

        u_int orig_length;
        u_int orig_length;

-       u_short ether_type;
+       u_short length_type;

        u_int hdrlen;
        int llc_hdrlen;
        u_int hdrlen;
        int llc_hdrlen;

+       struct lladdr_info src, dst;

 
        if (caplen < ETHER_HDRLEN) {
 
        if (caplen < ETHER_HDRLEN) {

-               ND_PRINT((ndo, "[|ether]"));
+               ND_PRINT("[|ether]");

                return (caplen);
        }
        if (length < ETHER_HDRLEN) {
                return (caplen);
        }
        if (length < ETHER_HDRLEN) {

-               ND_PRINT((ndo, "[|ether]"));
+               ND_PRINT("[|ether]");

                return (length);
        }
 
                return (length);
        }
 


@@ -151,19 +175,23 @@ ether_print(netdissect_options *ndo,
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;

-       ep = (struct ether_header *)p;
+       ep = (const struct ether_header *)p;

        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 
        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 

-       ether_type = EXTRACT_16BITS(&ep->ether_type);
+       src.addr = ep->ether_shost;
+       src.addr_string = etheraddr_string;
+       dst.addr = ep->ether_dhost;
+       dst.addr_string = etheraddr_string;
+       length_type = EXTRACT_BE_U_2(ep->ether_length_type);

 
 recurse:
        /*
         * Is it (gag) an 802.3 encapsulation?
         */
 
 recurse:
        /*
         * Is it (gag) an 802.3 encapsulation?
         */

-       if (ether_type <= ETHERMTU) {
+       if (length_type <= MAX_ETHERNET_LENGTH_VAL) {

                /* Try to print the LLC-layer header & higher layers */
                /* Try to print the LLC-layer header & higher layers */

-               llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep));
+               llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);

                if (llc_hdrlen < 0) {
                        /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
                if (llc_hdrlen < 0) {
                        /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)


@@ -171,37 +199,37 @@ recurse:
                        llc_hdrlen = -llc_hdrlen;
                }
                hdrlen += llc_hdrlen;
                        llc_hdrlen = -llc_hdrlen;
                }
                hdrlen += llc_hdrlen;

-       } else if (ether_type == ETHERTYPE_8021Q  ||
-                ether_type == ETHERTYPE_8021Q9100 ||
-                ether_type == ETHERTYPE_8021Q9200 ||
-                ether_type == ETHERTYPE_8021QinQ) {
+       } else if (length_type == ETHERTYPE_8021Q  ||
+                length_type == ETHERTYPE_8021Q9100 ||
+                length_type == ETHERTYPE_8021Q9200 ||
+                length_type == ETHERTYPE_8021QinQ) {

                /*
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */
                if (caplen < 4) {
                /*
                 * Print VLAN information, and then go back and process
                 * the enclosed type field.
                 */
                if (caplen < 4) {

-                       ND_PRINT((ndo, "[|vlan]"));
+                       ND_PRINT("[|vlan]");

                        return (hdrlen + caplen);
                }
                if (length < 4) {
                        return (hdrlen + caplen);
                }
                if (length < 4) {

-                       ND_PRINT((ndo, "[|vlan]"));
+                       ND_PRINT("[|vlan]");

                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {
                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {

-                       uint16_t tag = EXTRACT_16BITS(p);
+                       uint16_t tag = EXTRACT_BE_U_2(p);

 
 

-                       ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
+                       ND_PRINT("%s, ", ieee8021q_tci_string(tag));

                }
 
                }
 

-               ether_type = EXTRACT_16BITS(p + 2);
-               if (ndo->ndo_eflag && ether_type > ETHERMTU)
-                       ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", ether_type)));
+               length_type = EXTRACT_BE_U_2(p + 2);
+               if (ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL)
+                       ND_PRINT("ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type));

                p += 4;
                length -= 4;
                caplen -= 4;
                hdrlen += 4;
                goto recurse;
                p += 4;
                length -= 4;
                caplen -= 4;
                hdrlen += 4;
                goto recurse;

-       } else if (ether_type == ETHERTYPE_JUMBO) {
+       } else if (length_type == ETHERTYPE_JUMBO) {

                /*
                 * Alteon jumbo frames.
                 * See
                /*
                 * Alteon jumbo frames.
                 * See


@@ -212,7 +240,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 */

-               llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep));
+               llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);

                if (llc_hdrlen < 0) {
                        /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
                if (llc_hdrlen < 0) {
                        /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)


@@ -221,12 +249,12 @@ recurse:
                }
                hdrlen += llc_hdrlen;
        } else {
                }
                hdrlen += llc_hdrlen;
        } else {

-               if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
-                       /* ether_type not known, print raw packet */
+               if (ethertype_print(ndo, length_type, p, length, caplen, &src, &dst) == 0) {
+                       /* type not known, print raw packet */

                        if (!ndo->ndo_eflag) {
                                if (print_encap_header != NULL)
                                        (*print_encap_header)(ndo, encap_header_arg);
                        if (!ndo->ndo_eflag) {
                                if (print_encap_header != NULL)
                                        (*print_encap_header)(ndo, encap_header_arg);

-                               ether_hdr_print(ndo, (u_char *)ep, orig_length);
+                               ether_hdr_print(ndo, (const u_char *)ep, orig_length);

                        }
 
                        if (!ndo->ndo_suppress_default_print)
                        }
 
                        if (!ndo->ndo_suppress_default_print)


@@ -238,9 +266,9 @@ recurse:
 
 /*
  * This is the top level routine of the printer.  'p' points
 
 /*
  * This is the top level routine of the printer.  'p' points

- * to the ether header of the packet, 'h->ts' is the timestamp,
- * 'h->len' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
+ * to the ether header of the packet, 'h->len' is the length
+ * of the packet off the wire, and 'h->caplen' is the number
+ * of bytes actually captured.

  */
 u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  */
 u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,


@@ -251,9 +279,9 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
 /*
  * This is the top level routine of the printer.  'p' points
 
 /*
  * This is the top level routine of the printer.  'p' points

- * to the ether header of the packet, 'h->ts' is the timestamp,
- * 'h->len' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
+ * to the ether header of the packet, 'h->len' is the length
+ * of the packet off the wire, and 'h->caplen' is the number
+ * of bytes actually captured.

  *
  * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header
  * before the Ethernet header.
  *
  * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header
  * before the Ethernet header.


@@ -266,7 +294,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) {

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

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


@@ -276,9 +304,9 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
 /*
  * This is the top level routine of the printer.  'p' points
 
 /*
  * This is the top level routine of the printer.  'p' points

- * to the ether header of the packet, 'h->ts' is the timestamp,
- * 'h->len' is the length of the packet off the wire, and 'h->caplen'
- * is the number of bytes actually captured.
+ * to the ether header of the packet, 'h->len' is the length
+ * of the packet off the wire, and 'h->caplen' is the number
+ * of bytes actually captured.

  *
  * This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte
  * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF
  *
  * This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte
  * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF


@@ -294,7 +322,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) {

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

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


@@ -312,7 +340,8 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
 int
 ethertype_print(netdissect_options *ndo,
                 u_short ether_type, const u_char *p,
 int
 ethertype_print(netdissect_options *ndo,
                 u_short ether_type, const u_char *p,

-                u_int length, u_int caplen)
+                u_int length, u_int caplen,
+                const struct lladdr_info *src, const struct lladdr_info *dst)

 {
        switch (ether_type) {
 
 {
        switch (ether_type) {
 


@@ -326,7 +355,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:

-               arp_print(ndo, p, length, caplen);
+               arp_print(ndo, p, length, caplen);

                return (1);
 
        case ETHERTYPE_DN:
                return (1);
 
        case ETHERTYPE_DN:


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

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

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


@@ -344,12 +373,16 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_IPX:
                return (1);
 
        case ETHERTYPE_IPX:

-               ND_PRINT((ndo, "(NOV-ETHII) "));
+               ND_PRINT("(NOV-ETHII) ");

                ipx_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_ISO:
                ipx_print(ndo, p, length);
                return (1);
 
        case ETHERTYPE_ISO:

-               isoclns_print(ndo, p + 1, length - 1, length - 1);
+               if (length == 0 || caplen == 0) {
+                       ND_PRINT(" [|osi]");
+                       return (1);
+               }
+               isoclns_print(ndo, p + 1, length - 1);

                return(1);
 
        case ETHERTYPE_PPPOED:
                return(1);
 
        case ETHERTYPE_PPPOED:


@@ -364,12 +397,12 @@ ethertype_print(netdissect_options *ndo,
                return (1);
 
        case ETHERTYPE_RRCP:
                return (1);
 
        case ETHERTYPE_RRCP:

-               rrcp_print(ndo, p - 14 , length + 14);
+               rrcp_print(ndo, p, length, src, dst);

                return (1);
 
        case ETHERTYPE_PPP:
                if (length) {
                return (1);
 
        case ETHERTYPE_PPP:
                if (length) {

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

                        ppp_print(ndo, p, length);
                }
                return (1);
                        ppp_print(ndo, p, length);
                }
                return (1);


@@ -391,6 +424,10 @@ ethertype_print(netdissect_options *ndo,
                lldp_print(ndo, p, length);
                return (1);
 
                lldp_print(ndo, p, length);
                return (1);
 

+        case ETHERTYPE_NSH:
+                nsh_print(ndo, p, length);
+                return (1);
+

         case ETHERTYPE_LOOPBACK:
                loopback_print(ndo, p, length);
                 return (1);
         case ETHERTYPE_LOOPBACK:
                loopback_print(ndo, p, length);
                 return (1);


@@ -410,17 +447,21 @@ ethertype_print(netdissect_options *ndo,
 
         case ETHERTYPE_GEONET_OLD:
         case ETHERTYPE_GEONET:
 
         case ETHERTYPE_GEONET_OLD:
         case ETHERTYPE_GEONET:

-                geonet_print(ndo, p-14, p, length);
+                geonet_print(ndo, p, length, src);

                 return (1);
 
         case ETHERTYPE_CALM_FAST:
                 return (1);
 
         case ETHERTYPE_CALM_FAST:

-                calm_fast_print(ndo, p-14, p, length);
+                calm_fast_print(ndo, p, length, src);

                 return (1);
 
        case ETHERTYPE_AOE:
                aoe_print(ndo, p, length);
                return (1);
 
                 return (1);
 
        case ETHERTYPE_AOE:
                aoe_print(ndo, p, length);
                return (1);
 

+       case ETHERTYPE_MEDSA:
+               medsa_print(ndo, p, length, caplen, src, dst);
+               return (1);
+

        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC:
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: