diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2019-04-18 10:27:49 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-04-18 09:52:35 +0000 |
| commit | e7429d505ecdc94f3c4b8e3db56906f3532425c7 (patch) | |
| tree | d941bb4f1c27a435055767c2874c552cbeefd086 | |
| parent | 694d212b7254bb7d91b0cf6dafc3c1559e9da9d2 (diff) | |
Diameter: Add 3GPP AVP 1706 and bit decoding
in 1426 Access-Restriction-Data
Change-Id: I358ddffa1b395adeaa96494f572471619d8b40a6
Reviewed-on: https://code.wireshark.org/review/32884
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | diameter/dictionary.xml | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-diameter_3gpp.c | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml index d676391486..13cca7bdad 100644 --- a/diameter/dictionary.xml +++ b/diameter/dictionary.xml @@ -6214,6 +6214,12 @@ <gavp name="RAT-Type"/> </grouped> </avp> + <avp name="Interworking-5GS-Indicator" code="1706" mandatory="mustnot" vendor-bit="must" vendor-id="TGPP"> + <type type-name="Enumerated"/> + <enum name="NOT-SUBSCRIBED" code="0"/> + <enum name="SUBSCRIBED" code="1"/> + </avp> + <avp name="SMS-Information" code="2000" vendor-bit="must" vendor-id="TGPP"> <grouped> <gavp name="SMS-Node"/> diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c index b51c9c5d5c..c6be26bcf9 100644 --- a/epan/dissectors/packet-diameter_3gpp.c +++ b/epan/dissectors/packet-diameter_3gpp.c @@ -400,6 +400,8 @@ static int hf_diameter_3gpp_acc_res_dat_flags_bit5 = -1; static int hf_diameter_3gpp_acc_res_dat_flags_bit6 = -1; static int hf_diameter_3gpp_acc_res_dat_flags_bit7 = -1; static int hf_diameter_3gpp_acc_res_dat_flags_bit8 = -1; +static int hf_diameter_3gpp_acc_res_dat_flags_bit9 = -1; +static int hf_diameter_3gpp_acc_res_dat_flags_bit10 = -1; static int hf_diameter_3gpp_acc_res_dat_flags_spare_bits = -1; static int hf_diameter_3gpp_ida_flags_spare_bits = -1; static int hf_diameter_3gpp_pua_flags_spare_bits = -1; @@ -1946,6 +1948,8 @@ dissect_diameter_3gpp_acc_res_data(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ { static const int *flags[] = { &hf_diameter_3gpp_acc_res_dat_flags_spare_bits, + &hf_diameter_3gpp_acc_res_dat_flags_bit10, + &hf_diameter_3gpp_acc_res_dat_flags_bit9, &hf_diameter_3gpp_acc_res_dat_flags_bit8, &hf_diameter_3gpp_acc_res_dat_flags_bit7, &hf_diameter_3gpp_acc_res_dat_flags_bit6, @@ -4351,9 +4355,19 @@ proto_register_diameter_3gpp(void) FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000100, NULL, HFILL } }, + { &hf_diameter_3gpp_acc_res_dat_flags_bit9, + { "Unlicensed Spectrum as Secondary RAT Not Allowed", "diameter.3gpp.acc_res_dat_flags_bit9", + FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000200, + NULL, HFILL } + }, + { &hf_diameter_3gpp_acc_res_dat_flags_bit10, + { "NR in 5G Not Allowed", "diameter.3gpp.acc_res_dat_flags_bit10", + FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x00000400, + NULL, HFILL } + }, { &hf_diameter_3gpp_acc_res_dat_flags_spare_bits, { "Spare", "diameter.3gpp.acc_res_dat_flags_spare", - FT_UINT32, BASE_HEX, NULL, 0xFFFFFE00, + FT_UINT32, BASE_HEX, NULL, 0xFFFFF800, NULL, HFILL } }, |