osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Upgrade NAS disssectors to v11.7.0 

svn path=/trunk/; revision=50494
This commit is contained in:
Pascal Quantin 2013-07-10 21:31:22 +00:00
parent 783902ca74
commit ef942ca080
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-gsm_a_common.c
View File

@ -703,6 +703,7 @@ static int hf_gsm_a_tighter_cap = -1;
static int hf_gsm_a_selective_ciph_down_sacch = -1;
static int hf_gsm_a_cs_to_ps_srvcc_geran_to_utra = -1;
static int hf_gsm_a_cs_to_ps_srvcc_geran_to_eutra = -1;
static int hf_gsm_a_geran_network_sharing_support = -1;
static int hf_gsm_a_geo_loc_type_of_shape = -1;
static int hf_gsm_a_geo_loc_sign_of_lat = -1;
@ -2418,7 +2419,7 @@ de_ms_cm_2(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset,
/*
* [3] 10.5.1.7 Mobile Station Classmark 3
* 3GPP TS 24.008 version 11.6.0 Release 11
* 3GPP TS 24.008 version 11.7.0 Release 11
*/
#define AVAILABLE_BITS_CHECK(n) \
bits_left = ((len + offset) << 3) - bit_offset; \
@ -3138,6 +3139,13 @@ de_ms_cm_3(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset,
proto_tree_add_bits_item(tree, hf_gsm_a_cs_to_ps_srvcc_geran_to_eutra, tvb, bit_offset, 2, ENC_BIG_ENDIAN);
bit_offset = bit_offset + 2;
/*
* < GERAN Network Sharing support : bit(1)>
*/
AVAILABLE_BITS_CHECK(1);
proto_tree_add_bits_item(tree, hf_gsm_a_geran_network_sharing_support, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
bit_offset = bit_offset + 1;
/*
* Add spare bits until we reach an octet boundary
*/
@ -4256,6 +4264,11 @@ proto_register_gsm_a_common(void)
FT_UINT8, BASE_DEC, VALS(cs_to_ps_srvcc_geran_to_eutra_vals), 0x00,
NULL, HFILL}
},
{ &hf_gsm_a_geran_network_sharing_support,
{ "GERAN Network Sharing support", "gsm_a.classmark3.ggeran_network_sharing_support",
FT_BOOLEAN, BASE_NONE, TFS(&true_false_vals), 0x00,
NULL, HFILL}
},
{ &hf_gsm_a_geo_loc_type_of_shape,
{ "Location estimate", "gsm_a.gad.location_estimate",
FT_UINT8, BASE_DEC, VALS(type_of_shape_vals), 0xf0,

19
epan/dissectors/packet-gsm_a_gm.c
View File

@ -45,7 +45,7 @@
* Mobile radio interface Layer 3 specification;
* Core network protocols;
* Stage 3
* (3GPP TS 24.008 version 11.6.0 Release 11)
* (3GPP TS 24.008 version 11.7.0 Release 11)
*
* $Id$
*
@ -413,6 +413,7 @@ static int hf_gsm_a_gm_rac_fast_down_freq_switch_cap = -1;
static int hf_gsm_a_gm_rac_tighter_cap = -1;
static int hf_gsm_a_gm_rac_fanr_cap = -1;
static int hf_gsm_a_gm_rac_ipa_cap = -1;
static int hf_gsm_a_gm_rac_geran_nw_sharing_support = -1;
static int hf_gsm_a_sm_ti_flag = -1;
static int hf_gsm_a_sm_ext = -1;
@ -2907,6 +2908,17 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui
bit_offset += bits_needed;
curr_bits_length -= bits_needed;
oct <<= bits_needed;
bits_in_oct -= bits_needed;
/*
* GERAN Network Sharing support
*/
bits_needed = 1;
GET_DATA;
proto_tree_add_bits_item(tf_tree, hf_gsm_a_gm_rac_geran_nw_sharing_support, tvb, bit_offset, 1, ENC_BIG_ENDIAN);
bit_offset += bits_needed;
curr_bits_length -= bits_needed;
oct <<= bits_needed;
bits_in_oct -= bits_needed;
/*
@ -8181,6 +8193,11 @@ proto_register_gsm_a_gm(void)
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_gm_rac_geran_nw_sharing_support,
{ "GERAN Network Sharing support", "gsm_a.gm.gmm.rac.geran_nw_sharing_support",
FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0x0,
NULL, HFILL }
},
{ &hf_gsm_a_sm_ti_flag,
{ "TI Flag", "gsm_a.gm.sm.ti_flag",
FT_BOOLEAN, 8, TFS(&gsm_a_sm_ti_flag_vals), 0x80,