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

From Pascal Quantin: 

[NAS EPS] Use Request Type IE defined in 3GPP 24.008

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5246

svn path=/trunk/; revision=34179
This commit is contained in:
Anders Broman 2010-09-22 10:38:45 +00:00
parent 9a1c175692
commit b596b69f66
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5228,6 +5228,8 @@ dtap_sm_act_pdp_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
ELEM_OPT_TLV( 0x27 , GSM_A_PDU_TYPE_GM, DE_PRO_CONF_OPT , NULL);
ELEM_OPT_TV_SHORT(0xA0, GSM_A_PDU_TYPE_GM, DE_REQ_TYPE, NULL);
EXTRANEOUS_DATA_CHECK(curr_len, 0);
}

27
epan/dissectors/packet-nas_eps.c
View File

@ -186,7 +186,6 @@ static int hf_nas_eps_service_type = -1;
static int hf_nas_eps_msg_esm_type = -1;
int hf_nas_eps_esm_elem_id = -1;
static int hf_nas_eps_esm_proc_trans_id = -1;
static int hf_nas_eps_esm_request_type = -1;
/* Initialize the subtree pointers */
static int ett_nas_eps = -1;
@ -2203,13 +2202,8 @@ static const value_string nas_eps_esm_pdn_type_values[] = {
*/
/*
* 9.9.4.14 Request type
* Coded inline 1/2 octet
* See subclause 10.5.6.17 in 3GPP TS 24.008
*/
static const value_string nas_eps_esm_request_type_values[] = {
{ 0x1, "Initial attach" },
{ 0x2, "Handover" },
{ 0, NULL }
};
/*
* 9.9.4.15 Traffic flow aggregate description
* The Traffic flow aggregate description information element is encoded using the same format as the Traffic flow
@ -3797,25 +3791,21 @@ nas_esm_pdn_con_rej(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
static void
nas_esm_pdn_con_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len)
{
guint32 curr_offset, bit_offset;
guint32 curr_offset;
guint32 consumed;
guint curr_len;
curr_offset = offset;
curr_len = len;
bit_offset=curr_offset<<3;
/* PDN type PDN type 9.9.4.10 M V 1/2 */
proto_tree_add_bits_item(tree, hf_nas_eps_esm_pdn_type, tvb, bit_offset, 4, FALSE);
bit_offset+=4;
proto_tree_add_bits_item(tree, hf_nas_eps_esm_pdn_type, tvb, (curr_offset<<3), 4, FALSE);
/* Request type 9.9.4.14 M V 1/2 */
proto_tree_add_bits_item(tree, hf_nas_eps_esm_request_type, tvb, bit_offset, 4, FALSE);
bit_offset+=4;
ELEM_MAND_V(GSM_A_PDU_TYPE_GM, DE_REQ_TYPE);
/* Fix up the lengths */
curr_len--;
curr_offset++;
/* Lengths already fixed by the call to ELEM_MAND_V macro */
if (curr_len==0)
return;
@ -4901,11 +4891,6 @@ void proto_register_nas_eps(void) {
FT_UINT8, BASE_DEC, VALS(nas_eps_esm_pdn_type_values), 0x0,
NULL, HFILL }
},
{ &hf_nas_eps_esm_request_type,
{ "Request type", "nas_eps.esm_request_type",
FT_UINT8, BASE_HEX, VALS(nas_eps_esm_request_type_values), 0x0,
NULL, HFILL }
},
};
/* Setup protocol subtree array */