Diameter: Update AVP and flag dissection.
Change-Id: I982f3ed12613b0dc6a4dfc1ffebebde5b0697c98 Reviewed-on: https://code.wireshark.org/review/34884 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman
Anders Broman
parent
b6752680ab
commit
dafa87a0b6
|
|
@ -7882,6 +7882,7 @@
|
|||
<gavp name="Visited-PLMN-Id"/>
|
||||
<gavp name="Roaming-Information"/>
|
||||
<gavp name="IMEI-Change"/>
|
||||
<gavp name="Terminal-Information "/>
|
||||
<gavp name="Reachability-Information"/>
|
||||
<gavp name="Maximum-UE-Availability-Time"/>
|
||||
<gavp name="EPS-Location-Information"/>
|
||||
|
|
@ -7890,7 +7891,8 @@
|
|||
<gavp name="Service-Report"/>
|
||||
<gavp name="Loss-Of-Connectivity-Reason"/>
|
||||
<gavp name="Idle-Status-Indication"/>
|
||||
<gavp name="Communication-Failure-Information"/>
|
||||
<gavp name="Idle-Status-Indication"/>
|
||||
<gavp name="PDN-Connectivity-Status-Report"/>
|
||||
<gavp name="Number-Of-UE-Per-Location-Report"/>
|
||||
<gavp name="Visited-PLMN-Id"/>
|
||||
</grouped>
|
||||
|
|
@ -7916,6 +7918,7 @@
|
|||
<enum name="NUMBER_OF_UES_PRESENT_IN_A_GEOGRAPHICAL_AREA" code="7"/>
|
||||
<enum name="UE_REACHABILITY_AND_IDLE_STATUS_INDICATION" code="8"/>
|
||||
<enum name="AVAILABILITY_AFTER_DDN_FAILURE_AND_IDLE_STATUS_INDICATION" code="9"/>
|
||||
<enum name="PDN_CONNECTIVITY_STATUS " code="10"/>
|
||||
</avp>
|
||||
<avp name="Maximum-Number-of-Reports" code="3128" mandatory="must" vendor-bit="must" may-encrypt="no" vendor-id="TGPP">
|
||||
<type type-name="Unsigned32"/>
|
||||
|
|
@ -8183,9 +8186,37 @@
|
|||
<gavp name="MTC-Provider-ID"/>
|
||||
</grouped>
|
||||
</avp>
|
||||
<avp name="MTC-Provider-ID" code="3176" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
|
||||
<avp name="MTC-Provider-ID" code="3179" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
|
||||
<type type-name="UTF8String"/>
|
||||
</avp>
|
||||
<avp name="PDN-Connectivity-Status-Configuration" code="3180" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
|
||||
<grouped>
|
||||
<gavp name="Service-Selection"/>
|
||||
</grouped>
|
||||
</avp>
|
||||
<avp name="PDN-Connectivity-Status-Report" code="3181" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
|
||||
<grouped>
|
||||
<gavp name="Service-Selection"/>
|
||||
<gavp name="PDN-Connectivity-Status-Type"/>
|
||||
<gavp name="PDN-Type"/>
|
||||
<gavp name="Non-IP-PDN-Type-Indicator"/>
|
||||
<gavp name="Non-IP-Data-Delivery-Mechanism"/>
|
||||
<gavp name="Served-Party-IP-Address"/>
|
||||
</grouped>
|
||||
</avp>
|
||||
<avp name="PDN-Connectivity-Status-Type" code="3182" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
|
||||
<type type-name="Unsigned32"/>
|
||||
<enum name="CREATED" code="0"/>
|
||||
<enum name="DELETED " code="1"/>
|
||||
</avp>
|
||||
<avp name="Traffic-Profile" code="3183" mandatory="mustnot" may-encrypt="no" vendor-bit="must" vendor-id="TGPP">
|
||||
<type type-name="Unsigned32"/>
|
||||
<enum name="SINGLE_TRANSMISSION_UL " code="0"/>
|
||||
<enum name="SINGLE_TRANSMISSION_D " code="1"/>
|
||||
<enum name="DUAL_TRANSMISSION_UL_WITH_SUBSEQUENT_DL" code="2"/>
|
||||
<enum name="DUAL_TRANSMISSION_DL_WITH_SUBSEQUENT_UL" code="3"/>
|
||||
<enum name="MULTI_TRANSMISSION" code="4"/>
|
||||
</avp>
|
||||
<!--
|
||||
Note: The AVP codes from 3163 to 3199 are reserved for TS 29.336
|
||||
-->
|
||||
|
|
|
|||
|
|
@ -467,6 +467,16 @@ static int hf_diameter_3gpp_feature_list_s6t_flags_bit5 = -1;
|
|||
static int hf_diameter_3gpp_feature_list_s6t_flags_bit6 = -1;
|
||||
static int hf_diameter_3gpp_feature_list_s6t_flags_bit7 = -1;
|
||||
static int hf_diameter_3gpp_feature_list_s6t_spare_b31_b8 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b0 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b1 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b2 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b3 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b4 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b5 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b6 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b7 = -1;
|
||||
static int hf_diameter_3gpp_supported_monitoring_events_b8 = -1;
|
||||
|
||||
static gint diameter_3gpp_qos_subscribed_ett = -1;
|
||||
static gint diameter_3gpp_ulr_flags_ett = -1;
|
||||
|
|
@ -504,6 +514,7 @@ static gint diameter_3gpp_plr_flags_ett = -1;
|
|||
static gint diameter_3gpp_pla_flags_ett = -1;
|
||||
static gint diameter_3gpp_deferred_location_type_ett = -1;
|
||||
static gint diameter_3gpp_rir_flags_ett = -1;
|
||||
static guint ett_diameter_3gpp_supported_monitoring_events = -1;
|
||||
|
||||
static int hf_diameter_3gpp_feature_list1_rx_flags_bit0 = -1;
|
||||
static int hf_diameter_3gpp_feature_list1_rx_flags_bit1 = -1;
|
||||
|
|
@ -2679,6 +2690,33 @@ dissect_diameter_3gpp_ran_nas_release_cause(tvbuff_t *tvb, packet_info *pinfo _U
|
|||
return offset;
|
||||
}
|
||||
|
||||
/* AVP Code: 3144 Supported-Monitoring-Events*/
|
||||
static int
|
||||
dissect_diameter_3gpp_supported_monitoring_events(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, void* data)
|
||||
{
|
||||
/* Unsigned64 */
|
||||
static const int* flags[] = {
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b8,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b7,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b6,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b5,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b4,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b3,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b2,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b1,
|
||||
&hf_diameter_3gpp_supported_monitoring_events_b0,
|
||||
NULL
|
||||
};
|
||||
|
||||
diam_sub_dis_t* diam_sub_dis_inf = (diam_sub_dis_t*)data;
|
||||
|
||||
/* Hide the item created in packet-diameter.c and only show the one created here */
|
||||
proto_item_set_hidden(diam_sub_dis_inf->item);
|
||||
proto_tree_add_bitmask_with_flags(tree, tvb, 0, hf_diameter_3gpp_supported_monitoring_events, ett_diameter_3gpp_supported_monitoring_events, flags, ENC_BIG_ENDIAN, BMT_NO_APPEND);
|
||||
return 8;
|
||||
}
|
||||
|
||||
|
||||
/* AVP Code: 3167 RIR-Flags */
|
||||
static int
|
||||
dissect_diameter_3gpp_rir_flags(tvbuff_t* tvb, packet_info* pinfo _U_, proto_tree* tree, void* data)
|
||||
|
|
@ -3067,6 +3105,9 @@ proto_reg_handoff_diameter_3gpp(void)
|
|||
/* AVP Code: 2819 RAN-NAS-Release-Cause */
|
||||
dissector_add_uint("diameter.3gpp", 2819, create_dissector_handle(dissect_diameter_3gpp_ran_nas_release_cause, proto_diameter_3gpp));
|
||||
|
||||
/* AVP Code: 3144 Supported-Monitoring-Events*/
|
||||
dissector_add_uint("diameter.3gpp", 3144, create_dissector_handle(dissect_diameter_3gpp_supported_monitoring_events, proto_diameter_3gpp));
|
||||
|
||||
/* AVP Code: 3167 RIR-Flags */
|
||||
dissector_add_uint("diameter.3gpp", 3167, create_dissector_handle(dissect_diameter_3gpp_rir_flags, proto_diameter_3gpp));
|
||||
|
||||
|
|
@ -5555,7 +5596,56 @@ proto_register_diameter_3gpp(void)
|
|||
FT_UINT32, BASE_HEX, NULL, 0xffffff00,
|
||||
NULL, HFILL }
|
||||
},
|
||||
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events,
|
||||
{ "Supported-Monitoring-Events", "diameter.3gpp.supported_monitoring_events",
|
||||
FT_UINT64, BASE_HEX, NULL, 0x0,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b0,
|
||||
{ "UE and UICC and/or new IMSI-IMEI-SV association", "diameter.3gpp.supported_monitoring_events.b0",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000001,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b1,
|
||||
{ "UE-reachability", "diameter.3gpp.supported_monitoring_events.b1",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000002,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b2,
|
||||
{ "Location-of-the-UE", "diameter.3gpp.supported_monitoring_events.b2",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000004,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b3,
|
||||
{ "Loss-of-connectivity", "diameter.3gpp.supported_monitoring_events.b3",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000008,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b4,
|
||||
{ "Communication-failure", "diameter.3gpp.supported_monitoring_events.b4",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000010,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b5,
|
||||
{ "Roaming-status", "diameter.3gpp.supported_monitoring_events.b5",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000020,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b6,
|
||||
{ "Availability after DDN failure", "diameter.3gpp.supported_monitoring_events.b6",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000040,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b7,
|
||||
{ "Idle Status Indication", "diameter.3gpp.supported_monitoring_events.b7",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000080,
|
||||
NULL, HFILL }
|
||||
},
|
||||
{ &hf_diameter_3gpp_supported_monitoring_events_b8,
|
||||
{ "PDN Connectivity Status", "diameter.3gpp.supported_monitoring_events.b8",
|
||||
FT_BOOLEAN, 64, TFS(&tfs_supported_not_supported), 0x0000000000000100,
|
||||
NULL, HFILL }
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -5601,7 +5691,8 @@ proto_register_diameter_3gpp(void)
|
|||
&diameter_3gpp_plr_flags_ett,
|
||||
&diameter_3gpp_pla_flags_ett,
|
||||
&diameter_3gpp_deferred_location_type_ett,
|
||||
&diameter_3gpp_rir_flags_ett
|
||||
&diameter_3gpp_rir_flags_ett,
|
||||
&ett_diameter_3gpp_supported_monitoring_events
|
||||
};
|
||||
|
||||
expert_module_t *expert_diameter_3gpp;
|
||||
|
|
|
|||
Loading…
Reference in New Issue