diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-06-28 20:31:56 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-06-28 20:31:56 +0000 |
| commit | 36916d5ac562be95b756229f209948eee86f4f92 (patch) | |
| tree | 1f968ebeb08a8776b2f8deee06d6c603bc5f7efa /asn1/pcap | |
| parent | 028c6a75bd08e124f076b0b8afccbb78262decc1 (diff) | |
| download | wireshark-36916d5ac562be95b756229f209948eee86f4f92.tar.gz | |
Add som missing extension IE's and try to get rid of som unused code warnings.
svn path=/trunk/; revision=25625
Diffstat (limited to 'asn1/pcap')
| -rw-r--r-- | asn1/pcap/packet-pcap-template.c | 10 | ||||
| -rw-r--r-- | asn1/pcap/pcap.cnf | 50 |
2 files changed, 38 insertions, 22 deletions
diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c index 86caee8959..039705f8ef 100644 --- a/asn1/pcap/packet-pcap-template.c +++ b/asn1/pcap/packet-pcap-template.c @@ -108,16 +108,6 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto return (dissector_try_port(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; } -static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -{ - return (dissector_try_port(pcap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; -} - -static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -{ - return (dissector_try_port(pcap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; -} - static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return (dissector_try_port(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0; diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index f5975a6b6c..fd481720fd 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -20,6 +20,13 @@ ProtocolIE-ID #.NO_EMIT +#.OMIT_ASSIGNMENT +# Get rid of unused code warnings +ProtocolIE-ContainerList +Presence +#.END + + #.TYPE_RENAME InitiatingMessage/value InitiatingMessage_value @@ -78,22 +85,22 @@ ProtocolIE-Field/value ie_field_value #.FN_PARS Outcome/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_OutcomeValue #--- Parameterization is not supported in asn2wrs --- - +# Not used yet in PCAP ASN.1 #ProtocolIE-ContainerList {INTEGER : lowerBound, INTEGER : upperBound, PCAP-PROTOCOL-IES : IEsSetParam} ::= # SEQUENCE (SIZE (lowerBound..upperBound)) OF # ProtocolIE-Container {{IEsSetParam}} -#.FN_PARS ProtocolIE-ContainerList -MIN_VAL = asn1_param_get_integer(%(ACTX)s,"lowerBound") -MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") -#.FN_HDR ProtocolIE-ContainerList - static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = { - { "lowerBound", ASN1_PAR_INTEGER }, - { "upperBound", ASN1_PAR_INTEGER }, - { NULL, 0 } - }; - asn1_stack_frame_check(actx, "ProtocolIE-ContainerList", ProtocolIE_ContainerList_pars); -#.END +# FN_PARS ProtocolIE-ContainerList +#MIN_VAL = asn1_param_get_integer(%(ACTX)s,"lowerBound") +#MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") +# FN_HDR ProtocolIE-ContainerList +# static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = { +# { "lowerBound", ASN1_PAR_INTEGER }, +# { "upperBound", ASN1_PAR_INTEGER }, +# { NULL, 0 } +# }; +# asn1_stack_frame_check(actx, "ProtocolIE-ContainerList", ProtocolIE_ContainerList_pars); +# END #ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, PCAP-PROTOCOL-IES-PAIR : IEsSetParam} ::= # SEQUENCE (SIZE (lowerBound..upperBound)) OF @@ -269,6 +276,25 @@ GANSS-MeasuredResultsList N pcap.extension id-GANSS-MeasuredResultsList GANSS-UTRAN-TRU N pcap.extension id-GANSS-UTRAN-TRU AdditionalGPSAssistDataRequired N pcap.extension id-AdditionalGPSAssistDataRequired AdditionalGanssAssistDataRequired N pcap.extension id-AdditionalGanssAssistDataRequired +RxTimingDeviation768Info N pcap.extension id-rxTimingDeviation768Info +RxTimingDeviation384extInfo N pcap.extension id-rxTimingDeviation384extInfo +RoundTripTimeInfoWithType1 N pcap.extension id-roundTripTimeInfoWithType1 +AddMeasurementInfo N pcap.extension id-AddMeasurementInfo +AngleOfArrivalLCR N pcap.extension id-angleOfArrivalLCR +ExtendedTimingAdvanceLCR N pcap.extension id-extendedTimingAdvanceLCR +GANSS-PositioningDataSet N pcap.extension id-GANSS-PositioningDataSet +GANSS-CommonAssistanceData N pcap.extension id-GANSS-CommonAssistanceData +GANSS-GenericAssistanceDataList N pcap.extension id-GANSS-GenericAssistanceDataList +GPS-ReferenceLocation N pcap.extension id-GPS-ReferenceLocation +UTRAN-GPS-DriftRate N pcap.extension id-UTRAN-GPS-DriftRate +GPSReferenceTimeUncertainty N pcap.extension id-GPSReferenceTimeUncertainty +OTDOA-AddMeasuredResultsInfo N pcap.extension id-OTDOA-AddMeasuredResultsInfo +Extended-RNC-ID N pcap.extension id-Extended-RNC-ID +AdditionalMeasurementInforLCR N pcap.extension id-additionalMeasurementInforLCR +GNSS-PositioningMethod N pcap.extension id-GNSS-PositioningMethod +NetworkAssistedGANSSSupport N pcap.extension id-NetworkAssistedGANSSSuport +UTRAN-GPSReferenceTime N pcap.extension id-UTRAN-GPSReferenceTime + #PCAP-ELEMENTARY-PROCEDURE |