aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/s1ap
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-12-08 21:17:03 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-12-08 21:17:03 +0000
commit27f95726b33347631f3dea532cdfbbac0babfddb (patch)
tree5d6914de5eb89fe4ae6d30e6a717f940825906c1 /asn1/s1ap
parent443fe1e7f899a4752b0a8e681908c1b84a6d71dd (diff)
Try to get the container stuff right...
svn path=/trunk/; revision=40119
Diffstat (limited to 'asn1/s1ap')
-rw-r--r--asn1/s1ap/packet-s1ap-template.c2
-rw-r--r--asn1/s1ap/s1ap.cnf11
2 files changed, 6 insertions, 7 deletions
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index b05651727c..271299c3d0 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -46,6 +46,8 @@
#include "packet-sccp.h"
#include "packet-lte-rrc.h"
#include "packet-ranap.h"
+#include "packet-bssgp.h"
+#include "packet-s1ap.h"
#ifdef _MSC_VER
/* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 628fd952b2..51020a4c31 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -35,10 +35,6 @@ SONtransferCause_PDU
S1AP-PDU
SourceeNB-ToTargeteNB-TransparentContainer
TargeteNB-ToSourceeNB-TransparentContainer
-SourceRNC-ToTargetRNC-TransparentContainer
-TargetRNC-ToSourceRNC-TransparentContainer
-SourceBSS-ToTargetBSS-TransparentContainer
-TargetBSS-ToSourceBSS-TransparentContainer
ENB-StatusTransfer-TransparentContainer
SONtransferApplicationIdentity
SONtransferRequestContainer
@@ -337,7 +333,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
Source BSS to Target BSS
Transparent Container 48.018
*/
- dissect_SourceBSS_ToTargetBSS_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree);
+ de_bssgp_source_BSS_to_target_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
break;
case 3:
/* utrantolte */
@@ -383,14 +379,15 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
Target RNC to Source RNC
Transparent Container 25.413
*/
- dissect_TargetRNC_ToSourceRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree);
+ dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree);
break;
case 2:
/* ltetogeran
Target BSS to Source BSS
Transparent Container 48.018
*/
- dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree);
+ de_bssgp_target_BSS_to_source_BSS_transp_cont(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0);
+
break;
case 3:
/* utrantolte */