osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Menno Andriesse: 

Check for correct tx_mode in dissect_s5066_21() and dissect_s5066_25().

svn path=/trunk/; revision=27714
This commit is contained in:
Stig Bjørlykke 2009-03-12 22:06:59 +00:00
parent 1511ef5a88
commit cafdbc05f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-s5066.c
View File

@ -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;