diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-23 19:44:21 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-23 19:44:21 +0100 |
| commit | d22cb958d769aad307264be0c9a09b56583ee607 (patch) | |
| tree | a1c27f578a9aa8b6bb45e1235be3eb8e3be42123 /print-decnet.c | |
| parent | 64a9ef02de1291a3b32bf25a3c64591f38f801e6 (diff) | |
| download | tcpdump-d22cb958d769aad307264be0c9a09b56583ee607.tar.gz | |
DECnet: Use more ND_TCHECK_n() macros
Diffstat (limited to 'print-decnet.c')
| -rw-r--r-- | print-decnet.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/print-decnet.c b/print-decnet.c index 8aa63e8f..ec611e38 100644 --- a/print-decnet.c +++ b/print-decnet.c @@ -528,7 +528,7 @@ decnet_print(netdissect_options *ndo, length = pktlen; rhp = (const union routehdr *)(ap + sizeof(short)); - ND_TCHECK(rhp->rh_short.sh_flags); + ND_TCHECK_1(rhp->rh_short.sh_flags); mflags = EXTRACT_U_1(rhp->rh_short.sh_flags); if (mflags & RMF_PAD) { @@ -545,7 +545,7 @@ decnet_print(netdissect_options *ndo, length -= padlen; caplen -= padlen; rhp = (const union routehdr *)(ap + sizeof(short)); - ND_TCHECK(rhp->rh_short.sh_flags); + ND_TCHECK_1(rhp->rh_short.sh_flags); mflags = EXTRACT_U_1(rhp->rh_short.sh_flags); } @@ -879,7 +879,7 @@ print_nsp(netdissect_options *ndo, if (nsplen < data_off) goto trunc; - ND_TCHECK(shp->sh_seq[0]); + ND_TCHECK_2(shp->sh_seq[0]); ack = EXTRACT_LE_U_2(shp->sh_seq[0]); if (ack & SGQ_ACK) { /* acknum field */ if ((ack & SGQ_NAK) == SGQ_NAK) @@ -889,7 +889,7 @@ print_nsp(netdissect_options *ndo, data_off += sizeof(short); if (nsplen < data_off) goto trunc; - ND_TCHECK(shp->sh_seq[1]); + ND_TCHECK_2(shp->sh_seq[1]); ack = EXTRACT_LE_U_2(shp->sh_seq[1]); if (ack & SGQ_OACK) { /* ackoth field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) @@ -899,7 +899,7 @@ print_nsp(netdissect_options *ndo, data_off += sizeof(short); if (nsplen < data_off) goto trunc; - ND_TCHECK(shp->sh_seq[2]); + ND_TCHECK_2(shp->sh_seq[2]); ack = EXTRACT_LE_U_2(shp->sh_seq[2]); } } @@ -915,7 +915,7 @@ print_nsp(netdissect_options *ndo, if (nsplen < data_off) goto trunc; - ND_TCHECK(shp->sh_seq[0]); + ND_TCHECK_2(shp->sh_seq[0]); ack = EXTRACT_LE_U_2(shp->sh_seq[0]); if (ack & SGQ_ACK) { /* acknum field */ if ((ack & SGQ_NAK) == SGQ_NAK) @@ -925,7 +925,7 @@ print_nsp(netdissect_options *ndo, data_off += sizeof(short); if (nsplen < data_off) goto trunc; - ND_TCHECK(shp->sh_seq[1]); + ND_TCHECK_2(shp->sh_seq[1]); ack = EXTRACT_LE_U_2(shp->sh_seq[1]); if (ack & SGQ_OACK) { /* ackdat field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) @@ -935,7 +935,7 @@ print_nsp(netdissect_options *ndo, data_off += sizeof(short); if (nsplen < data_off) goto trunc; - ND_TCHECK(shp->sh_seq[2]); + ND_TCHECK_2(shp->sh_seq[2]); ack = EXTRACT_LE_U_2(shp->sh_seq[2]); } } @@ -953,21 +953,21 @@ print_nsp(netdissect_options *ndo, if (nsplen < sizeof(struct seghdr) + sizeof(struct lsmsg)) goto trunc; - ND_TCHECK(shp->sh_seq[0]); + ND_TCHECK_2(shp->sh_seq[0]); ack = EXTRACT_LE_U_2(shp->sh_seq[0]); if (ack & SGQ_ACK) { /* acknum field */ if ((ack & SGQ_NAK) == SGQ_NAK) ND_PRINT("nak %u ", ack & SGQ_MASK); else ND_PRINT("ack %u ", ack & SGQ_MASK); - ND_TCHECK(shp->sh_seq[1]); + ND_TCHECK_2(shp->sh_seq[1]); ack = EXTRACT_LE_U_2(shp->sh_seq[1]); if (ack & SGQ_OACK) { /* ackdat field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) ND_PRINT("nakdat %u ", ack & SGQ_MASK); else ND_PRINT("ackdat %u ", ack & SGQ_MASK); - ND_TCHECK(shp->sh_seq[2]); + ND_TCHECK_2(shp->sh_seq[2]); ack = EXTRACT_LE_U_2(shp->sh_seq[2]); } } @@ -1048,7 +1048,7 @@ print_nsp(netdissect_options *ndo, ND_PRINT("nak %u ", ack & SGQ_MASK); else ND_PRINT("ack %u ", ack & SGQ_MASK); - ND_TCHECK(amp->ak_acknum[1]); + ND_TCHECK_2(amp->ak_acknum[1]); ack = EXTRACT_LE_U_2(amp->ak_acknum[1]); if (ack & SGQ_OACK) { /* ackdat field */ if ((ack & SGQ_ONAK) == SGQ_ONAK) |