diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-12 22:06:59 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-03-12 22:06:59 +0000 |
| commit | cafdbc05f4c63ea18eb35912804fe1900c6503af (patch) | |
| tree | 4b23d9cb35701b0a224798b119c6b42b997ea73c /epan/dissectors/packet-s5066.c | |
| parent | 1511ef5a883672ec296f3ffe1a59495ae5ad7310 (diff) | |
From Menno Andriesse:
Check for correct tx_mode in dissect_s5066_21() and dissect_s5066_25().
svn path=/trunk/; revision=27714
Diffstat (limited to 'epan/dissectors/packet-s5066.c')
| -rw-r--r-- | epan/dissectors/packet-s5066.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index 0784fd1bc7..d502defb48 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -1092,7 +1092,7 @@ dissect_s5066_21(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) tx_mode = tvb_get_guint8(tvb, offset); tx_mode = (tx_mode & 0xF0) >> 4; - if (tx_mode == 2) { + if (tx_mode == 3) { non_arq_w_errors = TRUE; } @@ -1190,7 +1190,7 @@ dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) tx_mode = tvb_get_guint8(tvb, offset); tx_mode = (tx_mode & 0xF0) >> 4; - if (tx_mode == 2) { + if (tx_mode == 3) { non_arq_w_errors = TRUE; } @@ -1202,7 +1202,7 @@ dissect_s5066_25(tvbuff_t *tvb, guint offset, proto_tree *tree, guint pdu_size) proto_tree_add_item(tree, hf_s5066_25_size, tvb, offset, 2, FALSE); offset += 2; /* Handle RockwellCollins (<= v2.1) 4-byte offset */ - if ( (pdu_size - offset) == d_pdu_size + 4 ) { + if ( (pdu_size - offset) == (d_pdu_size + 4) ) { ti = proto_tree_add_item(tree, hf_s5066_25_err_blocks, tvb, offset, 2, FALSE); offset += 2; proto_item_append_text(ti, ", (Field should not be present. Rockwell Collins v2.1 or earlier.) "); ti = proto_tree_add_item(tree, hf_s5066_25_nrx_blocks, tvb, offset, 2, FALSE); offset += 2; |