diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-30 16:15:27 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-10-30 16:15:27 +0000 |
| commit | 49ec145cdb2f6d71fe7da8f2538880f06fbf0125 (patch) | |
| tree | 5040359939a19b4911c6d75553f317ef82241184 /asn1 | |
| parent | 89bbb9fb59335d5630bc7df57d524d7c50b1f3f5 (diff) | |
- Bitrate must be FT_UINT64
- Dissect HandoverCommand
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30771 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/x2ap/packet-x2ap-template.c | 2 | ||||
| -rw-r--r-- | asn1/x2ap/x2ap.cnf | 33 |
2 files changed, 32 insertions, 3 deletions
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index 5f993664fa..f80f065a76 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -43,6 +43,8 @@ #include "packet-per.h" #include "packet-e212.h" +#include "packet-frame.h" +#include "packet-lte-rrc.h" #ifdef _MSC_VER /* disable: "warning C4146: unary minus operator applied to unsigned type, result still unsigned" */ diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf index bf82b0a893..da44c57021 100644 --- a/asn1/x2ap/x2ap.cnf +++ b/asn1/x2ap/x2ap.cnf @@ -74,11 +74,11 @@ ProtocolIE-ContainerPairList #.FN_PARS UnsuccessfulOutcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_UnsuccessfulOutcomeValue -#.FN_BODY PLMN-Identity VAL_PTR = parameter_tvb +#.FN_BODY PLMN-Identity VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; - offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, - 3, 3, FALSE, ¶meter_tvb); +%(DEFAULT_BODY)s + if(tvb_length(tvb)==0) return offset; @@ -87,6 +87,30 @@ ProtocolIE-ContainerPairList dissect_e212_mcc_mnc(parameter_tvb, tree, 0); #.END +#.FN_BODY TargeteNBtoSource-eNBTransparentContainer VAL_PTR = ¶meter_tvb + tvbuff_t *parameter_tvb=NULL; + +%(DEFAULT_BODY)s + if (!parameter_tvb) + return offset; + + TRY { + dissect_lte_rrc_HandoverCommand_PDU(parameter_tvb, actx->pinfo, tree); + } + CATCH(BoundsError) { + g_warning("BoundsError"); + show_exception(parameter_tvb, actx->pinfo, tree, EXCEPT_CODE, GET_MESSAGE); + } + CATCH(ReportedBoundsError) { + g_warning("ReportedBoundsError"); + show_exception(parameter_tvb, actx->pinfo, tree, EXCEPT_CODE, GET_MESSAGE); + } + CATCH_ALL{ + g_warning("CATCH_ALL"); + show_exception(parameter_tvb, actx->pinfo, tree, EXCEPT_CODE, GET_MESSAGE); + } + ENDTRY; + #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_ProtocolIE_ID_vals) #.END @@ -234,4 +258,7 @@ ResourceStatusFailure N x2ap.proc.uout id-resourceStatusReportingInitiation ResourceStatusUpdate N x2ap.proc.imsg id-resourceStatusReporting PrivateMessage N x2ap.proc.imsg id-privateMessage + +#.TYPE_ATTR +BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL #.END |