diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-11-14 14:53:02 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-14 13:57:09 +0000 |
| commit | 56fa29edc5ab8757d57a30b6ded5827fb06585a8 (patch) | |
| tree | efc7fed879b081525b6b1912b0d1fe127cc112df /asn1 | |
| parent | d6f2392bc64ef710c0976cd8e22ab695e6cca6f0 (diff) | |
| download | wireshark-56fa29edc5ab8757d57a30b6ded5827fb06585a8.tar.gz | |
[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID
Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb
Reviewed-on: https://code.wireshark.org/review/5298
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/s1ap/packet-s1ap-template.c | 3 | ||||
| -rw-r--r-- | asn1/s1ap/s1ap.cnf | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 6f1a603152..04b632511a 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -43,6 +43,7 @@ #include "packet-ranap.h" #include "packet-bssgp.h" #include "packet-s1ap.h" +#include "packet-a21.h" #ifdef _MSC_VER /* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */ @@ -81,6 +82,7 @@ static int ett_s1ap_RRCContainer = -1; static int ett_s1ap_UERadioCapability = -1; static int ett_s1ap_RIMInformation = -1; static int ett_s1ap_Cdma2000PDU = -1; +static int ett_s1ap_Cdma2000SectorID = -1; #include "packet-s1ap-ett.c" @@ -259,6 +261,7 @@ void proto_register_s1ap(void) { &ett_s1ap_UERadioCapability, &ett_s1ap_RIMInformation, &ett_s1ap_Cdma2000PDU, + &ett_s1ap_Cdma2000SectorID, #include "packet-s1ap-ettarr.c" }; diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index ed28c8f32b..7c3e9c1c48 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -534,6 +534,26 @@ if (gcsna_handle) { call_dissector(gcsna_handle, parameter_tvb, %(ACTX)s->pinfo, subtree); } + +#.FN_BODY Cdma2000SectorID VAL_PTR = ¶meter_tvb +/* 9.2.1.25 + * This IE is set to CDMA2000 Reference Cell ID + * corresponding to the HRPD/1xRTT sector under + * the HRPD AN/1xBS to which the eNB has initiated the UE + * to handover to. The CDMA2000 Reference Cell + * ID is statically configured in the eNB. + */ + tvbuff_t *parameter_tvb; + proto_tree *subtree = NULL; + +%(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; + + subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_Cdma2000SectorID); + dissect_a21_ie_common(parameter_tvb, %(ACTX)s->pinfo, NULL/* Top tree not needed */, tree, 0, 0 /* message_type not needed */); + + #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &s1ap_ProtocolIE_ID_vals_ext |