aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/s1ap
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-11-04 17:37:38 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-11-04 17:37:38 +0000
commit42a3c77a9ff43f9ef1ffc16098ec6d1d4df3e5c4 (patch)
treeee6ef4fb54615dbf02d26743cdc9c198662d68a6 /asn1/s1ap
parentedc2689422d077335aaf1e16ef01da73b73e0d54 (diff)
Dissect RIMInformation.
svn path=/trunk/; revision=39733
Diffstat (limited to 'asn1/s1ap')
-rw-r--r--asn1/s1ap/packet-s1ap-template.c4
-rw-r--r--asn1/s1ap/s1ap.cnf17
2 files changed, 21 insertions, 0 deletions
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 5710258f03..b7d4521a45 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -60,6 +60,7 @@
static dissector_handle_t nas_eps_handle;
static dissector_handle_t lppa_handle;
+static dissector_handle_t bssgp_handle;
#include "packet-s1ap-val.h"
@@ -77,6 +78,7 @@ static int ett_s1ap_ToTargetTransparentContainer = -1;
static int ett_s1ap_ToSourceTransparentContainer = -1;
static int ett_s1ap_RRCContainer = -1;
static int ett_s1ap_UERadioCapability = -1;
+static int ett_s1ap_RIMInformation = -1;
#include "packet-s1ap-ett.c"
@@ -188,6 +190,7 @@ proto_reg_handoff_s1ap(void)
if (!Initialized) {
nas_eps_handle = find_dissector("nas-eps");
lppa_handle = find_dissector("lppa");
+ bssgp_handle = find_dissector("bssgp");
dissector_add_handle("sctp.port", s1ap_handle); /* for "decode-as" */
dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID, s1ap_handle);
Initialized=TRUE;
@@ -230,6 +233,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_ToSourceTransparentContainer,
&ett_s1ap_RRCContainer,
&ett_s1ap_UERadioCapability,
+ &ett_s1ap_RIMInformation,
#include "packet-s1ap-ettarr.c"
};
diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 09dc7daecd..9bc9e4a748 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -485,7 +485,24 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_UERadioCapability);
dissect_lte_rrc_UERadioAccessCapabilityInformation_PDU(parameter_tvb, actx->pinfo, subtree);
+# 9.2.3.24 RIM Information
+# Contains the BSSGP RIM PDU
+#.FN_BODY RIMInformation VAL_PTR = &parameter_tvb
+ tvbuff_t *parameter_tvb;
+ proto_tree *subtree;
+
+%(DEFAULT_BODY)s
+ if (!parameter_tvb)
+ return offset;
+
+ subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RIMInformation);
+ if ((tvb_length(parameter_tvb)>0)&&(bssgp_handle)){
+ col_set_fence(%(ACTX)s->pinfo->cinfo, COL_INFO);
+ call_dissector(bssgp_handle,parameter_tvb,%(ACTX)s->pinfo, subtree);
+ }
+
+
#.TYPE_ATTR
ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &s1ap_ProtocolIE_ID_vals_ext