Rename AVP Emergency-Indication to Emergency-Services

Renamed in 29.273 Rel 14

Change-Id: I171510869ed2c8a77a983e7c37bbdcb7494ad076
Reviewed-on: https://code.wireshark.org/review/21696
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index 0db68c073d..956694d7df 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -321,8 +321,8 @@ static int hf_diameter_3gpp_tmgi_deallocation_result_bit1 = -1;
 static int hf_diameter_3gpp_tmgi_deallocation_result_bit2 = -1;
 static int hf_diameter_3gpp_sar_flags = -1;
 static int hf_diameter_3gpp_sar_flags_flags_bit0 = -1;
-static int hf_diameter_3gpp_emergency_ind_flags = -1;
-static int hf_diameter_3gpp_emergency_ind_flags_bit0 = -1;
+static int hf_diameter_3gpp_emergency_services_flags = -1;
+static int hf_diameter_3gpp_emergency_services_flags_bit0 = -1;
 
 static int hf_diameter_3gpp_uar_flags_flags_spare_bits = -1;
 static int hf_diameter_3gpp_feature_list1_sh_flags_spare_bits = -1;
@@ -355,7 +355,7 @@ static int hf_diameter_3gpp_mbms_bearer_event_spare_bits = -1;
 static int hf_diameter_3gpp_mbms_bearer_result_spare_bits = -1;
 static int hf_diameter_3gpp_tmgi_allocation_result_spare_bits = -1;
 static int hf_diameter_3gpp_tmgi_deallocation_result_spare_bits = -1;
-static int hf_diameter_3gpp_emergency_ind_flags_spare_bits = -1;
+static int hf_diameter_3gpp_emergency_services_flags_spare_bits = -1;
 
 static gint diameter_3gpp_path_ett = -1;
 static gint diameter_3gpp_feature_list_ett = -1;
@@ -382,7 +382,7 @@ static gint diameter_3gpp_mbms_bearer_result_ett = -1;
 static gint diameter_3gpp_tmgi_allocation_result_ett = -1;
 static gint diameter_3gpp_tmgi_deallocation_result_ett = -1;
 static gint diameter_3gpp_sar_flags_ett = -1;
-static gint diameter_3gpp_emergency_ind_flags_ett = -1;
+static gint diameter_3gpp_emergency_services_flags_ett = -1;
 
 static int hf_diameter_3gpp_feature_list1_rx_flags_bit0 = -1;
 static int hf_diameter_3gpp_feature_list1_rx_flags_bit1 = -1;
@@ -1898,17 +1898,17 @@ dissect_diameter_3gpp_der_s6b_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto
     return 4;
 }
 
-/* AVP Code: 1538 Emergency-Indication */
+/* AVP Code: 1538 Emergency-Services */
 static int
-dissect_diameter_3gpp_emergency_indication(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
+dissect_diameter_3gpp_emergency_services(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
 {
     static const int *flags[] = {
-        &hf_diameter_3gpp_emergency_ind_flags_spare_bits,
-        &hf_diameter_3gpp_emergency_ind_flags_bit0,
+        &hf_diameter_3gpp_emergency_services_flags_spare_bits,
+        &hf_diameter_3gpp_emergency_services_flags_bit0,
         NULL
     };
 
-    proto_tree_add_bitmask_with_flags(tree, tvb, 0, hf_diameter_3gpp_emergency_ind_flags, diameter_3gpp_emergency_ind_flags_ett, flags, ENC_BIG_ENDIAN, BMT_NO_APPEND);
+    proto_tree_add_bitmask_with_flags(tree, tvb, 0, hf_diameter_3gpp_emergency_services_flags, diameter_3gpp_emergency_services_flags_ett, flags, ENC_BIG_ENDIAN, BMT_NO_APPEND);
     return 4;
 
 }
@@ -2240,8 +2240,8 @@ proto_reg_handoff_diameter_3gpp(void)
     /* AVP Code: 1523 DER-S6b-Flags */
     dissector_add_uint("diameter.3gpp", 1523, create_dissector_handle(dissect_diameter_3gpp_der_s6b_flags, proto_diameter_3gpp));
 
-    /* AVP Code: 1538 Emergency-Indication */
-    dissector_add_uint("diameter.3gpp", 1538, create_dissector_handle(dissect_diameter_3gpp_emergency_indication, proto_diameter_3gpp));
+    /* AVP Code: 1538 Emergency-Services */
+    dissector_add_uint("diameter.3gpp", 1538, create_dissector_handle(dissect_diameter_3gpp_emergency_services, proto_diameter_3gpp));
 
     /* AVP Code: 2516 EUTRAN-Positioning-Data */
     dissector_add_uint("diameter.3gpp", 2516, create_dissector_handle(dissect_diameter_3gpp_eutran_positioning_data, proto_diameter_3gpp));
@@ -4101,17 +4101,17 @@ proto_register_diameter_3gpp(void)
           FT_UINT16, BASE_DEC, VALS(diameter_3gpp_IKEv2_error_type_vals), 0x0,
           NULL, HFILL}
         },
-        { &hf_diameter_3gpp_emergency_ind_flags,
-        { "Emergency-Indication Flags", "diameter.3gpp.emergency_ind_flags",
+        { &hf_diameter_3gpp_emergency_services_flags,
+        { "Emergency-Services Flags", "diameter.3gpp.emergency_ind_flags",
           FT_UINT32, BASE_HEX, NULL, 0x0,
           NULL, HFILL }
         },
-        { &hf_diameter_3gpp_emergency_ind_flags_bit0,
-        { "Emergency services", "diameter.3gpp.emergency_ind_flags_bit0",
+        { &hf_diameter_3gpp_emergency_services_flags_bit0,
+        { "Emergency-Indication", "diameter.3gpp.emergency_ind_flags_bit0",
           FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000001,
           NULL, HFILL }
         },
-        { &hf_diameter_3gpp_emergency_ind_flags_spare_bits,
+        { &hf_diameter_3gpp_emergency_services_flags_spare_bits,
         { "Spare", "diameter.3gpp.emergency_ind_flags_spare",
           FT_UINT32, BASE_HEX, NULL, 0xFFFFFFFE,
           NULL, HFILL }
@@ -4147,7 +4147,7 @@ proto_register_diameter_3gpp(void)
         &diameter_3gpp_tmgi_allocation_result_ett,
         &diameter_3gpp_tmgi_deallocation_result_ett,
         &diameter_3gpp_sar_flags_ett,
-        &diameter_3gpp_emergency_ind_flags_ett,
+        &diameter_3gpp_emergency_services_flags_ett,
     };
 
     expert_module_t *expert_diameter_3gpp;