aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/s1ap
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2009-10-28 06:18:05 +0000
committerAnders Broman <anders.broman@ericsson.com>2009-10-28 06:18:05 +0000
commitd5cfd0edc9170b6af4adf76452cf8d192f38379c (patch)
tree9ae504e52f76ea13bd99e4771f50700c44c95cb2 /asn1/s1ap
parent191f468cafee73d7de3339d2b1a77a096610608a (diff)
- Remove check_col.
- Make x2ap work. svn path=/trunk/; revision=30746
Diffstat (limited to 'asn1/s1ap')
-rw-r--r--asn1/s1ap/s1ap.cnf11
1 files changed, 5 insertions, 6 deletions
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 04318e4ec6..de91ab31c6 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -80,10 +80,9 @@ ProtocolIE-Field/value ie_field_value
#.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode
#.FN_FTR ProcedureCode
- if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
- val_to_str(ProcedureCode, s1ap_ProcedureCode_vals,
- "unknown message"));
+ col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
+ val_to_str(ProcedureCode, s1ap_ProcedureCode_vals,
+ "unknown message"));
#.END
#.FN_PARS InitiatingMessage/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_InitiatingMessageValue
@@ -555,11 +554,11 @@ ConcurrentWarningMessageIndicator N s1ap.ies id-ConcurrentWarningMessageIndicat
#RAB-SetupOrModifyItemFirst N s1ap.ies.pair.first id-RAB-SetupOrModifyItem
#RAB-SetupOrModifyItemSecond N s1ap.ies.pair.second id-RAB-SetupOrModifyItem
-#NBAP-PROTOCOL-EXTENSION
+#S1AP-PROTOCOL-EXTENSION
#RAB-Parameters N s1ap.extension id-AlternativeRABConfiguration
#Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf N s1ap.extension id-Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf
-#NBAP-ELEMENTARY-PROCEDURE
+#S1AP-ELEMENTARY-PROCEDURE
HandoverRequired N s1ap.proc.imsg id-HandoverPreparation
HandoverCommand N s1ap.proc.sout id-HandoverPreparation
HandoverPreparationFailure N s1ap.proc.uout id-HandoverPreparation