diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-06-19 07:16:14 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-06-19 07:16:14 +0000 |
commit | 2eec913a4d7341bbf7aef85006bd60581da35ea6 (patch) | |
tree | 334a1457d1f52cde53cc95e98f08b5ab021ccd60 /asn1/rrc/rrc.cnf | |
parent | f4e5a623258cc9ca5dd10a075a95be1780c73db7 (diff) |
Fet rid of a global variable
svn path=/trunk/; revision=50034
Diffstat (limited to 'asn1/rrc/rrc.cnf')
-rw-r--r-- | asn1/rrc/rrc.cnf | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 14737d51ca..fc0a519d35 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -654,23 +654,25 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE actx->created_item = proto_tree_add_unicode_string(tree, hf_index, hnbname_tvb, 0, -1, tvb_get_ephemeral_string_enc(hnbname_tvb, 0, tvb_length(hnbname_tvb), ENC_UTF_8 | ENC_NA)); -#.FN_BODY CN-DomainIdentity VAL_PTR = &rrc_nas_sys_info_gsm_map_type +#.FN_BODY CN-DomainIdentity VAL_PTR = &nas_sys_info_gsm_map + guint32 nas_sys_info_gsm_map; %(DEFAULT_BODY)s + actx->private_data = GUINT_TO_POINTER(nas_sys_info_gsm_map); #.FN_BODY CN-InformationInfo/cn-CommonGSM-MAP-NAS-SysInfo - rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; + actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON); %(DEFAULT_BODY)s #.FN_BODY CN-InformationInfo-r6/cn-CommonGSM-MAP-NAS-SysInfo - rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; + actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON); %(DEFAULT_BODY)s #.FN_BODY CN-InformationInfoFull/cn-CommonGSM-MAP-NAS-SysInfo - rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; + actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON); %(DEFAULT_BODY)s #.FN_BODY SysInfoType1/cn-CommonGSM-MAP-NAS-SysInfo - rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; + actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CN_COMMON); %(DEFAULT_BODY)s #.FN_BODY NAS-SystemInformationGSM-MAP VAL_PTR = &nas_sys_info_gsm_map_tvb @@ -682,7 +684,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE %(DEFAULT_BODY)s length = tvb_length(nas_sys_info_gsm_map_tvb); if (length) { - switch (rrc_nas_sys_info_gsm_map_type) { + switch (GPOINTER_TO_UINT(actx->private_data)) { case RRC_NAS_SYS_INFO_CN_COMMON: item = proto_tree_add_text(tree, nas_sys_info_gsm_map_tvb, 0, length, "CN Common GSM-MAP NAS system information"); subtree = proto_item_add_subtree(item, ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo); @@ -702,7 +704,6 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE break; } } - rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; /*Here we try to figure out which HS-DSCH channels are multiplexed*/ #.FN_BODY DL-TransportChannelType-r5 VAL_PTR = &type @@ -809,7 +810,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE return offset; } /*Retrieve the start value for the two ciphering domains*/ - switch(rrc_nas_sys_info_gsm_map_type){ + switch(GPOINTER_TO_UINT(actx->private_data)){ case RRC_NAS_SYS_INFO_CS: /* g_warning("Not implemented"); @@ -845,8 +846,6 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE default: break; } - /*is this dangerous?*/ - rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; #.FN_BODY RB-ActivationTimeInfo fp_info *fpinf; @@ -889,5 +888,13 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE #.FN_BODY HandoverToUTRANCommand %(DEFAULT_BODY)s +#.FN_BODY UE-SecurityInformation + actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_CS); +%(DEFAULT_BODY)s + +#.FN_BODY UE-SecurityInformation2 + actx->private_data = GUINT_TO_POINTER(RRC_NAS_SYS_INFO_PS); +%(DEFAULT_BODY)s + #.END |