diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-03-29 22:14:27 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-29 22:56:03 +0000 |
| commit | 684ca9db12b107f7d0ab5f2e5e29320da5ef9a77 (patch) | |
| tree | 4d2f395be486a7d533dae331333f8422e5e6c3f5 /epan/dissectors/packet-nas_5gs.c | |
| parent | e2ec760d5ec00168d20b6c87095d8752934d732f (diff) | |
3GPP NAS: upgrade dissector to v15.2.0
Change-Id: I11510356950c1eab4d77f8473f62aa6428311853
Reviewed-on: https://code.wireshark.org/review/26682
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nas_5gs.c')
| -rwxr-xr-x | epan/dissectors/packet-nas_5gs.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index e4ea366e2c..be03bd756d 100755 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -195,8 +195,6 @@ static expert_field ei_nas_5gs_num_pkt_flt = EI_INIT; static expert_field ei_nas_5gs_not_diss = EI_INIT; -static guint16 de_nas_5gs_mm_s_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_); - static const value_string nas_5gs_security_header_type_vals[] = { { 0, "Plain NAS message, not security protected"}, { 1, "Integrity protected"}, @@ -1041,7 +1039,7 @@ de_nas_5gs_mm_rej_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /* * 9.8.3.37 S-NSSAI */ -static guint16 +guint16 de_nas_5gs_mm_s_nssai(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) @@ -1516,7 +1514,7 @@ static const value_string nas_5gs_sm_pf_type_values[] = { }; -static guint16 +guint16 de_nas_5gs_sm_qos_rules(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) @@ -1692,7 +1690,8 @@ get_ext_ambr_unit(guint32 unit, const char **unit_str) } return mult; } -static guint16 + +guint16 de_nas_5gs_sm_session_ambr(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) @@ -3470,6 +3469,25 @@ disect_nas_5gs_mm_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int o } +const value_string nas_5gs_pdu_session_id_vals[] = { + { 0x00, "No PDU session identity assigned" }, + { 0x01, "Reserved" }, + { 0x02, "Reserved" }, + { 0x03, "Reserved" }, + { 0x04, "Reserved" }, + { 0x05, "PDU session identity value 5" }, + { 0x06, "PDU session identity value 6" }, + { 0x07, "PDU session identity value 7" }, + { 0x08, "PDU session identity value 8" }, + { 0x09, "PDU session identity value 9" }, + { 0x0a, "PDU session identity value 10" }, + { 0x0b, "PDU session identity value 11" }, + { 0x0c, "PDU session identity value 12" }, + { 0x0d, "PDU session identity value 13" }, + { 0x0e, "PDU session identity value 14" }, + { 0x0f, "PDU session identity value 15" }, + { 0, NULL } +}; static int dissect_nas_5gs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -3630,7 +3648,7 @@ proto_register_nas_5gs(void) }, { &hf_nas_5gs_pdu_session_id, { "PDU session identity", "nas_5gs.pdu_session_id", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT8, BASE_DEC, VALS(nas_5gs_pdu_session_id_vals), 0x0, NULL, HFILL } }, { &hf_nas_5gs_msg_elems, |