osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

emem -> wmem (don't forget about .cnf) 

svn path=/trunk/; revision=52058
This commit is contained in:
Jörg Mayer 2013-09-15 14:33:38 +00:00
parent b936b046de
commit c65459c729
7 changed files with 263 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
asn1/nbap/nbap.cnf
View File

@ -103,7 +103,7 @@ ProtocolIE-ContainerPairList
#.END
#.FN_FTR ProcedureID
ProcedureID = ep_strdup_printf("%s/%s",
ProcedureID = wmem_strdup_printf(wmem_packet_scope(), "%s/%s",
val_to_str(ProcedureCode, VALS(nbap_ProcedureCode_vals), "unknown(%u)"),
val_to_str(ddMode, VALS(nbap_DdMode_vals), "unknown(%u)"));
crcn_context_present = FALSE; /*Reset CRNC Com context present flag.*/
@ -758,7 +758,7 @@ transportFormatSet_type = NBAP_CPCH;
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the data */
umts_fp_conversation_info->iface_type = IuB_Interface;
umts_fp_conversation_info->division = Division_FDD;
@ -851,7 +851,7 @@ num_items = 1;
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the data */
umts_fp_conversation_info->iface_type = IuB_Interface;
umts_fp_conversation_info->division = Division_FDD;
@ -960,7 +960,7 @@ transportFormatSet_type = NBAP_CPCH;
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the data */
umts_fp_conversation_info->iface_type = IuB_Interface;
umts_fp_conversation_info->division = Division_FDD;
@ -1166,7 +1166,7 @@ dch_id = 0xFFFFFFFF;
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the data */
umts_fp_conversation_info->iface_type = IuB_Interface;
@ -1280,7 +1280,7 @@ BindingID_port = 0;
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the data */
umts_fp_conversation_info->iface_type = IuB_Interface;
umts_fp_conversation_info->division = Division_FDD;
@ -1451,7 +1451,7 @@ BindingID_port = 0;
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/*Steal the old informatoin*/
memcpy(umts_fp_conversation_info,conversation_get_proto_data(old_conversation, proto_fp),sizeof(umts_fp_conversation_info_t));
@ -1796,7 +1796,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the HSDSCH relevant data */
umts_fp_conversation_info->iface_type = IuB_Interface;
@ -1913,7 +1913,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
conversation_set_dissector(conversation, fp_handle);
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the HSDSCH relevant data */
umts_fp_conversation_info->iface_type = IuB_Interface;
@ -2037,7 +2037,7 @@ int i;
/*Set NBAP configuration to lower layers*/
if(actx->pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/*Select frame type = 3 according to paragraph 5.1.6 in 3GPP TS 25.435*/
umts_fp_conversation_info->channel = CHANNEL_HSDSCH_COMMON;
umts_fp_conversation_info->division = Division_FDD;

3
asn1/nbap/packet-nbap-template.c
View File

@ -32,6 +32,7 @@
#include <epan/packet.h>
#include <epan/sctpppids.h>
#include <epan/asn1.h>
#include <epan/wmem/wmem.h>
#include <epan/conversation.h>
#include <epan/expert.h>
#include <epan/prefs.h>
@ -375,7 +376,7 @@ static void add_hsdsch_bind(packet_info *pinfo){
conversation_set_dissector(conversation, fp_handle);
if(pinfo->link_dir==P2P_DIR_DL){
umts_fp_conversation_info = se_new0(umts_fp_conversation_info_t);
umts_fp_conversation_info = wmem_new0(wmem_file_scope(), umts_fp_conversation_info_t);
/* Fill in the HSDSCH relevant data */
umts_fp_conversation_info->iface_type = IuB_Interface;

66
asn1/p1/p1.cnf
View File

@ -3,7 +3,7 @@
# $Id$
#.TYPE_ATTR
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(p1_CountryName_U_vals) BITMASK = 0
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(p1_CountryName_U_vals) BITMASK = 0
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.IMPORT ../x509ce/x509ce-exp.cnf
@ -623,7 +623,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL)
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
@ -644,7 +644,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL)
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
@ -896,7 +896,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
do_address_str_tree("=", tstring, actx, tree);
#.FN_BODY TeletexDomainDefinedAttribute
actx->value_ptr = ep_strbuf_new("");
actx->value_ptr = wmem_strbuf_new(wmem_packet_scope(), "");
%(DEFAULT_BODY)s
@ -962,16 +962,16 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
%(DEFAULT_BODY)s
do_address_str("/DD.", pstring, actx);
#.FN_BODY BuiltInDomainDefinedAttribute/value VAL_PTR=&pstring
tvbuff_t *pstring = NULL;
%(DEFAULT_BODY)s
do_address_str_tree("=", pstring, actx, tree);
#.FN_BODY BuiltInDomainDefinedAttribute
actx->value_ptr = ep_strbuf_new("");
actx->value_ptr = wmem_strbuf_new(wmem_packet_scope(), "");
%(DEFAULT_BODY)s
@ -979,20 +979,20 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL) {
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
}
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
ctx->oraddress = ep_strbuf_new("");
ctx->oraddress = wmem_strbuf_new(wmem_packet_scope(), "");
actx->subtree.tree = NULL;
set_do_address(actx, TRUE);
%(DEFAULT_BODY)s
if (ctx->oraddress && (ctx->oraddress->len > 0) && actx->subtree.tree)
proto_item_append_text(actx->subtree.tree, " (%%s/)", ctx->oraddress->str);
if (ctx->oraddress && (wmem_strbuf_get_len(ctx->oraddress) > 0) && actx->subtree.tree)
proto_item_append_text(actx->subtree.tree, " (%%s/)", wmem_strbuf_get_str(ctx->oraddress));
set_do_address(actx, FALSE);
@ -1000,19 +1000,19 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL) {
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
}
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
ctx->oraddress = ep_strbuf_new("");
ctx->oraddress = wmem_strbuf_new(wmem_packet_scope(), "");
actx->subtree.tree = NULL;
set_do_address(actx, TRUE);
%(DEFAULT_BODY)s
if (ctx->oraddress && (ctx->oraddress->len > 0) && actx->subtree.tree)
proto_item_append_text(actx->subtree.tree, " (%%s/)", ctx->oraddress->str);
if (ctx->oraddress && (wmem_strbuf_get_len(ctx->oraddress) > 0) && actx->subtree.tree)
proto_item_append_text(actx->subtree.tree, " (%%s/)", wmem_strbuf_get_str(ctx->oraddress));
set_do_address(actx, FALSE);
#.FN_BODY MessageIdentifier
@ -1024,21 +1024,21 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL) {
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
}
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
ctx->oraddress = ep_strbuf_new("");
ctx->oraddress = wmem_strbuf_new(wmem_packet_scope(), "");
actx->subtree.tree = tree;
%(DEFAULT_BODY)s
if (ctx->oraddress && (ctx->oraddress->len > 0)) {
proto_item_append_text(actx->subtree.tree, " (%%s/", ctx->oraddress->str);
if (ctx->oraddress && (wmem_strbuf_get_len(ctx->oraddress) > 0)) {
proto_item_append_text(actx->subtree.tree, " (%%s/", wmem_strbuf_get_str(ctx->oraddress));
if (hf_index == hf_p1_subject_identifier) {
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s/", ctx->oraddress->str);
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s/", wmem_strbuf_get_str(ctx->oraddress));
}
}
@ -1047,7 +1047,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
VAL_PTR=&id
#.FN_BODY LocalIdentifier
tvbuff_t *id = NULL;
tvbuff_t *id = NULL;
p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
%(DEFAULT_BODY)s
@ -1056,7 +1056,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
if (ctx && ctx->do_address)
proto_item_append_text(actx->subtree.tree, " $ %%s)", tvb_format_text(id, 0, tvb_length(id)));
if (hf_index == hf_p1_subject_identifier)
if (hf_index == hf_p1_subject_identifier)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " $ %%s)", tvb_format_text(id, 0, tvb_length(id)));
}
@ -1151,8 +1151,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
FN_VARIANT = _str VAL_PTR = &actx->external.direct_reference
#.FN_BODY TokenTypeData
if(actx->external.direct_reference)
if(actx->external.direct_reference)
call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree);
#.FN_PARS Credentials
@ -1172,14 +1172,14 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY TokenData/value
proto_item_append_text(tree, " (%%s)", val_to_str(actx->external.indirect_reference, p1_TokenDataType_vals, "tokendata-type %%d"));
proto_item_append_text(tree, " (%%s)", val_to_str(actx->external.indirect_reference, p1_TokenDataType_vals, "tokendata-type %%d"));
if (dissector_try_uint(p1_tokendata_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) {
offset = tvb_length(tvb);
} else {
proto_item *item = NULL;
proto_tree *next_tree = NULL;
item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset),
item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset),
"Dissector for tokendata-type %%d not implemented. Contact Wireshark developers if you want this supported", actx->external.indirect_reference);
next_tree = proto_item_add_subtree(item, ett_p1_unknown_tokendata_type);
offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree);
@ -1188,14 +1188,14 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY PerDomainBilateralInformation/bilateral-information
proto_item *item = NULL;
int loffset = 0;
int loffset = 0;
guint32 len = 0;
/* work out the length */
loffset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, NULL, NULL, NULL);
(void) dissect_ber_length(actx->pinfo, tree, tvb, loffset, &len, NULL);
/* create some structure so we can tell what this unknown ASN.1 represents */
/* create some structure so we can tell what this unknown ASN.1 represents */
item = proto_tree_add_item(tree, hf_index, tvb, offset, len, ENC_BIG_ENDIAN);
tree = proto_item_add_subtree(item, ett_p1_bilateral_information);
@ -1207,8 +1207,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
#.FN_BODY MTS-APDU
gint apdu = -1;
%(DEFAULT_BODY)s
%(DEFAULT_BODY)s
if( (apdu!=-1) && p1_MTS_APDU_vals[apdu].strptr ){
if(apdu != 0) { /* we don't show "message" - sub-dissectors have better idea */
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_MTS_APDU_vals[apdu].strptr);
@ -1222,7 +1222,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token"
gint report = -1;
%(DEFAULT_BODY)s
if( (report!=-1) && p1_ReportType_vals[report].strptr ){
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", p1_ReportType_vals[report].strptr);
}

24
asn1/p1/packet-p1-template.c
View File

@ -92,7 +92,7 @@ typedef struct p1_address_ctx {
gboolean do_address;
const char *content_type_id;
gboolean report_unknown_content_type;
emem_strbuf_t* oraddress;
wmem_strbuf_t* oraddress;
} p1_address_ctx_t;
static void set_do_address(asn1_ctx_t* actx, gboolean do_address)
@ -100,7 +100,7 @@ static void set_do_address(asn1_ctx_t* actx, gboolean do_address)
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL) {
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
}
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
@ -113,10 +113,10 @@ static void do_address(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
if (ctx && ctx->do_address) {
if (addr) {
ep_strbuf_append(ctx->oraddress, addr);
wmem_strbuf_append(ctx->oraddress, addr);
}
if (tvb_string) {
ep_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
wmem_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
}
}
@ -124,25 +124,25 @@ static void do_address(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
static void do_address_str(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
{
emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr;
wmem_strbuf_t *ddatype = (wmem_strbuf_t *)actx->value_ptr;
p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
do_address(addr, tvb_string, actx);
if (ctx && ctx->do_address && ddatype && tvb_string)
ep_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
wmem_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
}
static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree)
{
emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr;
wmem_strbuf_t *ddatype = (wmem_strbuf_t *)actx->value_ptr;
p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
do_address(addr, tvb_string, actx);
if (ctx && ctx->do_address && tvb_string && ddatype) {
if (ddatype->len > 0) {
proto_item_append_text (tree, " (%s=%s)", ddatype->str, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
if (wmem_strbuf_get_len(ddatype) > 0) {
proto_item_append_text (tree, " (%s=%s)", wmem_strbuf_get_str(ddatype), tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
}
}
}
@ -167,7 +167,7 @@ void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean
p1_address_ctx_t* ctx;
if (actx->subtree.tree_ctx == NULL) {
actx->subtree.tree_ctx = ep_new0(p1_address_ctx_t);
actx->subtree.tree_ctx = wmem_new0(wmem_packet_scope(), p1_address_ctx_t);
}
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
@ -186,10 +186,10 @@ const char* p1_get_last_oraddress (asn1_ctx_t* actx)
return "";
ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
if (ctx->oraddress->len <= 0)
if (wmem_strbuf_get_len(ctx->oraddress) <= 0)
return "";
return ctx->oraddress->str;
return wmem_strbuf_get_str(ctx->oraddress);
}
/*

408
asn1/ranap/ranap.cnf
View File

@ -82,9 +82,9 @@ RAB-DataVolumeReportItem/dl-UnsuccessfullyTransmittedDataVolume rab-dl-Unsuccess
#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue
#.FN_PARS ProtocolIE-FieldPair/firstValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairFirstValue
#.FN_PARS ProtocolIE-FieldPair/secondValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairSecondValue
#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue
#.FN_PARS ProtocolIE-FieldPair/firstValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairFirstValue
#.FN_PARS ProtocolIE-FieldPair/secondValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairSecondValue
#.FN_PARS ProtocolExtensionID VAL_PTR=&ProtocolExtensionID
#.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue
@ -193,18 +193,18 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 8, FALSE, &imsi_tvb);
if(!imsi_tvb)
return offset;
if ( actx->pinfo->sccp_info
&& actx->pinfo->sccp_info->data.co.assoc
&& ! actx->pinfo->sccp_info->data.co.assoc->calling_party ) {
guint len = tvb_length(imsi_tvb);
guint8* bytes = (guint8 *)ep_tvb_memdup(imsi_tvb,0,len);
actx->pinfo->sccp_info->data.co.assoc->calling_party =
se_strdup_printf("IMSI: %%s", bytes_to_str(bytes, len) );
actx->pinfo->sccp_info->data.co.assoc->calling_party =
wmem_strdup_printf(wmem_file_scope(), "IMSI: %%s", bytes_to_str(bytes, len) );
}
digit_str = unpack_digits(imsi_tvb, 0);
proto_tree_add_string(tree, hf_ranap_imsi_digits, imsi_tvb, 0, -1, digit_str);
@ -229,7 +229,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
case id_Source_ToTarget_TransparentContainer: /* INTEGER ::= 61 */
/* 9.2.1.30a Source to Target Transparent Container
* Note: In the current version of this specification, this IE may
* either carry the Source RNC to Target RNC Transparent Container
* either carry the Source RNC to Target RNC Transparent Container
* or the Source eNB to Target eNB Transparent Container IE as defined in [49]...
*/
call_dissector(rrc_s_to_trnc_handle,rrc_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
@ -237,7 +237,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
case id_Target_ToSource_TransparentContainer: /* INTEGER ::= 63 */
/* 9.2.1.30b Target to Source Transparent Container
* In the current version of this specification, this IE may
* either carry the Target RNC to Source RNC Transparent Container
* either carry the Target RNC to Source RNC Transparent Container
* or the Target eNB to Source eNB Transparent Container IE as defined in [49]...
*/
call_dissector(rrc_t_to_srnc_handle,rrc_message_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
@ -277,7 +277,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
# PLMNidentity ::= TBCD-STRING (SIZE (3))
# TBCD-STRING ::= OCTET STRING
#.FN_BODY PLMNidentity VAL_PTR =
#.FN_BODY PLMNidentity VAL_PTR =
tvbuff_t *parameter_tvb=NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -305,7 +305,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
proto_item *item;
proto_tree *subtree, *nsap_tree;
gint tvb_len;
%(DEFAULT_BODY)s
if (!parameter_tvb)
return offset;
@ -327,27 +327,27 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
nsap_tree = proto_item_add_subtree(item, ett_ranap_TransportLayerAddress_nsap);
dissect_nsap(parameter_tvb, 0, 20, nsap_tree);
}
#.FN_BODY GTP-TEI VAL_PTR = &parameter_tvb
tvbuff_t *parameter_tvb=NULL;
tvbuff_t *parameter_tvb=NULL;
int saved_hf;
saved_hf = hf_index;
hf_index = -1;
%(DEFAULT_BODY)s
if (!parameter_tvb)
return offset;
proto_tree_add_item(tree, saved_hf, parameter_tvb, 0, 4, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, saved_hf, parameter_tvb, 0, 4, ENC_BIG_ENDIAN);
#.FN_HDR SourceRNC-ToTargetRNC-TransparentContainer
/* If SourceRNC-ToTargetRNC-TransparentContainer is called trough
/* If SourceRNC-ToTargetRNC-TransparentContainer is called trough
dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU
ProtocolIE_ID may be unset
*/
ProtocolIE_ID = id_Source_ToTarget_TransparentContainer;
ProtocolIE_ID = id_Source_ToTarget_TransparentContainer;
#.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = &parameter_tvb
# -- Note: In the current version of this specification, this IE may either carry the Source RNC to
@ -423,192 +423,192 @@ id-RANAPenhancedRelocation ProcedureCode
id-SRVCCPreparation ProcedureCode
# ProtocolIE-ID
id-AreaIdentity ProtocolIE-ID
id-AreaIdentity ProtocolIE-ID
id-Not-Used-1 ProtocolIE-ID
id-Not-Used-2 ProtocolIE-ID
id-CN-DomainIndicator ProtocolIE-ID
id-Cause ProtocolIE-ID
id-ChosenEncryptionAlgorithm ProtocolIE-ID
id-ChosenIntegrityProtectionAlgorithm ProtocolIE-ID
id-ClassmarkInformation2 ProtocolIE-ID
id-ClassmarkInformation3 ProtocolIE-ID
id-CriticalityDiagnostics ProtocolIE-ID
id-DL-GTP-PDU-SequenceNumber ProtocolIE-ID
id-EncryptionInformation ProtocolIE-ID
id-IntegrityProtectionInformation ProtocolIE-ID
id-IuTransportAssociation ProtocolIE-ID
id-L3-Information ProtocolIE-ID
id-LAI ProtocolIE-ID
id-NAS-PDU ProtocolIE-ID
id-NonSearchingIndication ProtocolIE-ID
id-NumberOfSteps ProtocolIE-ID
id-OMC-ID ProtocolIE-ID
id-OldBSS-ToNewBSS-Information ProtocolIE-ID
id-PagingAreaID ProtocolIE-ID
id-PagingCause ProtocolIE-ID
id-PermanentNAS-UE-ID ProtocolIE-ID
id-RAB-ContextItem ProtocolIE-ID
id-RAB-ContextList ProtocolIE-ID
id-RAB-DataForwardingItem ProtocolIE-ID
id-RAB-DataForwardingItem-SRNS-CtxReq ProtocolIE-ID
id-RAB-DataForwardingList ProtocolIE-ID
id-RAB-DataForwardingList-SRNS-CtxReq ProtocolIE-ID
id-RAB-DataVolumeReportItem ProtocolIE-ID
id-RAB-DataVolumeReportList ProtocolIE-ID
id-RAB-DataVolumeReportRequestItem ProtocolIE-ID
id-RAB-DataVolumeReportRequestList ProtocolIE-ID
id-RAB-FailedItem ProtocolIE-ID
id-RAB-FailedList ProtocolIE-ID
id-RAB-ID ProtocolIE-ID
id-RAB-QueuedItem ProtocolIE-ID
id-RAB-QueuedList ProtocolIE-ID
id-RAB-ReleaseFailedList ProtocolIE-ID
id-RAB-ReleaseItem ProtocolIE-ID
id-RAB-ReleaseList ProtocolIE-ID
id-RAB-ReleasedItem ProtocolIE-ID
id-RAB-ReleasedList ProtocolIE-ID
id-RAB-ReleasedList-IuRelComp ProtocolIE-ID
id-RAB-RelocationReleaseItem ProtocolIE-ID
id-RAB-RelocationReleaseList ProtocolIE-ID
id-RAB-SetupItem-RelocReq ProtocolIE-ID
id-RAB-SetupItem-RelocReqAck ProtocolIE-ID
id-RAB-SetupList-RelocReq ProtocolIE-ID
id-RAB-SetupList-RelocReqAck ProtocolIE-ID
id-RAB-SetupOrModifiedItem ProtocolIE-ID
id-RAB-SetupOrModifiedList ProtocolIE-ID
id-RAB-SetupOrModifyItem ProtocolIE-ID
id-RAB-SetupOrModifyList ProtocolIE-ID
id-RAC ProtocolIE-ID
id-RelocationType ProtocolIE-ID
id-RequestType ProtocolIE-ID
id-SAI ProtocolIE-ID
id-SAPI ProtocolIE-ID
id-SourceID ProtocolIE-ID
id-Source-ToTarget-TransparentContainer ProtocolIE-ID
id-TargetID ProtocolIE-ID
id-Target-ToSource-TransparentContainer ProtocolIE-ID
id-TemporaryUE-ID ProtocolIE-ID
id-TraceReference ProtocolIE-ID
id-TraceType ProtocolIE-ID
id-TransportLayerAddress ProtocolIE-ID
id-TriggerID ProtocolIE-ID
id-UE-ID ProtocolIE-ID
id-UL-GTP-PDU-SequenceNumber ProtocolIE-ID
id-RAB-FailedtoReportItem ProtocolIE-ID
id-RAB-FailedtoReportList ProtocolIE-ID
id-Not-Used-73 ProtocolIE-ID
id-CN-DomainIndicator ProtocolIE-ID
id-Cause ProtocolIE-ID
id-ChosenEncryptionAlgorithm ProtocolIE-ID
id-ChosenIntegrityProtectionAlgorithm ProtocolIE-ID
id-ClassmarkInformation2 ProtocolIE-ID
id-ClassmarkInformation3 ProtocolIE-ID
id-CriticalityDiagnostics ProtocolIE-ID
id-DL-GTP-PDU-SequenceNumber ProtocolIE-ID
id-EncryptionInformation ProtocolIE-ID
id-IntegrityProtectionInformation ProtocolIE-ID
id-IuTransportAssociation ProtocolIE-ID
id-L3-Information ProtocolIE-ID
id-LAI ProtocolIE-ID
id-NAS-PDU ProtocolIE-ID
id-NonSearchingIndication ProtocolIE-ID
id-NumberOfSteps ProtocolIE-ID
id-OMC-ID ProtocolIE-ID
id-OldBSS-ToNewBSS-Information ProtocolIE-ID
id-PagingAreaID ProtocolIE-ID
id-PagingCause ProtocolIE-ID
id-PermanentNAS-UE-ID ProtocolIE-ID
id-RAB-ContextItem ProtocolIE-ID
id-RAB-ContextList ProtocolIE-ID
id-RAB-DataForwardingItem ProtocolIE-ID
id-RAB-DataForwardingItem-SRNS-CtxReq ProtocolIE-ID
id-RAB-DataForwardingList ProtocolIE-ID
id-RAB-DataForwardingList-SRNS-CtxReq ProtocolIE-ID
id-RAB-DataVolumeReportItem ProtocolIE-ID
id-RAB-DataVolumeReportList ProtocolIE-ID
id-RAB-DataVolumeReportRequestItem ProtocolIE-ID
id-RAB-DataVolumeReportRequestList ProtocolIE-ID
id-RAB-FailedItem ProtocolIE-ID
id-RAB-FailedList ProtocolIE-ID
id-RAB-ID ProtocolIE-ID
id-RAB-QueuedItem ProtocolIE-ID
id-RAB-QueuedList ProtocolIE-ID
id-RAB-ReleaseFailedList ProtocolIE-ID
id-RAB-ReleaseItem ProtocolIE-ID
id-RAB-ReleaseList ProtocolIE-ID
id-RAB-ReleasedItem ProtocolIE-ID
id-RAB-ReleasedList ProtocolIE-ID
id-RAB-ReleasedList-IuRelComp ProtocolIE-ID
id-RAB-RelocationReleaseItem ProtocolIE-ID
id-RAB-RelocationReleaseList ProtocolIE-ID
id-RAB-SetupItem-RelocReq ProtocolIE-ID
id-RAB-SetupItem-RelocReqAck ProtocolIE-ID
id-RAB-SetupList-RelocReq ProtocolIE-ID
id-RAB-SetupList-RelocReqAck ProtocolIE-ID
id-RAB-SetupOrModifiedItem ProtocolIE-ID
id-RAB-SetupOrModifiedList ProtocolIE-ID
id-RAB-SetupOrModifyItem ProtocolIE-ID
id-RAB-SetupOrModifyList ProtocolIE-ID
id-RAC ProtocolIE-ID
id-RelocationType ProtocolIE-ID
id-RequestType ProtocolIE-ID
id-SAI ProtocolIE-ID
id-SAPI ProtocolIE-ID
id-SourceID ProtocolIE-ID
id-Source-ToTarget-TransparentContainer ProtocolIE-ID
id-TargetID ProtocolIE-ID
id-Target-ToSource-TransparentContainer ProtocolIE-ID
id-TemporaryUE-ID ProtocolIE-ID
id-TraceReference ProtocolIE-ID
id-TraceType ProtocolIE-ID
id-TransportLayerAddress ProtocolIE-ID
id-TriggerID ProtocolIE-ID
id-UE-ID ProtocolIE-ID
id-UL-GTP-PDU-SequenceNumber ProtocolIE-ID
id-RAB-FailedtoReportItem ProtocolIE-ID
id-RAB-FailedtoReportList ProtocolIE-ID
id-Not-Used-73 ProtocolIE-ID
id-Not-Used-74 ProtocolIE-ID
id-KeyStatus ProtocolIE-ID
id-DRX-CycleLengthCoefficient ProtocolIE-ID
id-IuSigConIdList ProtocolIE-ID
id-IuSigConIdItem ProtocolIE-ID
id-IuSigConId ProtocolIE-ID
id-DirectTransferInformationItem-RANAP-RelocInf ProtocolIE-ID
id-DirectTransferInformationList-RANAP-RelocInf ProtocolIE-ID
id-RAB-ContextItem-RANAP-RelocInf ProtocolIE-ID
id-RAB-ContextList-RANAP-RelocInf ProtocolIE-ID
id-RAB-ContextFailedtoTransferItem ProtocolIE-ID
id-RAB-ContextFailedtoTransferList ProtocolIE-ID
id-GlobalRNC-ID ProtocolIE-ID
id-RAB-ReleasedItem-IuRelComp ProtocolIE-ID
id-MessageStructure ProtocolIE-ID
id-Alt-RAB-Parameters ProtocolIE-ID
id-Ass-RAB-Parameters ProtocolIE-ID
id-RAB-ModifyList ProtocolIE-ID
id-RAB-ModifyItem ProtocolIE-ID
id-TypeOfError ProtocolIE-ID
id-BroadcastAssistanceDataDecipheringKeys ProtocolIE-ID
id-LocationRelatedDataRequestType ProtocolIE-ID
id-GlobalCN-ID ProtocolIE-ID
id-LastKnownServiceArea ProtocolIE-ID
id-SRB-TrCH-Mapping ProtocolIE-ID
id-InterSystemInformation-TransparentContainer ProtocolIE-ID
id-NewBSS-To-OldBSS-Information ProtocolIE-ID
id-Not-Used-101 ProtocolIE-ID
id-Not-Used-102 ProtocolIE-ID
id-SourceRNC-PDCP-context-info ProtocolIE-ID
id-InformationTransferID ProtocolIE-ID
id-SNA-Access-Information ProtocolIE-ID
id-ProvidedData ProtocolIE-ID
id-GERAN-BSC-Container ProtocolIE-ID
id-GERAN-Classmark ProtocolIE-ID
id-GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item ProtocolIE-ID
id-GERAN-Iumode-RAB-FailedList-RABAssgntResponse ProtocolIE-ID
id-VerticalAccuracyCode ProtocolIE-ID
id-ResponseTime ProtocolIE-ID
id-PositioningPriority ProtocolIE-ID
id-ClientType ProtocolIE-ID
id-LocationRelatedDataRequestTypeSpecificToGERANIuMode ProtocolIE-ID
id-SignallingIndication ProtocolIE-ID
id-hS-DSCH-MAC-d-Flow-ID ProtocolIE-ID
id-UESBI-Iu ProtocolIE-ID
id-PositionData ProtocolIE-ID
id-PositionDataSpecificToGERANIuMode ProtocolIE-ID
id-CellLoadInformationGroup ProtocolIE-ID
id-AccuracyFulfilmentIndicator ProtocolIE-ID
id-InformationTransferType ProtocolIE-ID
id-TraceRecordingSessionInformation ProtocolIE-ID
id-TracePropagationParameters ProtocolIE-ID
id-InterSystemInformationTransferType ProtocolIE-ID
id-SelectedPLMN-ID ProtocolIE-ID
id-RedirectionCompleted ProtocolIE-ID
id-RedirectionIndication ProtocolIE-ID
id-NAS-SequenceNumber ProtocolIE-ID
id-RejectCauseValue ProtocolIE-ID
id-APN ProtocolIE-ID
id-CNMBMSLinkingInformation ProtocolIE-ID
id-DeltaRAListofIdleModeUEs ProtocolIE-ID
id-FrequenceLayerConvergenceFlag ProtocolIE-ID
id-InformationExchangeID ProtocolIE-ID
id-InformationExchangeType ProtocolIE-ID
id-InformationRequested ProtocolIE-ID
id-InformationRequestType ProtocolIE-ID
id-IPMulticastAddress ProtocolIE-ID
id-JoinedMBMSBearerServicesList ProtocolIE-ID
id-LeftMBMSBearerServicesList ProtocolIE-ID
id-MBMSBearerServiceType ProtocolIE-ID
id-MBMSCNDe-Registration ProtocolIE-ID
id-MBMSServiceArea ProtocolIE-ID
id-MBMSSessionDuration ProtocolIE-ID
id-MBMSSessionIdentity ProtocolIE-ID
id-PDP-TypeInformation ProtocolIE-ID
id-RAB-Parameters ProtocolIE-ID
id-RAListofIdleModeUEs ProtocolIE-ID
id-MBMSRegistrationRequestType ProtocolIE-ID
id-SessionUpdateID ProtocolIE-ID
id-TMGI ProtocolIE-ID
id-TransportLayerInformation ProtocolIE-ID
id-UnsuccessfulLinkingList ProtocolIE-ID
id-MBMSLinkingInformation ProtocolIE-ID
id-MBMSSessionRepetitionNumber ProtocolIE-ID
id-AlternativeRABConfiguration ProtocolIE-ID
id-AlternativeRABConfigurationRequest ProtocolIE-ID
id-E-DCH-MAC-d-Flow-ID ProtocolIE-ID
id-SourceBSS-ToTargetBSS-TransparentContainer ProtocolIE-ID
id-TargetBSS-ToSourceBSS-TransparentContainer ProtocolIE-ID
id-TimeToMBMSDataTransfer ProtocolIE-ID
id-IncludeVelocity ProtocolIE-ID
id-VelocityEstimate ProtocolIE-ID
id-RedirectAttemptFlag ProtocolIE-ID
id-RAT-Type ProtocolIE-ID
id-PeriodicLocationInfo ProtocolIE-ID
id-MBMSCountingInformation ProtocolIE-ID
id-ExtendedRNC-ID ProtocolIE-ID
id-KeyStatus ProtocolIE-ID
id-DRX-CycleLengthCoefficient ProtocolIE-ID
id-IuSigConIdList ProtocolIE-ID
id-IuSigConIdItem ProtocolIE-ID
id-IuSigConId ProtocolIE-ID
id-DirectTransferInformationItem-RANAP-RelocInf ProtocolIE-ID
id-DirectTransferInformationList-RANAP-RelocInf ProtocolIE-ID
id-RAB-ContextItem-RANAP-RelocInf ProtocolIE-ID
id-RAB-ContextList-RANAP-RelocInf ProtocolIE-ID
id-RAB-ContextFailedtoTransferItem ProtocolIE-ID
id-RAB-ContextFailedtoTransferList ProtocolIE-ID
id-GlobalRNC-ID ProtocolIE-ID
id-RAB-ReleasedItem-IuRelComp ProtocolIE-ID
id-MessageStructure ProtocolIE-ID
id-Alt-RAB-Parameters ProtocolIE-ID
id-Ass-RAB-Parameters ProtocolIE-ID
id-RAB-ModifyList ProtocolIE-ID
id-RAB-ModifyItem ProtocolIE-ID
id-TypeOfError ProtocolIE-ID
id-BroadcastAssistanceDataDecipheringKeys ProtocolIE-ID
id-LocationRelatedDataRequestType ProtocolIE-ID
id-GlobalCN-ID ProtocolIE-ID
id-LastKnownServiceArea ProtocolIE-ID
id-SRB-TrCH-Mapping ProtocolIE-ID
id-InterSystemInformation-TransparentContainer ProtocolIE-ID
id-NewBSS-To-OldBSS-Information ProtocolIE-ID
id-Not-Used-101 ProtocolIE-ID
id-Not-Used-102 ProtocolIE-ID
id-SourceRNC-PDCP-context-info ProtocolIE-ID
id-InformationTransferID ProtocolIE-ID
id-SNA-Access-Information ProtocolIE-ID
id-ProvidedData ProtocolIE-ID
id-GERAN-BSC-Container ProtocolIE-ID
id-GERAN-Classmark ProtocolIE-ID
id-GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item ProtocolIE-ID
id-GERAN-Iumode-RAB-FailedList-RABAssgntResponse ProtocolIE-ID
id-VerticalAccuracyCode ProtocolIE-ID
id-ResponseTime ProtocolIE-ID
id-PositioningPriority ProtocolIE-ID
id-ClientType ProtocolIE-ID
id-LocationRelatedDataRequestTypeSpecificToGERANIuMode ProtocolIE-ID
id-SignallingIndication ProtocolIE-ID
id-hS-DSCH-MAC-d-Flow-ID ProtocolIE-ID
id-UESBI-Iu ProtocolIE-ID
id-PositionData ProtocolIE-ID
id-PositionDataSpecificToGERANIuMode ProtocolIE-ID
id-CellLoadInformationGroup ProtocolIE-ID
id-AccuracyFulfilmentIndicator ProtocolIE-ID
id-InformationTransferType ProtocolIE-ID
id-TraceRecordingSessionInformation ProtocolIE-ID
id-TracePropagationParameters ProtocolIE-ID
id-InterSystemInformationTransferType ProtocolIE-ID
id-SelectedPLMN-ID ProtocolIE-ID
id-RedirectionCompleted ProtocolIE-ID
id-RedirectionIndication ProtocolIE-ID
id-NAS-SequenceNumber ProtocolIE-ID
id-RejectCauseValue ProtocolIE-ID
id-APN ProtocolIE-ID
id-CNMBMSLinkingInformation ProtocolIE-ID
id-DeltaRAListofIdleModeUEs ProtocolIE-ID
id-FrequenceLayerConvergenceFlag ProtocolIE-ID
id-InformationExchangeID ProtocolIE-ID
id-InformationExchangeType ProtocolIE-ID
id-InformationRequested ProtocolIE-ID
id-InformationRequestType ProtocolIE-ID
id-IPMulticastAddress ProtocolIE-ID
id-JoinedMBMSBearerServicesList ProtocolIE-ID
id-LeftMBMSBearerServicesList ProtocolIE-ID
id-MBMSBearerServiceType ProtocolIE-ID
id-MBMSCNDe-Registration ProtocolIE-ID
id-MBMSServiceArea ProtocolIE-ID
id-MBMSSessionDuration ProtocolIE-ID
id-MBMSSessionIdentity ProtocolIE-ID
id-PDP-TypeInformation ProtocolIE-ID
id-RAB-Parameters ProtocolIE-ID
id-RAListofIdleModeUEs ProtocolIE-ID
id-MBMSRegistrationRequestType ProtocolIE-ID
id-SessionUpdateID ProtocolIE-ID
id-TMGI ProtocolIE-ID
id-TransportLayerInformation ProtocolIE-ID
id-UnsuccessfulLinkingList ProtocolIE-ID
id-MBMSLinkingInformation ProtocolIE-ID
id-MBMSSessionRepetitionNumber ProtocolIE-ID
id-AlternativeRABConfiguration ProtocolIE-ID
id-AlternativeRABConfigurationRequest ProtocolIE-ID
id-E-DCH-MAC-d-Flow-ID ProtocolIE-ID
id-SourceBSS-ToTargetBSS-TransparentContainer ProtocolIE-ID
id-TargetBSS-ToSourceBSS-TransparentContainer ProtocolIE-ID
id-TimeToMBMSDataTransfer ProtocolIE-ID
id-IncludeVelocity ProtocolIE-ID
id-VelocityEstimate ProtocolIE-ID
id-RedirectAttemptFlag ProtocolIE-ID
id-RAT-Type ProtocolIE-ID
id-PeriodicLocationInfo ProtocolIE-ID
id-MBMSCountingInformation ProtocolIE-ID
id-ExtendedRNC-ID ProtocolIE-ID
id-170-not-to-be-used-for-IE-ids ProtocolIE-ID
id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf ProtocolIE-ID
id-Alt-RAB-Parameter-ExtendedMaxBitrateInf ProtocolIE-ID
id-Ass-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-Ass-RAB-Parameter-ExtendedMaxBitrateList ProtocolIE-ID
id-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-RAB-Parameter-ExtendedMaxBitrateList ProtocolIE-ID
id-Requested-RAB-Parameter-ExtendedMaxBitrateList ProtocolIE-ID
id-Requested-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-LAofIdleModeUEs ProtocolIE-ID
id-newLAListofIdleModeUEs ProtocolIE-ID
id-LAListwithNoIdleModeUEsAnyMore ProtocolIE-ID
id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf ProtocolIE-ID
id-Alt-RAB-Parameter-ExtendedMaxBitrateInf ProtocolIE-ID
id-Ass-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-Ass-RAB-Parameter-ExtendedMaxBitrateList ProtocolIE-ID
id-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-RAB-Parameter-ExtendedMaxBitrateList ProtocolIE-ID
id-Requested-RAB-Parameter-ExtendedMaxBitrateList ProtocolIE-ID
id-Requested-RAB-Parameter-ExtendedGuaranteedBitrateList ProtocolIE-ID
id-LAofIdleModeUEs ProtocolIE-ID
id-newLAListofIdleModeUEs ProtocolIE-ID
id-LAListwithNoIdleModeUEsAnyMore ProtocolIE-ID
id-183-not-to-be-used-for-IE-ids ProtocolIE-ID
id-GANSS-PositioningDataSet ProtocolIE-ID
id-RequestedGANSSAssistanceData ProtocolIE-ID
id-GANSS-PositioningDataSet ProtocolIE-ID
id-RequestedGANSSAssistanceData ProtocolIE-ID
id-BroadcastGANSSAssistanceDataDecipheringKeys ProtocolIE-ID
id-d-RNTI-for-NoIuCSUP ProtocolIE-ID
id-RAB-SetupList-EnhancedRelocCompleteReq ProtocolIE-ID
@ -656,11 +656,11 @@ id-SRVCC-Operation-Possible ProtocolIE-ID
id-CSG-Id-List ProtocolIE-ID
id-PSRABtobeReplaced ProtocolIE-ID
id-E-UTRAN-Service-Handover ProtocolIE-ID
id-Not-Used-232 ProtocolIE-ID
id-Not-Used-232 ProtocolIE-ID
id-UE-AggregateMaximumBitRate ProtocolIE-ID
id-CSG-Membership-Status ProtocolIE-ID
id-CSG-Membership-Status ProtocolIE-ID
id-Cell-Access-Mode ProtocolIE-ID
id-IP-Source-Address ProtocolIE-ID
id-IP-Source-Address ProtocolIE-ID
id-CSFB-Information ProtocolIE-ID
id-PDP-TypeInformation-extension ProtocolIE-ID
id-MSISDN ProtocolIE-ID
@ -813,7 +813,7 @@ RAB-SetupList-EnhRelocInfoRes N ranap.ies id-RAB-SetupList-EnhRelocInfoRes
RAB-SetupItem-EnhRelocInfoRes N ranap.ies id-RAB-SetupItem-EnhRelocInfoRes
IuSignallingConnectionIdentifier N ranap.ies id-OldIuSigConId
RAB-FailedList-EnhRelocInfoRes N ranap.ies id-RAB-FailedList-EnhRelocInfoRes
RAB-FailedItem-EnhRelocInfoRes N ranap.ies id-RAB-FailedItem-EnhRelocInfoRes
RAB-FailedItem-EnhRelocInfoRes N ranap.ies id-RAB-FailedItem-EnhRelocInfoRes
IuSignallingConnectionIdentifier N ranap.ies id-OldIuSigConIdCS
IuSignallingConnectionIdentifier N ranap.ies id-OldIuSigConIdPS
GlobalCN-ID N ranap.ies id-GlobalCN-IDCS

1
asn1/rrc/packet-rrc-template.c
View File

@ -38,6 +38,7 @@
#include <glib.h>
#include <epan/packet.h>
#include <epan/asn1.h>
#include <epan/wmem/wmem.h>
#include <epan/conversation.h>
#include <epan/expert.h>

2
asn1/rrc/rrc.cnf
View File

@ -791,7 +791,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
#.FN_FTR H-RNTI
rrcinf = (struct rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc, 0);
if (!rrcinf) {
rrcinf = se_new0(struct rrc_info);
rrcinf = wmem_new0(wmem_file_scope(), struct rrc_info);
p_add_proto_data(actx->pinfo->fd, proto_rrc, 0, rrcinf);
}
rrcinf->hrnti[actx->pinfo->fd->subnum] = tvb_get_ntohs(hrnti_tvb, 0);