diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2019-08-13 09:26:31 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-08-13 07:50:31 +0000 |
| commit | 1d40491b96ac5b7fee4cfa0c8ef86609f62f5586 (patch) | |
| tree | 849a28a99f51285db2125d2b746473628e0fcc35 /epan/dissectors/packet-diameter_3gpp.c | |
| parent | 478b39e82457475670fc6a1e6f593b80db39776d (diff) | |
Diameter 3GPP: Dissect new ULR and DSR Flags.
Change-Id: Idd42138e5ce98c804ebe7811b8a942a9e9bd8127
Reviewed-on: https://code.wireshark.org/review/34263
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-diameter_3gpp.c')
| -rw-r--r-- | epan/dissectors/packet-diameter_3gpp.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index c978b1fa35..a6218cb041 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -223,6 +223,7 @@ static int hf_diameter_3gpp_ulr_flags_bit4 = -1; static int hf_diameter_3gpp_ulr_flags_bit5 = -1; static int hf_diameter_3gpp_ulr_flags_bit6 = -1; static int hf_diameter_3gpp_ulr_flags_bit7 = -1; +static int hf_diameter_3gpp_ulr_flags_bit8 = -1; static int hf_diameter_3gpp_ula_flags = -1; static int hf_diameter_3gpp_ula_flags_bit0 = -1; static int hf_diameter_3gpp_ula_flags_bit1 = -1; @@ -258,6 +259,7 @@ static int hf_diameter_3gpp_dsr_flags_bit27 = -1; static int hf_diameter_3gpp_dsr_flags_bit28 = -1; static int hf_diameter_3gpp_dsr_flags_bit29 = -1; static int hf_diameter_3gpp_dsr_flags_bit30 = -1; +static int hf_diameter_3gpp_dsr_flags_bit31 = -1; static int hf_diameter_3gpp_dsa_flags = -1; static int hf_diameter_3gpp_dsa_flags_bit0 = -1; static int hf_diameter_3gpp_ida_flags = -1; @@ -388,7 +390,6 @@ static int hf_diameter_3gpp_feature_list2_s6a_flags_spare_bits = -1; static int hf_diameter_3gpp_cms_spare_bits = -1; static int hf_diameter_3gpp_ulr_flags_spare_bits = -1; static int hf_diameter_3gpp_ula_flags_spare_bits = -1; -static int hf_diameter_3gpp_dsr_flags_spare_bits = -1; static int hf_diameter_3gpp_dsa_flags_spare_bits = -1; static int hf_diameter_3gpp_acc_res_dat_flags = -1; static int hf_diameter_3gpp_acc_res_dat_flags_bit0 = -1; @@ -1832,6 +1833,7 @@ dissect_diameter_3gpp_ulr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre { static const int *flags[] = { &hf_diameter_3gpp_ulr_flags_spare_bits, + &hf_diameter_3gpp_ulr_flags_bit8, &hf_diameter_3gpp_ulr_flags_bit7, &hf_diameter_3gpp_ulr_flags_bit6, &hf_diameter_3gpp_ulr_flags_bit5, @@ -1896,7 +1898,7 @@ static int dissect_diameter_3gpp_dsr_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data) { static const int *flags[] = { - &hf_diameter_3gpp_dsr_flags_spare_bits, + &hf_diameter_3gpp_dsr_flags_bit31, &hf_diameter_3gpp_dsr_flags_bit30, &hf_diameter_3gpp_dsr_flags_bit29, &hf_diameter_3gpp_dsr_flags_bit28, @@ -4117,9 +4119,14 @@ proto_register_diameter_3gpp(void) FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000080, NULL, HFILL } }, + { &hf_diameter_3gpp_ulr_flags_bit8, + { "Dual-Registration-5G-Indicator", "diameter.3gpp.ulr_flags_bit8", + FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000100, + NULL, HFILL } + }, { &hf_diameter_3gpp_ulr_flags_spare_bits, { "Spare", "diameter.3gpp.ulr_flags_spare", - FT_UINT32, BASE_HEX, NULL, 0xFFFFFF00, + FT_UINT32, BASE_HEX, NULL, 0xFFFFFE00, NULL, HFILL } }, { &hf_diameter_3gpp_ula_flags, @@ -4302,9 +4309,9 @@ proto_register_diameter_3gpp(void) FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x40000000, NULL, HFILL } }, - { &hf_diameter_3gpp_dsr_flags_spare_bits, - { "Spare", "diameter.3gpp.dsr_flags_spare", - FT_UINT32, BASE_HEX, NULL, 0x80000000, + { &hf_diameter_3gpp_dsr_flags_bit31, + { "Service-Gap-Time-Withdrawal", "diameter.3gpp.dsr_flags_bit31", + FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x80000000, NULL, HFILL } }, { &hf_diameter_3gpp_dsa_flags, |