diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-07-18 07:45:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-07-18 07:45:19 +0000 |
| commit | fccbea67023e20b02a526856698d507b77e160ae (patch) | |
| tree | f0b61bf08487bdfc5943bf3f63313f899d3854fc /asn1/rrc | |
| parent | 9d470cceb9a34fa4c5a90169a075e10c576c4e65 (diff) | |
| download | wireshark-fccbea67023e20b02a526856698d507b77e160ae.tar.gz | |
Merge the rest of Jacob Nordgren and Rishie Sharmas work on
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).
svn path=/trunk/; revision=43781
Diffstat (limited to 'asn1/rrc')
| -rw-r--r-- | asn1/rrc/packet-rrc-template.c | 2 | ||||
| -rw-r--r-- | asn1/rrc/rrc.cnf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index def3d07e97..8dcf26724c 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -68,7 +68,7 @@ enum nas_sys_info_gsm_map { RRC_NAS_SYS_INFO_CN_COMMON }; -static guint32 rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; +static enum nas_sys_info_gsm_map rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON; /* Forward declarations */ static int dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf index 4ab1f1111a..96f6593482 100644 --- a/asn1/rrc/rrc.cnf +++ b/asn1/rrc/rrc.cnf @@ -606,7 +606,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE 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 = (guint32*)(&rrc_nas_sys_info_gsm_map_type) %(DEFAULT_BODY)s #.FN_BODY CN-InformationInfo/cn-CommonGSM-MAP-NAS-SysInfo |