forked from osmocom/wireshark
Regenerate the INAP dissector with the -X option using the original asn1 files
(with small modifications). svn path=/trunk/; revision=22021
This commit is contained in:
parent
7b8632f552
commit
883083a064
|
@ -0,0 +1,84 @@
|
||||||
|
-- $Id$
|
||||||
|
-- Module IN-CS-1-Datatypes-appendix (Q.1218:10/1995)
|
||||||
|
IN-CS-1-DataTypes-appendix {itu-t recommendation q 1218 modules(0)
|
||||||
|
cs-1-datatypes-app(6) version1(0)}
|
||||||
|
-- This module contains additional type definitions for the IN CS-1 data types.
|
||||||
|
DEFINITIONS IMPLICIT TAGS ::=
|
||||||
|
BEGIN
|
||||||
|
|
||||||
|
IMPORTS
|
||||||
|
LegID, CorrelationID
|
||||||
|
FROM IN-CS-1-Datatypes {itu-t recommendation q 1218 modules(0)
|
||||||
|
cs-1-datatypes(2) version1(0)};
|
||||||
|
|
||||||
|
-- TYPE DEFINITION FOR ADDITIONAL IN CS-1 DATA TYPES
|
||||||
|
-- Argument Data Types
|
||||||
|
AddPartyArg ::= SEQUENCE {
|
||||||
|
originalCallID [0] CallID OPTIONAL,
|
||||||
|
destinationCallID [1] CallID OPTIONAL
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use.
|
||||||
|
AttachArg ::= SEQUENCE {
|
||||||
|
newLegID [0] LegID OPTIONAL,
|
||||||
|
correlationidentifier [1] CorrelationID OPTIONAL
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use.
|
||||||
|
CallPartyHandlingResultsArg ::= SEQUENCE OF LegInformation
|
||||||
|
|
||||||
|
ChangePartiesArg ::= SEQUENCE {
|
||||||
|
callID [0] CallID OPTIONAL,
|
||||||
|
targetCallID [1] CallID,
|
||||||
|
legToBeConnectedID [2] LegID
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use.
|
||||||
|
DetachArg ::= SEQUENCE {
|
||||||
|
legToBeDetached [0] LegID OPTIONAL,
|
||||||
|
correlationidentifier [1] CorrelationID OPTIONAL
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use.
|
||||||
|
HoldCallPartyConnectionArg ::= SEQUENCE {
|
||||||
|
callID [0] CallID OPTIONAL,
|
||||||
|
legID [1] LegID
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use.
|
||||||
|
ReconnectArg ::= SEQUENCE {
|
||||||
|
callID [0] CallID OPTIONAL,
|
||||||
|
heldLegID [1] LegID
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use.
|
||||||
|
ReleaseCallPartyConnectionArg ::= SEQUENCE {
|
||||||
|
legToBeReleased [0] LegID,
|
||||||
|
callID [1] CallID OPTIONAL,
|
||||||
|
releaseCause [2] CauseQ763 OPTIONAL
|
||||||
|
}
|
||||||
|
|
||||||
|
-- OPTIONAL denotes network operator specific use. Common Data Types
|
||||||
|
CallID ::= INTEGER
|
||||||
|
|
||||||
|
-- Indicates an identifier to reference an instance of a Call accessible to the SCF. Refer to
|
||||||
|
-- 4.2.2.1/Q.1214 for a description of Call Segment.
|
||||||
|
CauseQ763 ::= OCTET STRING
|
||||||
|
-- WS adaptation
|
||||||
|
-- Indicates the cause for interface related information. Refer to the Q.763 Cause parameter
|
||||||
|
-- for encoding.
|
||||||
|
LegInformation ::= SEQUENCE {legID [0] LegID,
|
||||||
|
legStatus [1] LegStatus
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Indicates call party information, as defined by a Leg object. This includes a LegID to reference
|
||||||
|
-- each call party, and a LegStatus to indicate whether the call party is connected or not.
|
||||||
|
LegStatus ::= ENUMERATED {
|
||||||
|
connected(0), unconnected(1), pending(2), interacting(3)
|
||||||
|
-- user connected to a resource--}
|
||||||
|
|
||||||
|
-- Indicates the state of the call party.
|
||||||
|
END
|
||||||
|
|
||||||
|
-- Generated by Asnp, the ASN.1 pretty-printer of France Telecom R&D
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,13 +1,14 @@
|
||||||
# $Id$
|
# $Id$
|
||||||
|
|
||||||
DISSECTOR_FILES=packet-inap.c packet-inap.h
|
DISSECTOR_FILES=packet-inap.c packet-inap.h
|
||||||
|
ASN_FILE_LIST=inap.asn IN-CS-1-Datatypes.asn IN-CS-1-Datatypes-appendix.asn
|
||||||
|
|
||||||
all: generate_dissector
|
all: generate_dissector
|
||||||
|
|
||||||
generate_dissector: $(DISSECTOR_FILES)
|
generate_dissector: $(DISSECTOR_FILES)
|
||||||
|
|
||||||
$(DISSECTOR_FILES): ../../tools/asn2wrs.py inap.asn packet-inap-template.c packet-inap-template.h inap.cnf
|
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-inap-template.c packet-inap-template.h inap.cnf
|
||||||
python ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn
|
python ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template $(ASN_FILE_LIST)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f parsetab.py $(DISSECTOR_FILES)
|
rm -f parsetab.py $(DISSECTOR_FILES)
|
||||||
|
|
|
@ -8,14 +8,15 @@ UNIX2DOS=$(PERL) ../../tools/unix2dos.pl
|
||||||
|
|
||||||
PROTOCOL_NAME=inap
|
PROTOCOL_NAME=inap
|
||||||
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
|
DISSECTOR_FILES=packet-$(PROTOCOL_NAME).c packet-$(PROTOCOL_NAME).h
|
||||||
|
ASN_FILE_LIST=inap.asn IN-CS-1-Datatypes.asn IN-CS-1-Datatypes-appendix.asn
|
||||||
|
|
||||||
all: generate_dissector
|
all: generate_dissector
|
||||||
|
|
||||||
generate_dissector: $(DISSECTOR_FILES)
|
generate_dissector: $(DISSECTOR_FILES)
|
||||||
|
|
||||||
$(DISSECTOR_FILES): ../../tools/asn2wrs.py inap.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h inap.cnf
|
$(DISSECTOR_FILES): ../../tools/asn2wrs.py $(ASN_FILE_LIST) packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h inap.cnf
|
||||||
!IFDEF PYTHON
|
!IFDEF PYTHON
|
||||||
$(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c inap.cnf -s packet-$(PROTOCOL_NAME)-template inap.asn
|
$(PYTHON) "../../tools/asn2wrs.py" -b -X -e -p $(PROTOCOL_NAME) -c inap.cnf -s packet-$(PROTOCOL_NAME)-template $(ASN_FILE_LIST)
|
||||||
!ELSE
|
!ELSE
|
||||||
@echo Error: You need Python to use asn2wrs.py
|
@echo Error: You need Python to use asn2wrs.py
|
||||||
@exit 1
|
@exit 1
|
||||||
|
|
1398
asn1/inap/inap.asn
1398
asn1/inap/inap.asn
File diff suppressed because it is too large
Load Diff
|
@ -7,24 +7,29 @@
|
||||||
|
|
||||||
#.EXPORTS
|
#.EXPORTS
|
||||||
|
|
||||||
|
|
||||||
#.PDU
|
|
||||||
Component
|
|
||||||
|
|
||||||
#.NO_EMIT
|
#.NO_EMIT
|
||||||
|
|
||||||
|
#.CLASS EXTENSION
|
||||||
|
id TypeReference ExtensionType
|
||||||
|
Type
|
||||||
|
absent
|
||||||
|
criticality TypeReference Criticality
|
||||||
|
|
||||||
|
|
||||||
|
#.END
|
||||||
#.TYPE_RENAME
|
#.TYPE_RENAME
|
||||||
|
|
||||||
#.FIELD_RENAME
|
#.FIELD_RENAME
|
||||||
|
|
||||||
#.PDU
|
#.PDU
|
||||||
InitialDP
|
Component
|
||||||
|
InitialDPArg
|
||||||
OriginationAttemptAuthorizedArg
|
OriginationAttemptAuthorizedArg
|
||||||
CollectedInformationArg
|
CollectedInformationArg
|
||||||
AnalysedInformationArg
|
AnalysedInformationArg
|
||||||
RouteSelectFailureArg
|
RouteSelectFailureArg
|
||||||
OCalledPartyBusyArg
|
OCalledPartyBusyArg
|
||||||
ONoAnswer
|
ONoAnswerArg
|
||||||
OAnswerArg
|
OAnswerArg
|
||||||
ODisconnectArg
|
ODisconnectArg
|
||||||
TermAttemptAuthorizedArg
|
TermAttemptAuthorizedArg
|
||||||
|
@ -41,7 +46,7 @@ HoldCallInNetworkArg
|
||||||
ReleaseCallArg
|
ReleaseCallArg
|
||||||
RequestReportBCSMEventArg
|
RequestReportBCSMEventArg
|
||||||
EventReportBCSMArg
|
EventReportBCSMArg
|
||||||
RequestNotificationChargingEvent
|
RequestNotificationChargingEventArg
|
||||||
EventNotificationChargingArg
|
EventNotificationChargingArg
|
||||||
CollectInformationArg
|
CollectInformationArg
|
||||||
AnalyseInformationArg
|
AnalyseInformationArg
|
||||||
|
@ -69,6 +74,10 @@ CancelArg
|
||||||
RequestCurrentStatusReportResultArg
|
RequestCurrentStatusReportResultArg
|
||||||
ReceivedInformationArg
|
ReceivedInformationArg
|
||||||
|
|
||||||
|
#.FN_BODY T_value
|
||||||
|
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
|
||||||
|
NULL);
|
||||||
|
|
||||||
#.FN_BODY InvokeParameter
|
#.FN_BODY InvokeParameter
|
||||||
offset = dissect_invokeData(tree, tvb, offset, actx);
|
offset = dissect_invokeData(tree, tvb, offset, actx);
|
||||||
|
|
||||||
|
@ -120,11 +129,11 @@ VAL_PTR = ¶meter_tvb
|
||||||
dissect_isup_calling_party_number_parameter(parameter_tvb, tree, NULL);
|
dissect_isup_calling_party_number_parameter(parameter_tvb, tree, NULL);
|
||||||
|
|
||||||
|
|
||||||
#.FN_PARS BearerCap
|
#.FN_PARS BearerCapability/bearerCap
|
||||||
|
|
||||||
VAL_PTR = ¶meter_tvb
|
VAL_PTR = ¶meter_tvb
|
||||||
|
|
||||||
#.FN_BODY BearerCap
|
#.FN_BODY BearerCapability/bearerCap
|
||||||
|
|
||||||
tvbuff_t *parameter_tvb;
|
tvbuff_t *parameter_tvb;
|
||||||
|
|
||||||
|
|
|
@ -186,7 +186,7 @@ TC-Invokable OPERATION ::=
|
||||||
static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) {
|
static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) {
|
||||||
switch(opcode){
|
switch(opcode){
|
||||||
case 0: /*InitialDP*/
|
case 0: /*InitialDP*/
|
||||||
offset=dissect_inap_InitialDP(FALSE, tvb, offset, actx, tree, hf_inap_InitialDP_PDU);
|
offset=dissect_inap_InitialDPArg(FALSE, tvb, offset, actx, tree, hf_inap_InitialDPArg_PDU);
|
||||||
break;
|
break;
|
||||||
case 1: /*1 OriginationAttemptAuthorized */
|
case 1: /*1 OriginationAttemptAuthorized */
|
||||||
offset=dissect_inap_OriginationAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, hf_inap_OriginationAttemptAuthorizedArg_PDU);
|
offset=dissect_inap_OriginationAttemptAuthorizedArg(FALSE, tvb, offset, actx, tree, hf_inap_OriginationAttemptAuthorizedArg_PDU);
|
||||||
|
@ -204,7 +204,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
||||||
offset=dissect_inap_OCalledPartyBusyArg(FALSE, tvb, offset, actx, tree, hf_inap_OCalledPartyBusyArg_PDU);
|
offset=dissect_inap_OCalledPartyBusyArg(FALSE, tvb, offset, actx, tree, hf_inap_OCalledPartyBusyArg_PDU);
|
||||||
break;
|
break;
|
||||||
case 6: /*6 oNoAnswer */
|
case 6: /*6 oNoAnswer */
|
||||||
offset=dissect_inap_ONoAnswer(FALSE, tvb, offset, actx, tree, hf_inap_ONoAnswer_PDU);
|
offset=dissect_inap_ONoAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_ONoAnswerArg_PDU);
|
||||||
break;
|
break;
|
||||||
case 7: /*7 oAnswer */
|
case 7: /*7 oAnswer */
|
||||||
offset=dissect_inap_OAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_OAnswerArg_PDU);
|
offset=dissect_inap_OAnswerArg(FALSE, tvb, offset, actx, tree, hf_inap_OAnswerArg_PDU);
|
||||||
|
@ -262,7 +262,7 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_
|
||||||
offset=dissect_inap_EventReportBCSMArg(FALSE, tvb, offset, actx, tree, hf_inap_EventReportBCSMArg_PDU);
|
offset=dissect_inap_EventReportBCSMArg(FALSE, tvb, offset, actx, tree, hf_inap_EventReportBCSMArg_PDU);
|
||||||
break;
|
break;
|
||||||
case 25: /*25, "RequestNotificationChargingEvent */
|
case 25: /*25, "RequestNotificationChargingEvent */
|
||||||
offset=dissect_inap_RequestNotificationChargingEvent(FALSE, tvb, offset, actx, tree, hf_inap_RequestNotificationChargingEvent_PDU);
|
offset=dissect_inap_RequestNotificationChargingEventArg(FALSE, tvb, offset, actx, tree, hf_inap_RequestNotificationChargingEventArg_PDU);
|
||||||
break;
|
break;
|
||||||
case 26: /*26, "EventNotificationCharging */
|
case 26: /*26, "EventNotificationCharging */
|
||||||
offset=dissect_inap_EventNotificationChargingArg(FALSE, tvb, offset, actx, tree, hf_inap_EventNotificationChargingArg_PDU);
|
offset=dissect_inap_EventNotificationChargingArg(FALSE, tvb, offset, actx, tree, hf_inap_EventNotificationChargingArg_PDU);
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,7 @@
|
||||||
/* Do not modify this file. */
|
/* Do not modify this file. */
|
||||||
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
|
||||||
/* .\packet-inap.h */
|
/* .\packet-inap.h */
|
||||||
/* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
|
/* ../../tools/asn2wrs.py -b -X -e -p inap -c inap.cnf -s packet-inap-template inap.asn IN-CS-1-Datatypes.asn IN-CS-1-Datatypes-appendix.asn */
|
||||||
|
|
||||||
/* Input file: packet-inap-template.h */
|
/* Input file: packet-inap-template.h */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue