osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Tim 

A small patch for camel and inap, where the linkedid doesn't get dissected correctly in camel or inap
and some tidy up in the camel asn.1 which now compiles with no warnings.

also fix the copy_file target (/y)

svn path=/trunk/; revision=16376
This commit is contained in:
Anders Broman 2005-11-02 07:51:55 +00:00
parent c5ff846c22
commit 6eb18470f8
8 changed files with 363 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/camel/Makefile.nmake
View File

@ -37,5 +37,5 @@ fix_eol: generate_dissector
del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp
copy_files: generate_dissector fix_eol
xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d
xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d
xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y
xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y

70
asn1/camel/camel.asn
View File

@ -7,7 +7,7 @@
--
--***********************************************
-- $Id:$
-- $Id$
@ -49,7 +49,7 @@ PBIPSSPCapabilities ::= SEQUENCE {
genOfVoiceAnn INTEGER,
voiceInfo2 INTEGER,
voiceInfo1 INTEGER,
voiceBack INTEGER,
voiceBack1 INTEGER,
iPRoutAdd INTEGER,
bilateralPart OCTET STRING (SIZE(0..3))
}
@ -65,7 +65,7 @@ PBAddressString ::= SEQUENCE {
extension INTEGER(1),
natureOfAddressIndicator INTEGER,
numberingPlanInd INTEGER,
digits
digits1
OCTET STRING (SIZE(0..19))
}
@ -74,14 +74,14 @@ PBISDNAddressString ::= SEQUENCE {
extension INTEGER(1),
natureOfAddressIndicator INTEGER,
numberingPlanInd INTEGER,
digits
digits2
OCTET STRING (SIZE(0..8))
}
PBGeographicalInformation ::= SEQUENCE {
typeOfShape INTEGER,
spare INTEGER,
spare3 INTEGER,
degreesOfLatitude OCTET STRING (SIZE(3)),
degreesOfLongitude OCTET STRING (SIZE(3)),
uncertaintyCode OCTET STRING (SIZE(1))
@ -110,7 +110,7 @@ BEGIN
PBRedirectionInformation ::= SEQUENCE {
originalReasons INTEGER,
spare INTEGER(0),
spare4 INTEGER(0),
indicator INTEGER,
reason INTEGER,
spare2 INTEGER(0),
@ -133,9 +133,9 @@ PBCalledPartyNumber ::= SEQUENCE {
natureOfAddressIndicator INTEGER,
innInd INTEGER,
numberingPlanInd INTEGER,
spare INTEGER(0),
spare5 INTEGER(0),
-- 2-32 bcdDigits
digits
digits3
OCTET STRING (SIZE(0..16))
}
-- the Destination Address Field is not present if the destination address length is set to zero.
@ -151,7 +151,7 @@ PBCallingPartyNumber ::= SEQUENCE {
presentInd INTEGER,
screening INTEGER,
-- 0-16 bcdDigits
digits
digits4
OCTET STRING (SIZE(0..8))
}
@ -160,9 +160,9 @@ PBRedirectingNumber ::= SEQUENCE {
natureOfAddressIndicator INTEGER,
innInd INTEGER,
numberingPlanInd INTEGER,
spare INTEGER(0),
spare6 INTEGER(0),
-- 2-20 bcdDigits
digits
digits5
OCTET STRING (SIZE(1..10))
}
@ -170,7 +170,7 @@ PBRedirectingNumber ::= SEQUENCE {
PBCause ::= SEQUENCE {
o1ext INTEGER(1),
codingStandard INTEGER,
spare INTEGER(0),
spare77 INTEGER(0),
location INTEGER,
o2ext INTEGER(1),
causeValue INTEGER,
@ -186,7 +186,7 @@ PBGenericNumber ::= SEQUENCE {
numberingPlanInd INTEGER,
presentInd INTEGER,
screening INTEGER,
digits
digits6
OCTET STRING (SIZE(0..8))
}
@ -198,7 +198,7 @@ PBLocationNumber ::= SEQUENCE {
numberingPlanInd INTEGER,
presentInd INTEGER,
screening INTEGER,
digits
digits7
OCTET STRING (SIZE(0..8))
}
@ -223,7 +223,7 @@ PBCalledPartyBCDNumber ::= SEQUENCE {
reservedExt (7)
},
numberingPlanInd INTEGER,
digits
digits8
OCTET STRING (SIZE(0..40))
}
@ -265,12 +265,12 @@ OCTET STRING (SIZE (cAPSpecificBoundSetminAccessPointNameLength .. cAPSpecificBo
-- locally refd 2 times, import refd 0 times
AChBillingChargingCharacteristics ::= CHOICE
{
timeDurationCharging [0] SEQUENCE
actimeDurationCharging [0] SEQUENCE
{
maxCallPeriodDuration [0] INTEGER (1..864000),
releaseIfdurationExceeded [1] BOOLEAN DEFAULT FALSE,
tariffSwitchInterval [2] INTEGER (1..86400) OPTIONAL,
tone [3] BOOLEAN DEFAULT FALSE,
actone [3] BOOLEAN DEFAULT FALSE,
extensions [4] ExtensionsArray OPTIONAL
}
}
@ -290,7 +290,7 @@ OCTET STRING (SIZE (3))
-- Because I added a new Errortypes section at the end.
--CancelFailedPARAM ::= SEQUENCE
--{
--{
-- operation [1] InvokeID
--}
@ -371,7 +371,7 @@ BCSMEvent ::= SEQUENCE
{
eventTypeBCSM [0] EventTypeBCSM,
monitorMode [1] MonitorMode,
legID [2] LegID OPTIONAL,
legID6 [2] LegID OPTIONAL,
dpSpecificCriteria [30] DpSpecificCriteria OPTIONAL
}
@ -434,7 +434,7 @@ CamelAChBillingChargingCharacteristics ::= CHOICE
maxCallPeriodDuration [0] INTEGER (1..864000),
releaseIfdurationExceeded [1] BOOLEAN DEFAULT FALSE,
tariffSwitchInterval [2] INTEGER (1..86400) OPTIONAL,
tone [3] BOOLEAN DEFAULT FALSE,
actone [3] BOOLEAN DEFAULT FALSE,
extensions [4] ExtensionsArray OPTIONAL
}
}
@ -445,7 +445,7 @@ CamelCallResult ::= CHOICE
{
timeDurationChargingResult [0] SEQUENCE
{
partyToCharge [0] ReceivingSideID,
partyToCharge3 [0] ReceivingSideID,
timeInformation [1] TimeInformation,
callActive [2] BOOLEAN DEFAULT TRUE,
callReleasedAtTcpExpiry [3] NULL OPTIONAL,
@ -461,7 +461,7 @@ CamelFCIBillingChargingCharacteristics ::= CHOICE
fCIBCCCAMELsequence1 [0] SEQUENCE
{
freeFormatData [0] FreeFormatData,
partyToCharge [1] SendingSideID DEFAULT '01'H,
partyToCharge4 [1] SendingSideID DEFAULT '01'H,
appendFreeFormatData [2] AppendFreeFormatData DEFAULT overwrite
}
}
@ -473,7 +473,7 @@ CamelFCIGPRSBillingChargingCharacteristics ::=
SEQUENCE
{
fCIBCCCAMELsequence1 [0] SEQUENCE
fCIBCCCAMELsequence2 [0] SEQUENCE
{
freeFormatData [0] FreeFormatData,
pDPID [1] PDPId OPTIONAL,
@ -486,7 +486,7 @@ SEQUENCE
-- locally refd 1 times, import refd 0 times
CamelFCISMSBillingChargingCharacteristics ::= CHOICE
{
fCIBCCCAMELsequence1 [0] SEQUENCE
fCIBCCCAMELsequence3 [0] SEQUENCE
{
freeFormatData [0] FreeFormatData,
appendFreeFormatData [1] AppendFreeFormatData DEFAULT overwrite
@ -737,7 +737,7 @@ EventSpecificInformationSMS ::= CHOICE
{
o-smsFailureSpecificInfo [0] SEQUENCE
{
failureCause [0] SMSCause OPTIONAL
smsfailureCause [0] SMSCause OPTIONAL
},
o-smsSubmittedSpecificInfo [1] SEQUENCE
{
@ -822,7 +822,7 @@ GapCriteria ::= CHOICE
-- locally refd 1 times, import refd 0 times
GapIndicators ::= SEQUENCE
{
duration [0] Duration,
duration1 [0] Duration,
gapInterval [1] Interval
}
@ -964,7 +964,7 @@ InbandInfo ::= SEQUENCE
{
messageID [0] MessageID,
numberOfRepetitions [1] INTEGER (1..127) OPTIONAL,
duration [2] INTEGER (0..32767) OPTIONAL,
duration2 [2] INTEGER (0..32767) OPTIONAL,
interval [3] INTEGER (0..32767) OPTIONAL
}
@ -1280,7 +1280,7 @@ TimeIfNoTariffSwitch ::= INTEGER (0..864000)
TimeIfTariffSwitch ::= SEQUENCE
{
timeSinceTariffSwitch [0] INTEGER (0..864000),
tariffSwitchInterval [1] INTEGER (1..864000) OPTIONAL
tttariffSwitchInterval [1] INTEGER (1..864000) OPTIONAL
}
-- TimerID notes: not recursive, exported,
@ -1304,7 +1304,7 @@ TimeAndTimezone ::=
Tone ::= SEQUENCE
{
toneID [0] Integer4,
duration [1] Integer4 OPTIONAL
duration3 [1] Integer4 OPTIONAL
}
-- TPDataCodingScheme notes: not recursive, exported,
@ -1913,7 +1913,7 @@ ApplyChargingArg ::=
SEQUENCE
{
aChBillingChargingCharacteristics [0] AChBillingChargingCharacteristics,
partyToCharge [2] SendingSideID DEFAULT '01'H,
partyToCharge1 [2] SendingSideID DEFAULT '01'H,
extensions [3] ExtensionsArray OPTIONAL
}
@ -1943,7 +1943,7 @@ CallInformationRequestArg ::=
{
requestedInformationTypeList [0] RequestedInformationTypeList,
extensions [2] ExtensionsArray OPTIONAL,
legID [3] SendingSideID OPTIONAL
legID3 [3] SendingSideID OPTIONAL
}
@ -2038,7 +2038,7 @@ EventReportBCSMArg ::=
{
eventTypeBCSM [0] EventTypeBCSM,
eventSpecificInformationBCSM [2] EventSpecificInformationBCSM OPTIONAL,
legID [3] ReceivingSideID OPTIONAL,
legID4 [3] ReceivingSideID OPTIONAL,
miscCallInfo [4] MiscCallInfo OPTIONAL,
extensions [5] ExtensionsArray OPTIONAL
}
@ -2065,7 +2065,7 @@ SendChargingInformationArg ::=
SEQUENCE
{
sCIBillingChargingCharacteristics [0] SCIBillingChargingCharacteristics,
partyToCharge [1] SendingSideID,
partyToCharge2 [1] SendingSideID,
extensions [2] ExtensionsArray OPTIONAL
}
@ -2154,7 +2154,7 @@ CallInformationReportArg ::=
{
requestedInformationList [0] RequestedInformationList,
extensions [2] ExtensionsArray OPTIONAL,
legID [3] ReceivingSideID OPTIONAL
legID5 [3] ReceivingSideID OPTIONAL
}
@ -2278,7 +2278,7 @@ InitialDPSMSArg ::=
{
serviceKey [0] ServiceKey,
destinationSubscriberNumber [1] CalledPartyBCDNumber OPTIONAL,
callingPartyNumber [2] ISDN-AddressString OPTIONAL,
callingPartyNumberas [2] ISDN-AddressString OPTIONAL,
eventTypeSMS [3] EventTypeSMS OPTIONAL,
iMSI [4] Imsi OPTIONAL,
locationInformationMSC [5] LocationInformation OPTIONAL,

14
asn1/camel/packet-camel-template.c
View File

@ -60,6 +60,7 @@ int date_format = 1; /*assume european date format */
static int hf_digit = -1;
static int hf_camel_invokeCmd = -1; /* Opcode */
static int hf_camel_invokeid = -1; /* INTEGER */
static int hf_camel_linkedID = -1; /* INTEGER */
static int hf_camel_absent = -1; /* NULL */
static int hf_camel_invokeId = -1; /* InvokeId */
static int hf_camel_invoke = -1; /* InvokePDU */
@ -280,7 +281,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
offset=dissect_camel_ApplyChargingArg(FALSE, tvb, offset, pinfo, tree, -1);
break;
case 36: /*ApplyChargingReport*/
offset=dissect_camel_ApplyChargingReportArg(FALSE, tvb, offset, pinfo, tree, -1);
offset=dissect_camel_ApplyChargingReportArg(TRUE, tvb, offset, pinfo, tree, -1);
break;
case 41: /*CallGap*/
offset=dissect_camel_CallGapArg(FALSE, tvb, offset, pinfo, tree, -1);
@ -433,9 +434,13 @@ dissect_camel_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_camel_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_camel_invokeId);
}
static int dissect_linkedID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_camel_linkedID, NULL);
}
static const ber_sequence_t InvokePDU_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
{ BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData },
{ 0, 0, 0, NULL }
@ -601,6 +606,11 @@ void proto_register_camel(void) {
{ "invokeid", "camel.invokeid",
FT_INT32, BASE_DEC, NULL, 0,
"InvokeId/invokeid", HFILL }},
{ &hf_camel_linkedID,
{ "linkedid", "camel.linkedid",
FT_INT32, BASE_DEC, NULL, 0,
"LinkedId/linkedid", HFILL }},
{ &hf_camel_absent,
{ "absent", "camel.absent",
FT_NONE, BASE_NONE, NULL, 0,

11
asn1/inap/packet-inap-template.c
View File

@ -49,6 +49,7 @@
int proto_inap = -1;
static int hf_inap_invokeCmd = -1; /* Opcode */
static int hf_inap_invokeid = -1; /* INTEGER */
static int hf_inap_linkedid = -1; /* INTEGER */
static int hf_inap_absent = -1; /* NULL */
static int hf_inap_invokeId = -1; /* InvokeId */
static int hf_inap_invoke = -1; /* InvokePDU */
@ -276,9 +277,14 @@ dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_inap_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_inap_invokeId);
}
static int dissect_linkedID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_inap_linkedid, NULL);
}
static const ber_sequence_t InvokePDU_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
{ BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData },
{ 0, 0, 0, NULL }
@ -451,6 +457,11 @@ void proto_register_inap(void) {
{ "invokeid", "inap.invokeid",
FT_INT32, BASE_DEC, NULL, 0,
"InvokeId/invokeid", HFILL }},
{ &hf_inap_linkedid,
{ "linkedid", "inap.linkedid",
FT_INT32, BASE_DEC, NULL, 0,
"LinkedId/linkedid", HFILL }},
{ &hf_inap_absent,
{ "absent", "inap.absent",
FT_NONE, BASE_NONE, NULL, 0,

496
epan/dissectors/packet-camel.c
View File

File diff suppressed because it is too large Load Diff

2
epan/dissectors/packet-camel.h
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-camel.h */
/* .\packet-camel.h */
/* ../../tools/asn2eth.py -X -b -e -p camel -c camel.cnf -s packet-camel-template camel.asn */
/* Input file: packet-camel-template.h */

13
epan/dissectors/packet-inap.c
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-inap.c */
/* .\packet-inap.c */
/* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
/* Input file: packet-inap-template.c */
@ -56,6 +56,7 @@
int proto_inap = -1;
static int hf_inap_invokeCmd = -1; /* Opcode */
static int hf_inap_invokeid = -1; /* INTEGER */
static int hf_inap_linkedid = -1; /* INTEGER */
static int hf_inap_absent = -1; /* NULL */
static int hf_inap_invokeId = -1; /* InvokeId */
static int hf_inap_invoke = -1; /* InvokePDU */
@ -4530,9 +4531,14 @@ dissect_inap_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
static int dissect_invokeId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_inap_InvokeId(FALSE, tvb, offset, pinfo, tree, hf_inap_invokeId);
}
static int dissect_linkedID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
return dissect_ber_integer(TRUE, pinfo, tree, tvb, offset, hf_inap_linkedid, NULL);
}
static const ber_sequence_t InvokePDU_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeId },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_linkedID_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_invokeCmd },
{ BER_CLASS_UNI, -1/*depends on Cmd*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_invokeData },
{ 0, 0, 0, NULL }
@ -4705,6 +4711,11 @@ void proto_register_inap(void) {
{ "invokeid", "inap.invokeid",
FT_INT32, BASE_DEC, NULL, 0,
"InvokeId/invokeid", HFILL }},
{ &hf_inap_linkedid,
{ "linkedid", "inap.linkedid",
FT_INT32, BASE_DEC, NULL, 0,
"LinkedId/linkedid", HFILL }},
{ &hf_inap_absent,
{ "absent", "inap.absent",
FT_NONE, BASE_NONE, NULL, 0,

2
epan/dissectors/packet-inap.h
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-inap.h */
/* .\packet-inap.h */
/* ../../tools/asn2eth.py -X -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */
/* Input file: packet-inap-template.h */