diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-05-24 12:30:38 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-05-24 12:30:38 +0000 |
| commit | 062d80f7b8739a89336334ed5f7ed6d2db1ec637 (patch) | |
| tree | 10a38c7b3ca5b4eb2776fb762cd7019d879d7aa3 /asn1/rnsap | |
| parent | b0f2653497df6211a9982b682c398948fa9f2241 (diff) | |
- RNSAP calls RRC through dissector handle instead of direct function call
- PER dissectors regenerated
svn path=/trunk/; revision=21919
Diffstat (limited to 'asn1/rnsap')
| -rw-r--r-- | asn1/rnsap/packet-rnsap-template.c | 9 | ||||
| -rw-r--r-- | asn1/rnsap/rnsap.cnf | 33 |
2 files changed, 36 insertions, 6 deletions
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index 45dfd9fe9d..92532925da 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -41,10 +41,7 @@ #include <epan/asn1.h> -#include "packet-ber.h" #include "packet-per.h" -#include "packet-umts_rrc.h" -/*#include "packet-umts_rrc.h"*/ #define PNAME "UTRAN Iur interface Radio Network Subsystem Application Part" #define PSNAME "RNSAP" @@ -54,7 +51,9 @@ #include "packet-rnsap-val.h" -static dissector_handle_t rnsap_handle=NULL; +static dissector_handle_t rnsap_handle = NULL; + +static dissector_handle_t rrc_dl_dcch_handle = NULL; /* Initialize the protocol and registered fields */ static int proto_rnsap = -1; @@ -180,6 +179,8 @@ void proto_reg_handoff_rnsap(void) { + rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch"); + dissector_add("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle); /* Add heuristic dissector * Perhaps we want a preference whether the heuristic dissector diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf index 29cb02cbe8..a2c1ae8d68 100644 --- a/asn1/rnsap/rnsap.cnf +++ b/asn1/rnsap/rnsap.cnf @@ -62,7 +62,30 @@ criticality TypeReference Criticality #.TYPE_RENAME ProcedureID/ddMode DdMode +ProtocolIE-Field/value ProtocolIE_Field_value +PrivateIE-Field/value PrivateIE_Field_value +InitiatingMessage/value InitiatingMessage_value +SuccessfulOutcome/value SuccessfulOutcome_value +UnsuccessfulOutcome/value UnsuccessfulOutcome_value +Outcome/value Outcome_value + +MidambleShiftAndBurstType/type1 Type1 +MidambleShiftAndBurstType768/type1 Type7681 +MidambleShiftAndBurstType/type2 Type2 +MidambleShiftAndBurstType768/type2 Type7682 +MidambleShiftAndBurstType/type3 Type3 +MidambleShiftAndBurstType768/type3 Type7683 + +MidambleShiftAndBurstType/type1/midambleAllocationMode MidambleAllocationMode1 +MidambleShiftAndBurstType/type2/midambleAllocationMode MidambleAllocationMode2 +MidambleShiftAndBurstType/type3/midambleAllocationMode MidambleAllocationMode3 +MidambleShiftAndBurstType768/type1/midambleAllocationMode MidambleAllocationMode7681 +MidambleShiftAndBurstType768/type2/midambleAllocationMode MidambleAllocationMode7682 +MidambleShiftAndBurstType768/type3/midambleAllocationMode MidambleAllocationMode7683 + #.FIELD_RENAME +UEMeasurementTimeslotInfoLCR-IEs/timeSlot timeSlotLCR + #.OMIT_ASSIGNMENT Presence @@ -108,20 +131,26 @@ ProtocolIE-ContainerPairList #.FN_BODY L3-Information VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; + dissector_handle_t parameter_handle = NULL; %(DEFAULT_BODY)s if (!parameter_tvb) return offset; - switch (ProcedureCode){ + switch (ProcedureCode) { case RNSAP_ID_DOWNLINKSIGNALLINGTRANSFER: - dissect_umts_rrc_DL_DCCH_Message(parameter_tvb, 0, %(ACTX)s, tree, hf_rnsap_L3_DL_DCCH_Message_PDU); + parameter_handle = rrc_dl_dcch_handle; + break; case RNSAP_ID_UPLINKSIGNALLINGTRANSFER: default: break; } + + if (parameter_handle) + call_dissector(parameter_handle, parameter_tvb, %(ACTX)s->pinfo, tree); + #.END #.TYPE_ATTR |