diff options
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.h | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_gm.c | 32 | ||||
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 119 |
3 files changed, 136 insertions, 16 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h index daa353a2f4..67809c5aa1 100644 --- a/epan/dissectors/packet-gsm_a_common.h +++ b/epan/dissectors/packet-gsm_a_common.h @@ -1106,6 +1106,7 @@ typedef enum DE_VOICE_DOMAIN_PREF, /* [7] 10.5.5.28 Voice domain preference and UE's usage setting */ DE_PTMSI_TYPE, /* [10] 10.5.5.29 P-TMSI type */ DE_LAI_2, /* [10] 10.5.5.30 Location Area Identification 2 */ + DE_NET_RES_ID_CONT, /* [11] 10.5.5.31 Network resource identifier container */ /* Session Management Information Elements [3] 10.5.6 */ DE_ACC_POINT_NAME, /* Access Point Name */ DE_NET_SAPI, /* Network Service Access Point Identifier */ diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 9fb792b8a4..e01f8b5b73 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -41,6 +41,12 @@ * Stage 3 * (3GPP TS 24.008 version 10.6.1 Release 10) * + * Reference [11] + * Mobile radio interface Layer 3 specification; + * Core network protocols; + * Stage 3 + * (3GPP TS 24.008 version 11.4.0 Release 11) + * * $Id$ * * Wireshark - Network traffic analyzer @@ -178,6 +184,7 @@ const value_string gsm_gm_elem_strings[] = { { 0x00, "Voice domain preference and UE's usage setting" }, { 0x00, "P-TMSI type" }, { 0x00, "Location Area Identification 2" }, + { 0x00, "Network resource identifier container" }, /* Session Management Information Elements 10.5.6 */ { 0x00, "Access Point Name" }, { 0x00, "Network Service Access Point Identifier" }, @@ -311,6 +318,7 @@ static int hf_gsm_a_gm_req_ms_info_irat2 = -1; static int hf_gsm_a_gm_ue_usage_setting = -1; static int hf_gsm_a_gm_voice_domain_pref_for_eutran = -1; static int hf_gsm_a_gm_ptmsi_type = -1; +static int hf_gsm_a_gm_nri_cont = -1; static int hf_gsm_a_sm_pdp_type_org = -1; static int hf_gsm_a_sm_qos_mean_thr = -1; static int hf_gsm_a_sm_qos_peak_thr = -1; @@ -3341,6 +3349,7 @@ de_gmm_ptmsi_type(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint return (curr_offset - offset); } + /* [10] 10.5.5.30 Location Area Identification 2 */ static guint16 de_gmm_lai_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len) @@ -3350,6 +3359,23 @@ de_gmm_lai_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset return de_lai(tvb, tree, pinfo, offset, len, add_string, string_len); } +/* [11] 10.5.5.31 Network resource identifier container */ +static guint16 +de_gmm_net_res_id_cont(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string _U_, int string_len _U_) +{ + guint32 curr_offset; + guint32 bit_offset; + + curr_offset = offset; + bit_offset = curr_offset<<3; + + proto_tree_add_item(tree, hf_gsm_a_gm_nri_cont, tvb, curr_offset, 2, ENC_BIG_ENDIAN); + bit_offset += 10; + proto_tree_add_bits_item(tree, hf_gsm_a_spare_bits, tvb, bit_offset, 6, ENC_BIG_ENDIAN); + + return len; +} + /* * [7] 10.5.7.1 */ @@ -5271,6 +5297,7 @@ guint16 (*gm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ de_gmm_voice_domain_pref, /* Voice domain preference and UE's usage setting */ de_gmm_ptmsi_type, /* P-TMSI type */ de_gmm_lai_2, /* Location Area Identification 2 */ + de_gmm_net_res_id_cont, /* Network resource identifier container */ /* Session Management Information Elements 10.5.6 */ de_sm_apn, /* Access Point Name */ de_sm_nsapi, /* Network Service Access Point Identifier */ @@ -7343,6 +7370,11 @@ proto_register_gsm_a_gm(void) FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_gm_ptmsi_type_value), 0x0, NULL, HFILL } }, + { &hf_gsm_a_gm_nri_cont, + { "NRI container value", "gsm_a.gm.gmm.nri_cont_value", + FT_UINT16, BASE_HEX, NULL, 0xffc0, + NULL, HFILL } + }, { &hf_gsm_a_sm_pdp_type_org, { "PDP type organization", "gsm_a.gm.sm.pdp_type_org", FT_UINT8, BASE_DEC, VALS(gsm_a_sm_pdp_type_org_vals), 0x0f, diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index e969cc51c4..b1ac8dd4ed 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * References: 3GPP TS 24.301 V10.6.1 (2012-03) + * References: 3GPP TS 24.301 V11.4.0 (2012-09) */ #include "config.h" @@ -151,6 +151,7 @@ static int hf_nas_eps_emm_gea4 = -1; static int hf_nas_eps_emm_gea5 = -1; static int hf_nas_eps_emm_gea6 = -1; static int hf_nas_eps_emm_gea7 = -1; +static int hf_nas_eps_emm_h245_ash_cap = -1; static int hf_nas_eps_emm_acc_csfb_cap = -1; static int hf_nas_eps_emm_lpp_cap = -1; static int hf_nas_eps_emm_lcs_cap = -1; @@ -364,6 +365,25 @@ calc_bitrate_ext(guint8 value) { return return_value; } +static guint32 +calc_bitrate_ext2(guint8 value) { + guint32 return_value = 0; + + if ((value > 0) && (value <= 0x3d)) { + return_value = 256 + value * 4; + } + else if ((value > 0x3d) && (value <= 0xa1)) { + return_value = 500 + (value-0x3d) * 10; + } + else if ((value > 0xa1) && (value <= 0xf6)) { + return_value = 1500 + (value-0xa1) * 100; + } + else { + return_value = 10000; + } + + return return_value; +} #define NUM_NAS_EPS_COMMON_ELEM (sizeof(nas_eps_common_elem_strings)/sizeof(value_string)) gint ett_nas_eps_common_elem[NUM_NAS_EPS_COMMON_ELEM]; @@ -892,6 +912,7 @@ static const value_string nas_eps_emm_cause_values[] = { { 0x23, "Requested service option not authorized in this PLMN"}, { 0x27, "CS service temporarily not available"}, { 0x28, "No EPS bearer context activated"}, + { 0x2a, "Severe network failure"}, { 0x5f, "Semantically incorrect message"}, { 0x60, "Invalid mandatory information"}, { 0x61, "Message type non-existent or not implemented"}, @@ -1352,7 +1373,7 @@ static const value_string nas_eps_emm_toi_vals[] = { { 0, "EPS integrity algorithm EIA0 (null integrity protection algorithm)"}, { 1, "EPS integrity algorithm 128-EIA1"}, { 2, "EPS integrity algorithm 128-EIA2"}, - { 3, "EPS integrity algorithm EIA3"}, + { 3, "EPS integrity algorithm 128-EIA3"}, { 4, "EPS integrity algorithm EIA4"}, { 5, "EPS integrity algorithm EIA5"}, { 6, "EPS integrity algorithm EIA6"}, @@ -1366,7 +1387,7 @@ static const value_string nas_eps_emm_toc_vals[] = { { 0, "EPS encryption algorithm EEA0 (null ciphering algorithm)"}, { 1, "EPS encryption algorithm 128-EEA1"}, { 2, "EPS encryption algorithm 128-EEA2"}, - { 3, "EPS encryption algorithm EEA3"}, + { 3, "EPS encryption algorithm 128-EEA3"}, { 4, "EPS encryption algorithm EEA4"}, { 5, "EPS encryption algorithm EEA5"}, { 6, "EPS encryption algorithm EEA6"}, @@ -1607,6 +1628,11 @@ static const true_false_string nas_eps_emm_ucs2_supp_flg_value = { "The UE has no preference between the use of the default alphabet and the use of UCS2", "The UE has a preference for the default alphabet" }; +/* H.245-ASH capability (octet 7, bit 6) */ +static const true_false_string nas_eps_emm_h245_ash_cap_flg = { + "H.245 after SRVCC handover capability supported", + "H.245 after SRVCC handover capability not supported" +}; /* ACC-CSFB capability (octet 7, bit 5) */ static const true_false_string nas_eps_emm_acc_csfb_cap_flg = { "eNodeB-based access class control for CSFB supported", @@ -1668,7 +1694,7 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint proto_tree_add_item(tree, hf_nas_eps_emm_128eia1, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* EPS integrity algorithm 128-EIA2 supported (octet 4, bit 6) */ proto_tree_add_item(tree, hf_nas_eps_emm_128eia2, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - /* EPS integrity algorithm EIA3 supported (octet 4, bit 5) */ + /* EPS integrity algorithm 128-EIA3 supported (octet 4, bit 5) */ proto_tree_add_item(tree, hf_nas_eps_emm_eia3, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* EPS integrity algorithm EIA4 supported (octet 4, bit 4) */ proto_tree_add_item(tree, hf_nas_eps_emm_eia4, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -1734,8 +1760,10 @@ de_emm_ue_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint if ((curr_offset - offset) >= len) return (len); - /* Bits 8 to 6 of octet 7 are spare and shall be coded as zero. */ - proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3), 3, ENC_BIG_ENDIAN); + /* Bits 8 to 7 of octet 7 are spare and shall be coded as zero. */ + proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3), 2, ENC_BIG_ENDIAN); + /* H.245-ASH capability (octet 7, bit 6) */ + proto_tree_add_item(tree, hf_nas_eps_emm_h245_ash_cap, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* ACC-CSFB capability (octet 7, bit 5) */ proto_tree_add_item(tree, hf_nas_eps_emm_acc_csfb_cap, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* LPP capability (octet 7, bit 4) */ @@ -1767,6 +1795,7 @@ de_emm_ue_ra_cap_inf_upd_need(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf curr_offset = offset; + proto_tree_add_bits_item(tree, hf_nas_eps_spare_bits, tvb, (curr_offset<<3)+4, 3, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_nas_eps_emm_ue_ra_cap_inf_upd_need_flg, tvb, curr_offset, 1, ENC_BIG_ENDIAN); return(len); @@ -1809,7 +1838,7 @@ de_emm_ue_sec_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint proto_tree_add_item(tree, hf_nas_eps_emm_128eia1, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* EPS integrity algorithm 128-EIA2 supported (octet 4, bit 6) */ proto_tree_add_item(tree, hf_nas_eps_emm_128eia2, tvb, curr_offset, 1, ENC_BIG_ENDIAN); - /* EPS integrity algorithm EIA3 supported (octet 4, bit 5) */ + /* EPS integrity algorithm 128-EIA3 supported (octet 4, bit 5) */ proto_tree_add_item(tree, hf_nas_eps_emm_eia3, tvb, curr_offset, 1, ENC_BIG_ENDIAN); /* EPS integrity algorithm EIA4 supported (octet 4, bit 4) */ proto_tree_add_item(tree, hf_nas_eps_emm_eia4, tvb, curr_offset, 1, ENC_BIG_ENDIAN); @@ -2282,7 +2311,7 @@ de_esm_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs "Use the value indicated by the maximum bit rate for uplink in octet 4"); } else { proto_tree_add_uint_format(tree, hf_nas_eps_embr_ul, tvb, curr_offset, 1, octet, - "Maximum bit rate for uplink(extended) : %u %s", + "Maximum bit rate for uplink (extended) : %u %s", calc_bitrate_ext(octet), (octet > 0x4a) ? "Mbps" : "kbps"); } @@ -2296,7 +2325,7 @@ de_esm_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs "Use the value indicated by the maximum bit rate for downlink in octet 5"); } else { proto_tree_add_uint_format(tree, hf_nas_eps_embr_dl, tvb, curr_offset, 1, octet, - "Maximum bit rate for downlink(extended) : %u %s", + "Maximum bit rate for downlink (extended) : %u %s", calc_bitrate_ext(octet), (octet > 0x4a) ? "Mbps" : "kbps"); } @@ -2310,7 +2339,7 @@ de_esm_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs "Use the value indicated by the guaranteed bit rate for uplink in octet 6"); } else { proto_tree_add_uint_format(tree, hf_nas_eps_egbr_ul, tvb, curr_offset, 1, octet, - "Guaranteed bit rate for uplink(extended) : %u %s", + "Guaranteed bit rate for uplink (extended) : %u %s", calc_bitrate_ext(octet), (octet > 0x4a) ? "Mbps" : "kbps"); } @@ -2324,11 +2353,56 @@ de_esm_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs "Use the value indicated by the guaranteed bit rate for downlink in octet 7"); } else { proto_tree_add_uint_format(tree, hf_nas_eps_egbr_dl, tvb, curr_offset, 1, octet, - "Guaranteed bit rate for downlink(extended) : %u %s", + "Guaranteed bit rate for downlink (extended) : %u %s", calc_bitrate_ext(octet), (octet > 0x4a) ? "Mbps" : "kbps"); } curr_offset++; + if ((curr_offset - offset) >= len) + return(len); + /* Maximum bit rate for uplink (extended-2) octet 12 */ + octet = tvb_get_guint8(tvb,curr_offset); + if (octet == 0) { + proto_tree_add_uint_format(tree, hf_nas_eps_embr_ul, tvb, curr_offset, 1, octet, + "Use the value indicated by the maximum bit rate for uplink in octet 4 and octet 8"); + } else { + proto_tree_add_uint_format(tree, hf_nas_eps_embr_ul, tvb, curr_offset, 1, octet, + "Maximum bit rate for uplink (extended-2) : %u Mbps", + calc_bitrate_ext2(octet)); + } + curr_offset++; + /* Maximum bit rate for downlink (extended-2) octet 13 */ + octet = tvb_get_guint8(tvb,curr_offset); + if (octet == 0) { + proto_tree_add_uint_format(tree, hf_nas_eps_embr_dl, tvb, curr_offset, 1, octet, + "Use the value indicated by the maximum bit rate for downlink in octet 5 and octet 9"); + } else { + proto_tree_add_uint_format(tree, hf_nas_eps_embr_dl, tvb, curr_offset, 1, octet, + "Maximum bit rate for downlink (extended-2) : %u Mbps", + calc_bitrate_ext2(octet)); + } + curr_offset++; + /* Guaranteed bit rate for uplink (extended-2) octet 14 */ + octet = tvb_get_guint8(tvb,curr_offset); + if (octet == 0) { + proto_tree_add_uint_format(tree, hf_nas_eps_egbr_ul, tvb, curr_offset, 1, octet, + "Use the value indicated by the guaranted bit rate for uplink in octet 6 and octet 10"); + } else { + proto_tree_add_uint_format(tree, hf_nas_eps_egbr_ul, tvb, curr_offset, 1, octet, + "Guaranteed bit rate for uplink (extended-2) : %u Mbps", + calc_bitrate_ext2(octet)); + } + curr_offset++; + /* Guaranted bit rate for downlink (extended-2) octet 15 */ + octet = tvb_get_guint8(tvb,curr_offset); + if (octet == 0) { + proto_tree_add_uint_format(tree, hf_nas_eps_egbr_dl, tvb, curr_offset, 1, octet, + "Use the value indicated by the guaranteed bit rate for downlink in octet 7 and octet 11"); + } else { + proto_tree_add_uint_format(tree, hf_nas_eps_egbr_dl, tvb, curr_offset, 1, octet, + "Guaranteed bit rate for downlink (extended-2) : %u Mbps", + calc_bitrate_ext2(octet)); + } return(len); } @@ -2339,7 +2413,7 @@ de_esm_qos(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs static const value_string nas_eps_esm_cause_vals[] = { { 0x08, "Operator Determined Barring"}, { 0x1a, "Insufficient resources"}, - { 0x1b, "Unknown or missing APN"}, + { 0x1b, "Missing or unknown APN"}, { 0x1c, "Unknown PDN type"}, { 0x1d, "User authentication failed"}, { 0x1e, "Request rejected by Serving GW or PDN GW"}, @@ -2369,6 +2443,8 @@ static const value_string nas_eps_esm_cause_vals[] = { { 0x38, "Collision with network initiated request"}, { 0x3b, "Unsupported QCI value"}, { 0x3c, "Bearer handling not supported"}, + { 0x41, "Maximum number of EPS bearers reached"}, + { 0x42, "Requested APN not supported in current RAT and PLMN combination"}, { 0x51, "Invalid PTI value"}, { 0x5f, "Semantically incorrect message"}, { 0x60, "Invalid mandatory information"}, @@ -2898,6 +2974,8 @@ nas_emm_attach_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin ELEM_OPT_TV_SHORT(0xE0 , NAS_PDU_TYPE_EMM, DE_EMM_GUTI_TYPE, " - Old GUTI type"); /* C- MS network feature support MS network feature support 9.9.3.20A 0 TV 1 */ ELEM_OPT_TV_SHORT(0xC0 , GSM_A_PDU_TYPE_COMMON, DE_MS_NET_FEAT_SUP, NULL); + /* 10 TMSI based NRI container Network resource identifier container 9.9.3.24A 0 TLV 4 */ + ELEM_OPT_TLV(0x10, GSM_A_PDU_TYPE_GM, DE_NET_RES_ID_CONT, " - TMSI based NRI container"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -3638,6 +3716,8 @@ nas_emm_trac_area_upd_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U ELEM_OPT_TV_SHORT(0xD0 , GSM_A_PDU_TYPE_GM, DE_DEVICE_PROPERTIES, NULL); /* C- MS network feature support MS network feature support 9.9.3.20A 0 TV 1 */ ELEM_OPT_TV_SHORT(0xC0 , GSM_A_PDU_TYPE_COMMON, DE_MS_NET_FEAT_SUP, NULL); + /* 10 TMSI based NRI container Network resource identifier container 9.9.3.24A 0 TLV 4 */ + ELEM_OPT_TLV(0x10, GSM_A_PDU_TYPE_GM, DE_NET_RES_ID_CONT, " - TMSI based NRI container"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4082,6 +4162,8 @@ nas_esm_deact_eps_bearer_ctx_req(tvbuff_t *tvb, proto_tree *tree, packet_info *p ELEM_MAND_V(NAS_PDU_TYPE_ESM, DE_ESM_CAUSE, NULL); /* 27 Protocol configuration options Protocol configuration options 9.9.4.11 O TLV */ ELEM_OPT_TLV( 0x27 , GSM_A_PDU_TYPE_GM, DE_PRO_CONF_OPT , NULL ); + /* 37 T3396 value GPRS timer 3 9.9.3.16B O TLV 3 */ + ELEM_OPT_TLV(0x37, GSM_A_PDU_TYPE_GM, DE_GPRS_TIMER_3, " - T3396 value"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5159,7 +5241,7 @@ proto_register_nas_eps(void) { NULL, HFILL } }, { &hf_nas_eps_emm_eea3, - { "EEA3","nas_eps.emm.eea3", + { "128-EEA3","nas_eps.emm.eea3", FT_BOOLEAN, 8, TFS(&nas_eps_emm_supported_flg_value), 0x10, NULL, HFILL } }, @@ -5199,7 +5281,7 @@ proto_register_nas_eps(void) { NULL, HFILL } }, { &hf_nas_eps_emm_eia3, - { "EIA3","nas_eps.emm.eia3", + { "128-EIA3","nas_eps.emm.eia3", FT_BOOLEAN, 8, TFS(&nas_eps_emm_supported_flg_value), 0x10, NULL, HFILL } }, @@ -5340,6 +5422,11 @@ proto_register_nas_eps(void) { FT_BOOLEAN, 8, TFS(&nas_eps_emm_supported_flg_value), 0x01, NULL, HFILL } }, + { &hf_nas_eps_emm_h245_ash_cap, + { "H.245-ASH capability","nas_eps.emm.h245_ash_cap", + FT_BOOLEAN, 8, TFS(&nas_eps_emm_h245_ash_cap_flg), 0x20, + "H.245 after SRVCC handover capability", HFILL } + }, { &hf_nas_eps_emm_acc_csfb_cap, { "ACC-CSFB capability","nas_eps.emm.acc_csfb_cap", FT_BOOLEAN, 8, TFS(&nas_eps_emm_acc_csfb_cap_flg), 0x10, @@ -5366,9 +5453,9 @@ proto_register_nas_eps(void) { NULL, HFILL } }, { &hf_nas_eps_emm_ue_ra_cap_inf_upd_need_flg, - { "1xSRVCC capability","nas_eps.emm.ue_ra_cap_inf_upd_need_flg", + { "URC upd","nas_eps.emm.ue_ra_cap_inf_upd_need_flg", FT_BOOLEAN, 8, TFS(&nas_eps_emm_ue_ra_cap_inf_upd_need_flg), 0x01, - NULL, HFILL } + "UE radio capability information update needed flag", HFILL } }, { &hf_nas_eps_emm_ss_code, { "SS Code","nas_eps.emm.ss_code", |