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-l2tp.c | |
| parent | c511f4c3be6273b25b0d1802eee2ede3d69b2398 (diff) | |
| download | tcpdump-39c8c55aa9ff84244cf558b9a957b78933babf0a.tar.gz | |
Use more ND_TCHECK_n()/ND_TTEST_n() macros
Diffstat (limited to 'print-l2tp.c')
| -rw-r--r-- | print-l2tp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/print-l2tp.c b/print-l2tp.c index 9852ff50..7feab704 100644 --- a/print-l2tp.c +++ b/print-l2tp.c @@ -777,7 +777,7 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length) flag_t = flag_l = flag_s = flag_o = FALSE; - ND_TCHECK2(*ptr, 2); /* Flags & Version */ + ND_TCHECK_2(ptr); /* Flags & Version */ if ((EXTRACT_BE_U_2(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2TP) { ND_PRINT((ndo, " l2tp:")); } else if ((EXTRACT_BE_U_2(ptr) & L2TP_VERSION_MASK) == L2TP_VERSION_L2F) { @@ -813,7 +813,7 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length) cnt += 2; if (flag_l) { - ND_TCHECK2(*ptr, 2); /* Length */ + ND_TCHECK_2(ptr); /* Length */ l2tp_len = EXTRACT_BE_U_2(ptr); ptr += 2; cnt += 2; @@ -821,28 +821,28 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length) l2tp_len = 0; } - ND_TCHECK2(*ptr, 2); /* Tunnel ID */ + ND_TCHECK_2(ptr); /* Tunnel ID */ ND_PRINT((ndo, "(%u/", EXTRACT_BE_U_2(ptr))); ptr += 2; cnt += 2; - ND_TCHECK2(*ptr, 2); /* Session ID */ + ND_TCHECK_2(ptr); /* Session ID */ ND_PRINT((ndo, "%u)", EXTRACT_BE_U_2(ptr))); ptr += 2; cnt += 2; if (flag_s) { - ND_TCHECK2(*ptr, 2); /* Ns */ + ND_TCHECK_2(ptr); /* Ns */ ND_PRINT((ndo, "Ns=%u,", EXTRACT_BE_U_2(ptr))); ptr += 2; cnt += 2; - ND_TCHECK2(*ptr, 2); /* Nr */ + ND_TCHECK_2(ptr); /* Nr */ ND_PRINT((ndo, "Nr=%u", EXTRACT_BE_U_2(ptr))); ptr += 2; cnt += 2; } if (flag_o) { - ND_TCHECK2(*ptr, 2); /* Offset Size */ + ND_TCHECK_2(ptr); /* Offset Size */ pad = EXTRACT_BE_U_2(ptr); ptr += (2 + pad); cnt += (2 + pad); |