Fix mkdep invocations.

[tcpdump] / print-vrrp.c

diff --git a/print-vrrp.c b/print-vrrp.c
index f739d1ed71659cfebc69f3f63a02a8da0e682890..fe3104f92dd57e99ce3cb4a208f002128c066196 100644 (file)
--- a/print-vrrp.c
+++ b/print-vrrp.c
@@ -23,14 +23,15 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#define NETDISSECT_REWORKED
+/* \summary: Virtual Router Redundancy Protocol (VRRP) printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #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"
 
 #include "extract.h"
 #include "addrtoname.h"
 


@@ -119,13 +120,13 @@ vrrp_print(netdissect_options *ndo,
        if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)
                return;
        ND_TCHECK(bp[2]);
        if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT)
                return;
        ND_TCHECK(bp[2]);

-       ND_PRINT((ndo, ", vrid %u, prio %u", bp[1], bp[2]));
+       ND_PRINT((ndo, ", vrid %u, prio %u", EXTRACT_U_1(bp + 1), EXTRACT_U_1(bp + 2)));

        ND_TCHECK(bp[5]);
 
        if (version == 2) {
                auth_type = bp[4];
                ND_PRINT((ndo, ", authtype %s", tok2str(auth2str, NULL, auth_type)));
        ND_TCHECK(bp[5]);
 
        if (version == 2) {
                auth_type = bp[4];
                ND_PRINT((ndo, ", authtype %s", tok2str(auth2str, NULL, auth_type)));

-               ND_PRINT((ndo, ", intvl %us, length %u", bp[5], len));
+               ND_PRINT((ndo, ", intvl %us, length %u", EXTRACT_U_1(bp + 5), len));

        } else { /* version == 3 */
                uint16_t intvl = (bp[4] & 0x0f) << 8 | bp[5];
                ND_PRINT((ndo, ", intvl %ucs, length %u", intvl, len));
        } else { /* version == 3 */
                uint16_t intvl = (bp[4] & 0x0f) << 8 | bp[5];
                ND_PRINT((ndo, ", intvl %ucs, length %u", intvl, len));


@@ -143,15 +144,15 @@ vrrp_print(netdissect_options *ndo,
                        vec[0].len = len;
                        if (in_cksum(vec, 1))
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",
                        vec[0].len = len;
                        if (in_cksum(vec, 1))
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",

-                                       EXTRACT_16BITS(&bp[6])));
+                                       EXTRACT_BE_U_2(bp + 6)));

                }
 
                if (version == 3 && ND_TTEST2(bp[0], len)) {
                }
 
                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)",
                                len, len, IPPROTO_VRRP);
                        if (cksum)
                                ND_PRINT((ndo, ", (bad vrrp cksum %x)",

-                                       EXTRACT_16BITS(&bp[6])));
+                                       EXTRACT_BE_U_2(bp + 6)));

                }
 
                ND_PRINT((ndo, ", addrs"));
                }
 
                ND_PRINT((ndo, ", addrs"));