diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-09-05 21:56:50 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-09-08 14:14:13 +0200 |
| commit | aad6ac30ce7904f688226dbc61021ca4f907274f (patch) | |
| tree | 76ffb3367a34d7e5225fa1bc0a75aa6406118b6d /print-openflow-1.0.c | |
| parent | cbe18055349fa44ac8348c56834c32586e0a81ab (diff) | |
| download | tcpdump-aad6ac30ce7904f688226dbc61021ca4f907274f.tar.gz | |
Remove some now redundant ND_TCHECK_4() calls
ND_TCHECK_4(e).
They are redundant because they are followed by a GET_IPADDR_STRING(e)
call, same e, which do the bounds check.
Remove unused 'trunc' labels and associated codes.
Update the output of a test accordingly.
Diffstat (limited to 'print-openflow-1.0.c')
| -rw-r--r-- | print-openflow-1.0.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c index 21a1cbe9..6c224b73 100644 --- a/print-openflow-1.0.c +++ b/print-openflow-1.0.c @@ -808,7 +808,6 @@ of10_bsn_message_print(netdissect_options *ndo, /* pad */ cp += 3; /* mask */ - ND_TCHECK_4(cp); ND_PRINT(", mask %s", GET_IPADDR_STRING(cp)); cp += 4; break; @@ -1378,13 +1377,11 @@ of10_match_print(netdissect_options *ndo, ND_TCHECK_2(cp); cp += 2; /* nw_src */ - ND_TCHECK_4(cp); nw_bits = (wildcards & OFPFW_NW_SRC_MASK) >> OFPFW_NW_SRC_SHIFT; if (nw_bits < 32) ND_PRINT("%smatch nw_src %s/%u", pfx, GET_IPADDR_STRING(cp), 32 - nw_bits); cp += 4; /* nw_dst */ - ND_TCHECK_4(cp); nw_bits = (wildcards & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT; if (nw_bits < 32) ND_PRINT("%smatch nw_dst %s/%u", pfx, GET_IPADDR_STRING(cp), 32 - nw_bits); @@ -1514,7 +1511,6 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_NW_SRC: case OFPAT_SET_NW_DST: /* nw_addr */ - ND_TCHECK_4(cp); ND_PRINT(", nw_addr %s", GET_IPADDR_STRING(cp)); cp += 4; break; |