Change name of Hilscher link types to say NETANALYER.

That makes the names a bit shorter, and mentions the specific Hilscher
product to which they apply.

diff --git a/netdissect.h b/netdissect.h
index 501f5a7145678cdbc7fb8278e3fc89fbe2179aec..5b589c78ac7dc75ba804c0b52366eb504e6b7b64 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -299,11 +299,11 @@ extern void ether_print(netdissect_options *,
 
 extern u_int ether_if_print(netdissect_options *, 
                             const struct pcap_pkthdr *,const u_char *);
-extern u_int ether_hilscher_if_print(netdissect_options *, 
-                                     const struct pcap_pkthdr *,const u_char *);
-extern u_int ether_hilscher_transparent_if_print(netdissect_options *, 
-                                                 const struct pcap_pkthdr *,
-                                                 const u_char *);
+extern u_int netanalyzer_if_print(netdissect_options *, 
+                                  const struct pcap_pkthdr *,const u_char *);
+extern u_int netanalyzer_transparent_if_print(netdissect_options *, 
+                                              const struct pcap_pkthdr *,
+                                              const u_char *);
 
 extern int ethertype_print(netdissect_options *,u_short, const u_char *,
                             u_int, u_int);

diff --git a/print-ether.c b/print-ether.c
index 087b0e4d9d4943bdeb6c41538302e16de4ebd031..76505721af3e0594589fd7caa449f8148d7525c9 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -258,18 +258,18 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * '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_ETHERNET_HILSCHER, which has a 4-byte pseudo-header
+ * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header
  * before the Ethernet header.
  */
 u_int
-ether_hilscher_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
-                        const u_char *p)
+netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
+                     const u_char *p)
 {
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header.
         */
        if (h->len < 4 || h->caplen < 4) {
-               printf("[|hilscher]");
+               printf("[|netanalyzer]");
                return (h->caplen);
        }
 
@@ -285,21 +285,21 @@ ether_hilscher_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * '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_ETHERNET_HILSCHER_TRANSPARENT, which has a 4-byte
+ * This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte
  * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF
  * before the Ethernet header.
  */
 u_int
-ether_hilscher_transparent_if_print(netdissect_options *ndo,
-                                    const struct pcap_pkthdr *h,
-                                    const u_char *p)
+netanalyzer_transparent_if_print(netdissect_options *ndo,
+                                 const struct pcap_pkthdr *h,
+                                 const u_char *p)
 {
        /*
         * Fail if we don't have enough data for the Hilscher pseudo-header,
         * preamble, and SOF.
         */
        if (h->len < 12 || h->caplen < 12) {
-               printf("[|hilscher-transparent]");
+               printf("[|netanalyzer-transparent]");
                return (h->caplen);
        }
 

diff --git a/tcpdump.c b/tcpdump.c
index 37ac27a76874aaffabb7bdd3748500c8ccb3515a..ee9304d55f8cc8aeeef0bc5d348945fe4ac52797 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -315,11 +315,11 @@ static struct ndo_printer ndo_printers[] = {
 #ifdef DLT_PPI
        { ppi_if_print,         DLT_PPI },
 #endif
-#ifdef DLT_ETHERNET_HILSCHER
-       { ether_hilscher_if_print, DLT_ETHERNET_HILSCHER },
+#ifdef DLT_NETANALYZER
+       { netanalyzer_if_print, DLT_NETANALYZER },
 #endif
-#ifdef DLT_ETHERNET_HILSCHER_TRANSPARENT
-       { ether_hilscher_transparent_if_print, DLT_ETHERNET_HILSCHER_TRANSPARENT },
+#ifdef DLT_NETANALYZER_TRANSPARENT
+       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
 #endif
        { NULL,                 0 },
 };