Add changes in 4.2.1.

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index 501f5a7145678cdbc7fb8278e3fc89fbe2179aec..0c66dfaf809487800dcb10db80f5c8f89829ab4a 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);
@@ -450,6 +450,8 @@ extern void l2tp_print(netdissect_options *,const u_char *, u_int);
 extern void lcp_print(netdissect_options *,const u_char *, u_int);
 extern void vrrp_print(netdissect_options *,const u_char *bp,
                       u_int len, int ttl);
+extern void carp_print(netdissect_options *,const u_char *bp,
+                      u_int len, int ttl);
 extern void cdp_print(netdissect_options *,const u_char *,
                      u_int, u_int, const u_char *, const u_char *);
 extern void stp_print(netdissect_options *,const u_char *p, u_int length);