From: Denis Ovsienko Date: Sun, 23 Mar 2014 06:28:40 +0000 (+0400) Subject: NDOize VRRP decoder X-Git-Tag: tcpdump-4.6.0~160 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/a3d09832c69a1b261d0e1f1fc61d4b14ddd5f4a4 NDOize VRRP decoder --- diff --git a/interface.h b/interface.h index 65cf9904..3d614f80 100644 --- a/interface.h +++ b/interface.h @@ -227,7 +227,6 @@ extern void smb_tcp_print(const u_char *, int); extern char *smb_errstr(int, int); extern const char *nt_errstr(u_int32_t); extern void print_data(const unsigned char *, int); -extern void vrrp_print(const u_char *, u_int, const u_char *, int); extern void sflow_print(const u_char *, u_int); extern void cfm_print(const u_char *, u_int); extern void cdp_print(const u_char *, u_int, u_int); diff --git a/netdissect.h b/netdissect.h index 3d4c0199..b1aaab97 100644 --- a/netdissect.h +++ b/netdissect.h @@ -459,6 +459,7 @@ extern u_int enc_if_print(netdissect_options *, const struct pcap_pkthdr *, cons extern u_int sl_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *); extern u_int sl_bsdos_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *); extern void tftp_print(netdissect_options *, const u_char *, u_int); +extern void vrrp_print(netdissect_options *, const u_char *, u_int, const u_char *, int); /* stuff that has not yet been rototiled */ extern const u_char * ns_nprint (register const u_char *, register const u_char *); @@ -541,8 +542,6 @@ extern char *smb_errstr(netdissect_options *,int, int); extern const char *nt_errstr(netdissect_options *, u_int32_t); extern void print_data(netdissect_options *,const unsigned char *, 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 *, diff --git a/print-ip.c b/print-ip.c index 21108cdd..e43f6e29 100644 --- a/print-ip.c +++ b/print-ip.c @@ -470,7 +470,7 @@ again: (void)printf("vrrp %s > %s: ", ipaddr_string(&ipds->ip->ip_src), ipaddr_string(&ipds->ip->ip_dst)); - vrrp_print(ipds->cp, ipds->len, + vrrp_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip, ipds->ip->ip_ttl); } break; diff --git a/print-vrrp.c b/print-vrrp.c index 79206997..27105bf5 100644 --- a/print-vrrp.c +++ b/print-vrrp.c @@ -23,15 +23,13 @@ * FOR A PARTICULAR PURPOSE. */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include - #include "interface.h" #include "extract.h" #include "addrtoname.h" @@ -104,80 +102,81 @@ static const struct tok auth2str[] = { }; void -vrrp_print(register const u_char *bp, register u_int len, - register const u_char *bp2, int ttl) +vrrp_print(netdissect_options *ndo, + register const u_char *bp, register u_int len, + register const u_char *bp2, int ttl) { int version, type, auth_type = VRRP_AUTH_NONE; /* keep compiler happy */ const char *type_s; - TCHECK(bp[0]); + ND_TCHECK(bp[0]); version = (bp[0] & 0xf0) >> 4; type = bp[0] & 0x0f; type_s = tok2str(type2str, "unknown type (%u)", type); - printf("VRRPv%u, %s", version, type_s); + ND_PRINT((ndo, "VRRPv%u, %s", version, type_s)); if (ttl != 255) - printf(", (ttl %u)", ttl); + ND_PRINT((ndo, ", (ttl %u)", ttl)); if (version < 2 || version > 3 || type != VRRP_TYPE_ADVERTISEMENT) return; - TCHECK(bp[2]); - printf(", vrid %u, prio %u", bp[1], bp[2]); - TCHECK(bp[5]); + ND_TCHECK(bp[2]); + ND_PRINT((ndo, ", vrid %u, prio %u", bp[1], bp[2])); + ND_TCHECK(bp[5]); if (version == 2) { auth_type = bp[4]; - printf(", authtype %s", tok2str(auth2str, NULL, auth_type)); - printf(", intvl %us, length %u", bp[5], len); + ND_PRINT((ndo, ", authtype %s", tok2str(auth2str, NULL, auth_type))); + ND_PRINT((ndo, ", intvl %us, length %u", bp[5], len)); } else { /* version == 3 */ u_int16_t intvl = (bp[4] & 0x0f) << 8 | bp[5]; - printf(", intvl %ucs, length %u", intvl, len); + ND_PRINT((ndo, ", intvl %ucs, length %u", intvl, len)); } - if (vflag) { + if (ndo->ndo_vflag) { int naddrs = bp[3]; int i; char c; - if (version == 2 && TTEST2(bp[0], len)) { + if (version == 2 && ND_TTEST2(bp[0], len)) { struct cksum_vec vec[1]; vec[0].ptr = bp; vec[0].len = len; if (in_cksum(vec, 1)) - printf(", (bad vrrp cksum %x)", - EXTRACT_16BITS(&bp[6])); + ND_PRINT((ndo, ", (bad vrrp cksum %x)", + EXTRACT_16BITS(&bp[6]))); } - if (version == 3 && TTEST2(bp[0], len)) { + if (version == 3 && ND_TTEST2(bp[0], len)) { u_int16_t cksum = nextproto4_cksum((struct ip *)bp2, bp, len, len, IPPROTO_VRRP); if (cksum) - printf(", (bad vrrp cksum %x)", - EXTRACT_16BITS(&bp[6])); + ND_PRINT((ndo, ", (bad vrrp cksum %x)", + EXTRACT_16BITS(&bp[6]))); } - printf(", addrs"); + ND_PRINT((ndo, ", addrs")); if (naddrs > 1) - printf("(%d)", naddrs); - printf(":"); + ND_PRINT((ndo, "(%d)", naddrs)); + ND_PRINT((ndo, ":")); c = ' '; bp += 8; for (i = 0; i < naddrs; i++) { - TCHECK(bp[3]); - printf("%c%s", c, ipaddr_string(bp)); + ND_TCHECK(bp[3]); + ND_PRINT((ndo, "%c%s", c, ipaddr_string(bp))); c = ','; bp += 4; } if (version == 2 && auth_type == VRRP_AUTH_SIMPLE) { /* simple text password */ - TCHECK(bp[7]); - printf(" auth \""); - if (fn_printn(bp, 8, snapend)) { - printf("\""); + ND_TCHECK(bp[7]); + ND_PRINT((ndo, " auth \"")); + if (fn_printn(bp, 8, ndo->ndo_snapend)) { + ND_PRINT((ndo, "\"")); goto trunc; } - printf("\""); + ND_PRINT((ndo, "\"")); } } return; trunc: - printf("[|vrrp]"); + ND_PRINT((ndo, "[|vrrp]")); }