Remove EXTRACT_LE_8BITS() macro, use EXTRACT_8BITS() macro

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index 30f89d3419d6a044ff5f30c620f4c4e972415682..e2bfce146fb88b0be77527028df1392d683a228e 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,13 +23,15 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Virtual Router Redundancy Protocol (VRRP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 
@@ -142,15 +144,15 @@ vrrp_print(netdissect_options *ndo,
                        vec[0].len = len;
                        if (in_cksum(vec, 1))
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
-                                       EXTRACT_16BITS(&bp[6])));
+                                       EXTRACT_BE_16BITS(&bp[6])));
                }
 
                if (version == 3 && ND_TTEST2(bp[0], len)) {
-                       uint16_t cksum = nextproto4_cksum(ndo, (struct ip *)bp2, bp,
+                       uint16_t cksum = nextproto4_cksum(ndo, (const struct ip *)bp2, bp,
                                len, len, IPPROTO_VRRP);
                        if (cksum)
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
-                                       EXTRACT_16BITS(&bp[6])));
+                                       EXTRACT_BE_16BITS(&bp[6])));
                }
 
                ND_PRINT((ndo, ", addrs"));