aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-11-19 18:59:09 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-11-19 18:59:09 +0000
commit66c34f3c7b747411b1d8f8918debb6659eabd44a (patch)
tree84957617fe960a3d123ef4c22cadeeb96a3e7fd3 /epan/dissectors
parent2e487add27d4d708451bbb00d6501acf5e2588aa (diff)
From l.wachowski:
- In de_bssgp_pdu_in_error() use current_offset isof 0. - in function de_bssgp_ran_inf_error_rim_cont. Error rim container doesn't have field rim sequence number. This field exists in the rest of containers but not in this one. So I have removed this field. In this function we have field pdu in error and this field is mandatory, not optional https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8000 svn path=/trunk/; revision=46081
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-bssgp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 48dcbafcbf..bc77b1f105 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -1009,7 +1009,7 @@ de_bssgp_pdu_in_error(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g
curr_offset = offset;
/* octet 3-? Erroneous BSSGP PDU */
- proto_tree_add_item(tree, hf_bssgp_msg_type, tvb, 0, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(tree, hf_bssgp_msg_type, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
curr_offset++;
proto_tree_add_text(tree, tvb, curr_offset, len-1, "PDU Data");
@@ -3703,12 +3703,10 @@ de_bssgp_ran_inf_error_rim_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pi
ELEM_IN_ELEM_MAND_TELV(BSSGP_IEI_RIM_APP_ID, BSSGP_PDU_TYPE, DE_BSSGP_RIM_APP_ID, NULL);
/* RIM Cause Cause/11.3.8 M TLV 3 */
ELEM_IN_ELEM_MAND_TELV(BSSGP_IEI_CAUSE,BSSGP_PDU_TYPE, DE_BSSGP_CAUSE, " - RIM");
- /* RIM Sequence Number RIM Sequence Number /11.3.62 M TLV 6 */
- ELEM_IN_ELEM_MAND_TELV(BSSGP_IEI_RIM_SEQUENCE_NUMBER, BSSGP_PDU_TYPE, DE_BSSGP_RIM_SEQ_NO, NULL);
/* RIM Protocol Version Number RIM Protocol Version Number/11.3.67 O TLV 3 */
ELEM_IN_ELEM_OPT_TELV(BSSGP_IEI_RIM_PROTOCOL_VERSION, BSSGP_PDU_TYPE, DE_BSSGP_RIM_PROTO_VER_NO, NULL);
/* PDU in Error PDU in Error/11.3.24 M TLV 3-? */
- ELEM_IN_ELEM_OPT_TELV(0x15, BSSGP_PDU_TYPE, DE_BSSGP_PDU_IN_ERROR , NULL);
+ ELEM_IN_ELEM_MAND_TELV(0x15, BSSGP_PDU_TYPE, DE_BSSGP_PDU_IN_ERROR , NULL);
/* SON Transfer Application Identity (note 1) SON Transfer Application Identity/11.3.108 C TLV 3-m */
ELEM_IN_ELEM_OPT_TELV(0x84, BSSGP_PDU_TYPE, DE_BSSGP_SON_TRANSFER_APP_ID, NULL);