diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-05-01 14:58:03 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-05-01 14:58:03 +0000 |
| commit | a0f2f56ec80194533652c92d9cc640d0f24007ba (patch) | |
| tree | 8fa8e19417398371b19ade2a3aece380769803cc | |
| parent | 1bf2a7c78b571269731d23dabc745400701fcdc7 (diff) | |
| download | wireshark-a0f2f56ec80194533652c92d9cc640d0f24007ba.tar.gz wireshark-a0f2f56ec80194533652c92d9cc640d0f24007ba.tar.bz2 wireshark-a0f2f56ec80194533652c92d9cc640d0f24007ba.zip | |
Dissect 3GPP AVP 5 3GPP-GPRS Negotiated QoS profile.
svn path=/trunk/; revision=32622
| -rw-r--r-- | epan/dissectors/packet-diameter_3gpp.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/packet-gtp.c | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index ea5adafcfe..75e83562cf 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -172,6 +172,9 @@ void proto_reg_handoff_diameter_3gpp(void) { + /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */ + /* Registered by packet-gtp.c */ + /* AVP Code: 701 MSISDN */ dissector_add("diameter.3gpp", 701, new_create_dissector_handle(dissect_diameter_3gpp_msisdn, proto_diameter_3gpp)); @@ -181,12 +184,17 @@ proto_reg_handoff_diameter_3gpp(void) /* AVP Code: 900 TMGI */ dissector_add("diameter.3gpp", 900, new_create_dissector_handle(dissect_diameter_3gpp_tmgi, proto_diameter_3gpp)); - /* AVP Code: 918 MBMS-BMSC-SSM-IP-Address */ - dissector_add("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp)); + /* AVP Code: 904 MBMS-Session-Duration */ + /* AVP Code: 911 MBMS-Time-To-Data-Transfer */ + /* Registered by packet-gtp.c */ /* AVP Code: 913 MBMS-Required-QoS */ dissector_add("diameter.3gpp", 913, new_create_dissector_handle(dissect_diameter_3gpp_mbms_required_qos, proto_diameter_3gpp)); + /* AVP Code: 918 MBMS-BMSC-SSM-IP-Address */ + dissector_add("diameter.3gpp", 918, new_create_dissector_handle(dissect_diameter_3gpp_ipaddr, proto_diameter_3gpp)); + + xml_handle = find_dissector("xml"); } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 356275387d..db6f020079 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -4078,6 +4078,14 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const return retval; } +/* Diameter 3GPP AVP Code: 5 3GPP-GPRS Negotiated QoS profile */ +static int +dissect_diameter_3gpp_qosprofile(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + + decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3); + return tvb_length(tvb); +} + static const gchar *dissect_radius_qos_umts(proto_tree * tree, tvbuff_t * tvb) { decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3); @@ -7082,6 +7090,8 @@ void proto_reg_handoff_gtp(void) radius_register_avp_dissector(VENDOR_THE3GPP, 12, dissect_radius_selection_mode); radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc); + + ip_handle = find_dissector("ip"); ipv6_handle = find_dissector("ipv6"); ppp_handle = find_dissector("ppp"); @@ -7090,6 +7100,8 @@ void proto_reg_handoff_gtp(void) sndcpxid_handle = find_dissector("sndcpxid"); gtpv2_handle = find_dissector("gtpv2"); bssap_pdu_type_table = find_dissector_table("bssap.pdu_type"); + /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */ + dissector_add("diameter.3gpp", 5, new_create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp)); /* AVP Code: 904 MBMS-Session-Duration */ dissector_add("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp)); /* AVP Code: 911 MBMS-Time-To-Data-Transfer */ |