summaryrefslogtreecommitdiff
path: root/asn1/lte-rrc/lte-rrc.cnf
diff options
context:
space:
mode:
Diffstat (limited to 'asn1/lte-rrc/lte-rrc.cnf')
-rw-r--r--asn1/lte-rrc/lte-rrc.cnf104
1 files changed, 53 insertions, 51 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf
index 4b1d8644a3..a5d24c8473 100644
--- a/asn1/lte-rrc/lte-rrc.cnf
+++ b/asn1/lte-rrc/lte-rrc.cnf
@@ -26,7 +26,7 @@ HandoverPreparationInformation
UERadioAccessCapabilityInformation
BCCH-BCH-Message @bcch.bch
BCCH-DL-SCH-Message @bcch.dl.sch
-MCCH-Message @mcch
+MCCH-Message @mcch
PCCH-Message @pcch
DL-CCCH-Message @dl.ccch
DL-DCCH-Message @dl.dcch
@@ -567,26 +567,28 @@ if(ue_eutra_cap_tvb){
#.FN_BODY Handover/nas-SecurityParamFromEUTRA VAL_PTR = &nas_sec_param_from_eutra_tvb
tvbuff_t *nas_sec_param_from_eutra_tvb = NULL;
guint32 length;
- proto_item *item;
proto_tree *subtree;
%(DEFAULT_BODY)s
- length = tvb_length(nas_sec_param_from_eutra_tvb);
- item = proto_tree_add_text(tree, nas_sec_param_from_eutra_tvb, 0, length, "NAS security parameters from E-UTRA");
- subtree = proto_item_add_subtree(item, ett_lte_rrc_nas_SecurityParam);
- de_emm_sec_par_from_eutra(nas_sec_param_from_eutra_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
+ if (nas_sec_param_from_eutra_tvb) {
+ length = tvb_length(nas_sec_param_from_eutra_tvb);
+ subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nas_SecurityParam);
+ proto_tree_add_text(subtree, nas_sec_param_from_eutra_tvb, 0, length, "NAS security parameters from E-UTRA");
+ de_emm_sec_par_from_eutra(nas_sec_param_from_eutra_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
+ }
#.FN_BODY SecurityConfigHO/handoverType/interRAT/nas-SecurityParamToEUTRA VAL_PTR = &nas_sec_param_to_eutra_tvb
tvbuff_t *nas_sec_param_to_eutra_tvb = NULL;
guint32 length;
- proto_item *item;
proto_tree *subtree;
%(DEFAULT_BODY)s
- length = tvb_length(nas_sec_param_to_eutra_tvb);
- item = proto_tree_add_text(tree, nas_sec_param_to_eutra_tvb, 0, length, "NAS security parameters to E-UTRA");
- subtree = proto_item_add_subtree(item, ett_lte_rrc_nas_SecurityParam);
- de_emm_sec_par_to_eutra(nas_sec_param_to_eutra_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
+ if (nas_sec_param_to_eutra_tvb) {
+ length = tvb_length(nas_sec_param_to_eutra_tvb);
+ subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_nas_SecurityParam);
+ proto_tree_add_text(subtree, nas_sec_param_to_eutra_tvb, 0, length, "NAS security parameters to E-UTRA");
+ de_emm_sec_par_to_eutra(nas_sec_param_to_eutra_tvb, subtree, actx->pinfo, 0, length, NULL, 0);
+ }
#.FN_BODY SI-OrPSI-GERAN VAL_PTR = &lte_rrc_si_or_psi_geran_val
%(DEFAULT_BODY)s
@@ -899,161 +901,161 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
#.FN_HDR MasterInformationBlock
-col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock");
#.FN_HDR SystemInformation
-col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation");
#.FN_HDR SystemInformationBlockType1
-col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1");
#.FN_HDR MBSFNAreaConfiguration-r9
-col_append_str(actx->pinfo->cinfo, COL_INFO, "MBSFNAreaConfiguration-r9 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "MBSFNAreaConfiguration-r9");
#.FN_HDR MBMSCountingRequest-r10
-col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCountingRequest-r10 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCountingRequest-r10");
#.FN_HDR Paging
-col_append_str(actx->pinfo->cinfo, COL_INFO, "Paging ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "Paging");
#.FN_HDR RRCConnectionReestablishment
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishment ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishment");
#.FN_HDR RRCConnectionReestablishmentReject
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentReject ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentReject");
#.FN_HDR RRCConnectionReject
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject");
#.FN_HDR RRCConnectionSetup
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup");
#.FN_HDR CSFBParametersResponseCDMA2000
-col_append_str(actx->pinfo->cinfo, COL_INFO, "CSFBParametersResponseCDMA2000 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "CSFBParametersResponseCDMA2000");
#.FN_HDR DLInformationTransfer
-col_append_str(actx->pinfo->cinfo, COL_INFO, "DLInformationTransfer ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "DLInformationTransfer");
#.FN_HDR HandoverFromEUTRAPreparationRequest
-col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromEUTRAPreparationRequest ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromEUTRAPreparationRequest");
#.FN_HDR MobilityFromEUTRACommand
-col_append_str(actx->pinfo->cinfo, COL_INFO, "MobilityFromEUTRACommand ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "MobilityFromEUTRACommand");
#.FN_HDR RRCConnectionReconfiguration
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfiguration ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfiguration");
#.FN_HDR RRCConnectionRelease
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease");
#.FN_HDR SecurityModeCommand
-col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand");
#.FN_HDR UECapabilityEnquiry
-col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry");
#.FN_HDR CounterCheck
-col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck");
#.FN_HDR UEInformationRequest-r9
-col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationRequest-r9 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationRequest-r9");
#.FN_HDR LoggedMeasurementConfiguration-r10
-col_append_str(actx->pinfo->cinfo, COL_INFO, "LoggedMeasurementConfiguration-r10 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "LoggedMeasurementConfiguration-r10");
#.FN_HDR RNReconfiguration-r10
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfiguration-r10 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfiguration-r10");
#.FN_HDR RRCConnectionReestablishmentRequest
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest");
#.FN_HDR RRCConnectionRequest
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest");
#.FN_HDR CSFBParametersRequestCDMA2000
-col_append_str(actx->pinfo->cinfo, COL_INFO, "CSFBParametersRequestCDMA2000 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "CSFBParametersRequestCDMA2000");
#.FN_HDR MeasurementReport
-col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport");
#.FN_HDR RRCConnectionReconfigurationComplete
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfigurationComplete ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfigurationComplete");
#.FN_HDR RRCConnectionReestablishmentComplete
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentComplete ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentComplete");
#.FN_HDR RRCConnectionSetupComplete
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete");
#.FN_HDR SecurityModeComplete
-col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete");
#.FN_HDR SecurityModeFailure
-col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure");
#.FN_HDR UECapabilityInformation
-col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation");
#.FN_HDR ULHandoverPreparationTransfer
-col_append_str(actx->pinfo->cinfo, COL_INFO, "ULHandoverPreparationTransfer ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "ULHandoverPreparationTransfer");
#.FN_HDR ULInformationTransfer
-col_append_str(actx->pinfo->cinfo, COL_INFO, "ULInformationTransfer ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "ULInformationTransfer");
#.FN_HDR CounterCheckResponse
-col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse");
#.FN_HDR UEInformationResponse-r9
-col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationResponse-r9 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationResponse-r9");
#.FN_HDR ProximityIndication-r9
-col_append_str(actx->pinfo->cinfo, COL_INFO, "ProximityIndication-r9 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "ProximityIndication-r9");
#.FN_HDR RNReconfigurationComplete-r10
-col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfigurationComplete-r10 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfigurationComplete-r10");
#.FN_HDR MBMSCountingResponse-r10
-col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCountingResponse-r10 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCountingResponse-r10");
#.FN_HDR InterFreqRSTDMeasurementIndication-r10
-col_append_str(actx->pinfo->cinfo, COL_INFO, "InterFreqRSTDMeasurementIndication-r10 ");
+col_append_str(actx->pinfo->cinfo, COL_INFO, "InterFreqRSTDMeasurementIndication-r10");