diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-12-11 12:46:51 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-12-11 22:11:01 +0100 |
| commit | 84ef17ac0eecb3efc11a63c3f2c578ae78732c02 (patch) | |
| tree | c62632ddf7ae57a999a89938ecaf8e590bfcc019 /print-lisp.c | |
| parent | 264ed29aae3407c1a6816c64813806a077ccebcb (diff) | |
| download | tcpdump-84ef17ac0eecb3efc11a63c3f2c578ae78732c02.tar.gz | |
Replace ND_TTEST2()/ND_TCHECK2() macros by macros using pointers (1/n)
ND_TTEST2(var, l) -> ND_TTEST_LEN(p, l)
ND_TCHECK2(var, l) -> ND_TCHECK_LEN(p, l)
Diffstat (limited to 'print-lisp.c')
| -rw-r--r-- | print-lisp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/print-lisp.c b/print-lisp.c index c8486566..804f898e 100644 --- a/print-lisp.c +++ b/print-lisp.c @@ -251,7 +251,7 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) const lisp_map_register_loc *lisp_loc; /* Check if enough bytes for header are available */ - ND_TCHECK2(*bp, MAP_REGISTER_HDR_LEN); + ND_TCHECK_LEN(bp, MAP_REGISTER_HDR_LEN); lisp_hdr = (const lisp_map_register_hdr *) bp; lisp_hdr_flag(ndo, lisp_hdr); /* Supporting only MAP NOTIFY and MAP REGISTER LISP packets */ @@ -287,7 +287,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) /* Print all the EID records */ while ((length > packet_offset) && (record_count--)) { - ND_TCHECK2(*(packet_iterator + packet_offset), MAP_REGISTER_EID_LEN); + ND_TCHECK_LEN(packet_iterator + packet_offset, + MAP_REGISTER_EID_LEN); ND_PRINT((ndo, "\n")); lisp_eid = (const lisp_map_register_eid *) ((const u_char *)lisp_hdr + packet_offset); @@ -328,7 +329,8 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) ND_PRINT((ndo, " %u locator(s)", loc_count)); while (loc_count--) { - ND_TCHECK2(*(packet_iterator + packet_offset), MAP_REGISTER_LOC_LEN); + ND_TCHECK_LEN(packet_iterator + packet_offset, + MAP_REGISTER_LOC_LEN); lisp_loc = (const lisp_map_register_loc *) (packet_iterator + packet_offset); loc_ip_pointer = (const u_char *) (lisp_loc + 1); packet_offset += MAP_REGISTER_LOC_LEN; @@ -370,7 +372,7 @@ lisp_print(netdissect_options *ndo, const u_char *bp, u_int length) * show it as hex data. */ if (xtr_present) { - if (!ND_TTEST2(*(packet_iterator + packet_offset), 24)) + if (!ND_TTEST_LEN(packet_iterator + packet_offset, 24)) goto invalid; hex_print_with_offset(ndo, "\n xTR-ID: ", packet_iterator + packet_offset, 16, 0); ND_PRINT((ndo, "\n SITE-ID: %" PRIu64, |