diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-24 22:48:55 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-11-24 22:48:55 +0100 |
| commit | 39c8c55aa9ff84244cf558b9a957b78933babf0a (patch) | |
| tree | d1f013767035c78b78a987cea509567603ab7783 /print-geonet.c | |
| parent | c511f4c3be6273b25b0d1802eee2ede3d69b2398 (diff) | |
| download | tcpdump-39c8c55aa9ff84244cf558b9a957b78933babf0a.tar.gz | |
Use more ND_TCHECK_n()/ND_TTEST_n() macros
Diffstat (limited to 'print-geonet.c')
| -rw-r--r-- | print-geonet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/print-geonet.c b/print-geonet.c index 1e98fc5f..e40c6511 100644 --- a/print-geonet.c +++ b/print-geonet.c @@ -90,7 +90,7 @@ print_long_pos_vector(netdissect_options *ndo, return (-1); ND_PRINT((ndo, "GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN))); - if (!ND_TTEST2(*(bp+12), 8)) + if (!ND_TTEST_8(bp + 12)) return (-1); lat = EXTRACT_BE_U_4(bp + 12); ND_PRINT((ndo, "lat:%d ", lat)); @@ -127,7 +127,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, if (length < 36) goto invalid; - ND_TCHECK2(*bp, 8); + ND_TCHECK_8(bp); version = bp[0] >> 4; next_hdr = bp[0] & 0x0f; hdr_type = bp[1] >> 4; @@ -242,7 +242,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, case 2: /* BTP A/B */ if (length < 4) goto invalid; - ND_TCHECK2(*bp, 4); + ND_TCHECK_4(bp); print_btp(ndo, bp); length -= 4; bp += 4; @@ -254,7 +254,7 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length, * or was that just not * reporting genuine errors? */ - ND_TCHECK2(*bp, 2); + ND_TCHECK_2(bp); print_btp_body(ndo, bp); } break; |