diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-01-10 11:23:59 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2018-01-10 10:54:53 +0000 |
| commit | 85c9780f43fb215258f66ab6a55d1ed4ba0af474 (patch) | |
| tree | 4b35b8babae2df69ea2488d0d6855fda896a05bd /epan/dissectors/packet-nas_eps.c | |
| parent | bcefb0c8e6d9f87430cdee5ec966443f1c6cbfcf (diff) | |
NAS EPS: upgrade dissector to v15.1.1
Change-Id: I52a7124cf6f6c6e267525514e44e6c2903a11725
Reviewed-on: https://code.wireshark.org/review/25243
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nas_eps.c')
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index be85e87846..739b7edeac 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -9,7 +9,7 @@ * * SPDX-License-Identifier: GPL-2.0+ * - * References: 3GPP TS 24.301 V15.1.0 (2017-12) + * References: 3GPP TS 24.301 V15.1.1 (2017-12) */ #include "config.h" @@ -3926,8 +3926,8 @@ nas_emm_attach_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 ELEM_OPT_TV_SHORT(0xD0, GSM_A_PDU_TYPE_GM, DE_NON_3GPP_NW_PROV_POL, NULL); /* 6B T3448 value GPRS timer 2 9.9.3.16A O TLV 3 */ ELEM_OPT_TLV(0x6B, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3448 value"); - /* X- Network policy Network policy 9.9.3.52 O TV 1 */ - /*ELEM_OPT_TV_SHORT(0xX0, NAS_PDU_TYPE_EMM, DE_EMM_NETWORK_POLICY, NULL);*/ + /* C- Network policy Network policy 9.9.3.52 O TV 1 */ + ELEM_OPT_TV_SHORT(0xC0, NAS_PDU_TYPE_EMM, DE_EMM_NETWORK_POLICY, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_eps_extraneous_data); } @@ -4058,8 +4058,8 @@ nas_emm_attach_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 ELEM_OPT_TLV(0x5E, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_3, " - T3412 extended value"); /* 6E Extended DRX parameters Extended DRX parameters 9.9.3.46 O TLV 3 */ ELEM_OPT_TLV(0x6E, GSM_A_PDU_TYPE_GM, DE_EXT_DRX_PARAMS, NULL); - /* XX UE additional security capability UE additional security capability 9.9.3.53 O TLV 6 */ - /*ELEM_OPT_TLV(0xXX, NAS_PDU_TYPE_EMM, DE_EMM_UE_ADD_SEC_CAP, NULL);*/ + /* 6F UE additional security capability UE additional security capability 9.9.3.53 O TLV 6 */ + ELEM_OPT_TLV(0x6F, NAS_PDU_TYPE_EMM, DE_EMM_UE_ADD_SEC_CAP, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_eps_extraneous_data); } @@ -4522,8 +4522,8 @@ nas_emm_sec_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint3 ELEM_OPT_TV(0x56, NAS_PDU_TYPE_EMM, DE_EMM_NONCE, " - NonceMME"); /* 4F HashMME HashMME 9.9.3.50 O TLV 10 */ ELEM_OPT_TLV(0x4F, NAS_PDU_TYPE_EMM, DE_EMM_HASH_MME, NULL); - /* XX Replayed UE additional security capability UE additional security capability 9.9.3.53 O TLV 6 */ - /*ELEM_OPT_TLV(0xXX, NAS_PDU_TYPE_EMM, DE_EMM_UE_ADD_SEC_CAP, " - Replayed UE additional security capability");*/ + /* 6F Replayed UE additional security capability UE additional security capability 9.9.3.53 O TLV 6 */ + ELEM_OPT_TLV(0x6F, NAS_PDU_TYPE_EMM, DE_EMM_UE_ADD_SEC_CAP, " - Replayed UE additional security capability"); EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_eps_extraneous_data); } @@ -4698,8 +4698,8 @@ nas_emm_trac_area_upd_acc(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, g ELEM_OPT_TV_SHORT(0xD0, GSM_A_PDU_TYPE_GM, DE_NON_3GPP_NW_PROV_POL, NULL); /* 6B T3448 value GPRS timer 2 9.9.3.16A O TLV 3 */ ELEM_OPT_TLV(0x6B, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_2, " - T3448 value"); - /* X- Network policy Network policy 9.9.3.52 O TV 1 */ - /*ELEM_OPT_TV_SHORT(0xX0, NAS_PDU_TYPE_EMM, DE_EMM_NETWORK_POLICY, NULL);*/ + /* C- Network policy Network policy 9.9.3.52 O TV 1 */ + ELEM_OPT_TV_SHORT(0xC0, NAS_PDU_TYPE_EMM, DE_EMM_NETWORK_POLICY, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_eps_extraneous_data); } @@ -4816,8 +4816,8 @@ nas_emm_trac_area_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, g ELEM_OPT_TLV(0x5E, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_3, " - T3412 extended value"); /* 6E Extended DRX parameters Extended DRX parameters 9.9.3.46 O TLV 3 */ ELEM_OPT_TLV(0x6E, GSM_A_PDU_TYPE_GM, DE_EXT_DRX_PARAMS, NULL); - /* XX UE additional security capability UE additional security capability 9.9.3.53 O TLV 8 */ - /*ELEM_OPT_TLV(0xXX, NAS_PDU_TYPE_EMM, DE_EMM_UE_ADD_SEC_CAP, NULL);*/ + /* 6F UE additional security capability UE additional security capability 9.9.3.53 O TLV 8 */ + ELEM_OPT_TLV(0x6F, NAS_PDU_TYPE_EMM, DE_EMM_UE_ADD_SEC_CAP, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0, pinfo, &ei_nas_eps_extraneous_data); } |