Fix some comments

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index f4906260baad56d9cc82f9555f42b7b44e7abb48..1e3cbfbc301c285b77313dc20f9afab1c18a0a80 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -23,9 +23,9 @@
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -82,6 +82,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_GEONET,         "GeoNet"},
     { ETHERTYPE_CALM_FAST,      "CALM FAST"},
     { ETHERTYPE_AOE,            "AoE" },
+    { ETHERTYPE_MEDSA,          "MEDSA" },
     { 0, NULL}
 };
 
@@ -127,7 +128,7 @@ 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_short ether_type;
        u_int hdrlen;
@@ -151,7 +152,7 @@ ether_print(netdissect_options *ndo,
 
        length -= ETHER_HDRLEN;
        caplen -= ETHER_HDRLEN;
-       ep = (struct ether_header *)p;
+       ep = (const struct ether_header *)p;
        p += ETHER_HDRLEN;
        hdrlen = ETHER_HDRLEN;
 
@@ -188,7 +189,7 @@ recurse:
                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {
-                       uint16_t tag = EXTRACT_16BITS(p);
+                       uint16_t tag = EXTRACT_16BITS(p);
 
                        ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
                }
@@ -226,7 +227,7 @@ recurse:
                        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)
@@ -238,9 +239,9 @@ recurse:
 
 /*
  * 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,
@@ -251,9 +252,9 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
 /*
  * 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.
@@ -276,9 +277,9 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
 /*
  * 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
@@ -326,7 +327,7 @@ ethertype_print(netdissect_options *ndo,
 
        case ETHERTYPE_ARP:
        case ETHERTYPE_REVARP:
-               arp_print(ndo, p, length, caplen);
+               arp_print(ndo, p, length, caplen);
                return (1);
 
        case ETHERTYPE_DN:
@@ -421,6 +422,10 @@ ethertype_print(netdissect_options *ndo,
                aoe_print(ndo, p, length);
                return (1);
 
+       case ETHERTYPE_MEDSA:
+               medsa_print(ndo, p, length, caplen);
+               return (1);
+
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: