diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-27 18:24:29 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-27 18:24:29 +0000 |
| commit | f377855e9fba9bf2a6d25d1ff6ce3b8d776db04a (patch) | |
| tree | 630cb2f05e821e44dac6bce922b756cbbc4cd3fa | |
| parent | 36171caca7b44abff39b352e02d0ceb40d99abbd (diff) | |
Dissect RTP Redundancy Support correctly.
svn path=/trunk/; revision=18225
| -rw-r--r-- | epan/dissectors/packet-uma.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index 00c28fe6af..1af1fab708 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -870,8 +870,10 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_gc, tvb, ie_offset, 1, FALSE); proto_tree_add_item(urr_ie_tree, hf_uma_urr_uc, tvb, ie_offset, 1, FALSE); /* UMA Protocols (Stage 3) R1.0.3 */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_rrs, tvb, ie_offset, 1, FALSE); - break; + if(ie_len>1){ + ie_offset++; + proto_tree_add_item(urr_ie_tree, hf_uma_urr_rrs, tvb, ie_offset, 1, FALSE); + } break; case 8: /* Geographical Location * The Location Estimate field is composed of 1 or more octets with an internal structure @@ -951,7 +953,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_TU3907_timer, tvb, ie_offset, 2, FALSE); break; case 17: /* GSM RR State */ - proto_tree_add_item(urr_ie_tree, hf_uma_urr_GSM_RR_state, tvb, ie_offset, 2, FALSE); + proto_tree_add_item(urr_ie_tree, hf_uma_urr_GSM_RR_state, tvb, ie_offset, 1, FALSE); break; case 18: /* Routing Area Identification */ /* The rest of the IE is coded as in [TS 24.008] not including IEI and length, if present.*/ @@ -1760,7 +1762,7 @@ proto_register_uma(void) }, { &hf_uma_urr_rrs, { "RTP Redundancy Support(RRS)","uma.urr.rrs", - FT_UINT8,BASE_DEC, VALS(rrs_vals), 0xc, + FT_UINT8,BASE_DEC, VALS(rrs_vals), 0x01, "RTP Redundancy Support(RRS)", HFILL } }, { &hf_uma_urr_IP_Address_type, |