diff options
author | Guy Harris <guy@alum.mit.edu> | 2003-10-27 22:28:48 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2003-10-27 22:28:48 +0000 |
commit | 459f7323ca23d8fd9b0a9a1960d679d76702d1a5 (patch) | |
tree | 3d065735d396fac83bd5d126a766ab6a5a50c529 /packet-h225.c | |
parent | 99331c2fa856e65acbf9d438a8bcef777df532fa (diff) |
From Lars Roland: whitespace cleanups.
svn path=/trunk/; revision=8789
Diffstat (limited to 'packet-h225.c')
-rw-r--r-- | packet-h225.c | 440 |
1 files changed, 220 insertions, 220 deletions
diff --git a/packet-h225.c b/packet-h225.c index dd6b64e360..e447f43295 100644 --- a/packet-h225.c +++ b/packet-h225.c @@ -4,7 +4,7 @@ * * Maintained by Andreas Sikkema (andreas.sikkema@philips.com) * - * $Id: packet-h225.c,v 1.20 2003/10/24 10:46:42 sahlberg Exp $ + * $Id: packet-h225.c,v 1.21 2003/10/27 22:28:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1135,15 +1135,15 @@ static const value_string conferenceGoal_vals[] = { { 0, NULL} }; static per_choice_t conferenceGoal_choice[] = { - { 0, "create", ASN1_EXTENSION_ROOT, + { 0, "create", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 1, "join", ASN1_EXTENSION_ROOT, + { 1, "join", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 2, "invite", ASN1_EXTENSION_ROOT, + { 2, "invite", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 3, "capability-negotiation", ASN1_NOT_EXTENSION_ROOT, + { 3, "capability-negotiation", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 4, "callIndependentSupplementaryService", ASN1_NOT_EXTENSION_ROOT, + { 4, "callIndependentSupplementaryService", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, { 0, NULL, 0, NULL } }; @@ -1844,8 +1844,8 @@ dissect_h225_SCRresult(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree static int dissect_h225_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_object_identifier(tvb, offset, pinfo, tree, - hf_h225_object, + offset = dissect_per_object_identifier(tvb, offset, pinfo, tree, + hf_h225_object, object); return offset; } @@ -1853,7 +1853,7 @@ dissect_h225_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t static int dissect_h225_t35CountryCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, + offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_h225_t35CountryCode, 0, 255, &t35CountryCode, NULL, FALSE); return offset; @@ -1863,7 +1863,7 @@ dissect_h225_t35CountryCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int dissect_h225_t35Extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, + offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_h225_t35Extension, 0, 255, &t35Extension, NULL, FALSE); return offset; @@ -1872,7 +1872,7 @@ dissect_h225_t35Extension(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t static int dissect_h225_manufacturerCode(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, + offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_h225_manufacturerCode, 0, 65535, &manufacturerCode, NULL, FALSE); return offset; @@ -1881,7 +1881,7 @@ dissect_h225_manufacturerCode(tvbuff_t *tvb, int offset, packet_info *pinfo, pro static per_sequence_t H221NonStandard_sequence[] = { { "t35CountryCode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_t35CountryCode }, - { "t35Extension", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, + { "t35Extension", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_t35Extension }, { "manufacturerCode", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_manufacturerCode }, @@ -1894,8 +1894,8 @@ dissect_h225_h221NonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo, prot t35Extension = 0; manufacturerCode = 0; - offset = dissect_per_sequence(tvb, offset, pinfo, tree, - hf_h225_h221NonStandard, + offset = dissect_per_sequence(tvb, offset, pinfo, tree, + hf_h225_h221NonStandard, ett_h225_H221NonStandard, H221NonStandard_sequence); h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; @@ -1911,7 +1911,7 @@ static const value_string NonStandardIdentifier_vals[] = { static per_choice_t NonStandardIdentifier_choice[] = { { 0, "object", ASN1_EXTENSION_ROOT, dissect_h225_object }, - { 1, "h221NonStandard", ASN1_EXTENSION_ROOT, + { 1, "h221NonStandard", ASN1_EXTENSION_ROOT, dissect_h225_h221NonStandard }, { 0, NULL, 0, NULL } }; @@ -1923,9 +1923,9 @@ dissect_h225_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo *object = '\0'; h221NonStandard = 0; - offset = dissect_per_choice(tvb, offset, pinfo, tree, - hf_h225_nonStandardIdentifier, - ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", + offset = dissect_per_choice(tvb, offset, pinfo, tree, + hf_h225_nonStandardIdentifier, + ett_h225_NonStandardIdentifier, NonStandardIdentifier_choice, "NonStandardIdentifier", &value); switch (value) { @@ -1948,8 +1948,8 @@ dissect_h225_nsp_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree guint32 value_offset, value_len; tvbuff_t *next_tvb; - offset = dissect_per_octet_string(tvb, offset, pinfo, tree, - hf_h225_nsp_data, -1, -1, + offset = dissect_per_octet_string(tvb, offset, pinfo, tree, + hf_h225_nsp_data, -1, -1, &value_offset, &value_len); if (value_len > 0) { @@ -1973,8 +1973,8 @@ dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo, { nsp_handle = NULL; - offset = dissect_per_sequence(tvb, offset, pinfo, tree, - hf_index, + offset = dissect_per_sequence(tvb, offset, pinfo, tree, + hf_index, ett_h225_NonStandardParameter, NonStandardParameter_sequence); return offset; @@ -1984,7 +1984,7 @@ dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_h225_nonStandardData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardData); return offset; } @@ -1994,7 +1994,7 @@ static per_sequence_t GatekeeperInfo_sequence[] = { dissect_h225_nonStandardData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GatekeeperInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GatekeeperInfo, ett_h225_GatekeeperInfo, GatekeeperInfo_sequence); @@ -2004,7 +2004,7 @@ dissect_h225_GatekeeperInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int dissect_h225_nonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandard); return offset; } @@ -2056,13 +2056,13 @@ static per_sequence_t SecurityCapabilities_sequence[] = { dissect_h225_SecurityServiceMode_integrity }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_SecurityCapabilities_tls(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_SecurityCapabilities_tls, ett_h225_SecurityCapabilities_tls, SecurityCapabilities_sequence); return offset; } -static int +static int dissect_h225_SecurityCapabilities_ipsec(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_SecurityCapabilities_ipsec, ett_h225_SecurityCapabilities_ipsec, SecurityCapabilities_sequence); @@ -2100,7 +2100,7 @@ dissect_h225_H245Security(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t static int dissect_h225_nonStandardUsageTypes_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardUsageTypes_item); return offset; } @@ -2108,8 +2108,8 @@ dissect_h225_nonStandardUsageTypes_item(tvbuff_t *tvb, int offset, packet_info * static int dissect_h225_nonStandardUsageTypes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, - hf_h225_nonStandardUsageTypes, + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, + hf_h225_nonStandardUsageTypes, ett_h225_T_nonStandardUsageTypes, dissect_h225_nonStandardUsageTypes_item); return offset; } @@ -2126,13 +2126,13 @@ static per_sequence_t RasUsageInfoTypes_sequence[] = { dissect_h225_NULL }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RasUsageInfoTypes(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RasUsageInfoTypes, ett_h225_RasUsageInfoTypes, RasUsageInfoTypes_sequence); return offset; } -static int +static int dissect_h225_usageReportingCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_usageReportingCapability, ett_h225_RasUsageInfoTypes, RasUsageInfoTypes_sequence); @@ -2195,21 +2195,21 @@ dissect_h225_channelMultiplier(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static per_sequence_t DataRate_sequence[] = { - { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, + { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, dissect_h225_nonStandardData }, - { "channelRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, + { "channelRate", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_channelRate }, - { "channelMultiplier", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, + { "channelMultiplier", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, dissect_h225_channelMultiplier }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_DataRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_DataRate, ett_h225_DataRate, DataRate_sequence); return offset; } -static int +static int dissect_h225_gatewayDataRate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_gatewayDataRate, ett_h225_DataRate, DataRate_sequence); @@ -2226,11 +2226,11 @@ dissect_h225_dataRatesSupported(tvbuff_t *tvb, int offset, packet_info *pinfo, p static per_sequence_t TerminalInfo_sequence[] = { - { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, + { "nonStandardData", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, dissect_h225_nonStandardData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_TerminalInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_TerminalInfo, ett_h225_TerminalInfo, TerminalInfo_sequence); @@ -2247,15 +2247,15 @@ dissect_h225_h248Message(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static per_sequence_t StimulusControl_sequence[] = { - { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, + { "nonStandard", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, dissect_h225_nonStandard }, - { "isText", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, + { "isText", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, dissect_h225_NULL }, - { "h248Message", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, + { "h248Message", ASN1_EXTENSION_ROOT, ASN1_OPTIONAL, dissect_h225_h248Message}, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_StimulusControl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_StimulusControl, ett_h225_StimulusControl, StimulusControl_sequence); @@ -2285,7 +2285,7 @@ dissect_h225_replaceWithConferenceInvite(tvbuff_t *tvb, int offset, packet_info static int dissect_h225_nonStandardReason(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardReason); return offset; } @@ -2320,57 +2320,57 @@ static const value_string ReleaseCompleteReason_vals[] = { { 0, NULL} }; static per_choice_t ReleaseCompleteReason_choice[] = { - { 0, "noBandwidth", ASN1_EXTENSION_ROOT, + { 0, "noBandwidth", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 1, "gatekeeperResources", ASN1_EXTENSION_ROOT, + { 1, "gatekeeperResources", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 2, "unreachableDestination", ASN1_EXTENSION_ROOT, + { 2, "unreachableDestination", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 3, "destinationRejection", ASN1_EXTENSION_ROOT, + { 3, "destinationRejection", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 4, "invalidRevision", ASN1_EXTENSION_ROOT, + { 4, "invalidRevision", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 5, "noPermission", ASN1_EXTENSION_ROOT, + { 5, "noPermission", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 6, "unreachableGatekeeper", ASN1_EXTENSION_ROOT, + { 6, "unreachableGatekeeper", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 7, "gatewayResources", ASN1_EXTENSION_ROOT, + { 7, "gatewayResources", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 8, "badFormatAddress", ASN1_EXTENSION_ROOT, + { 8, "badFormatAddress", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 9, "adaptiveBusy", ASN1_EXTENSION_ROOT, + { 9, "adaptiveBusy", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 10, "inConf", ASN1_EXTENSION_ROOT, + { 10, "inConf", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 11, "undefinedReason", ASN1_EXTENSION_ROOT, + { 11, "undefinedReason", ASN1_EXTENSION_ROOT, dissect_h225_NULL }, - { 12, "facilityCallDeflection", ASN1_NOT_EXTENSION_ROOT, + { 12, "facilityCallDeflection", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 13, "securityDenied", ASN1_NOT_EXTENSION_ROOT, + { 13, "securityDenied", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 14, "calledPartyNotRegistered", ASN1_NOT_EXTENSION_ROOT, + { 14, "calledPartyNotRegistered", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 15, "callerNotRegistered", ASN1_NOT_EXTENSION_ROOT, + { 15, "callerNotRegistered", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 16, "newConnectionNeeded", ASN1_NOT_EXTENSION_ROOT, + { 16, "newConnectionNeeded", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 17, "nonStandardReason", ASN1_NOT_EXTENSION_ROOT, + { 17, "nonStandardReason", ASN1_NOT_EXTENSION_ROOT, dissect_h225_nonStandardReason }, - { 18, "replaceWithConferenceInvite", ASN1_NOT_EXTENSION_ROOT, + { 18, "replaceWithConferenceInvite", ASN1_NOT_EXTENSION_ROOT, dissect_h225_replaceWithConferenceInvite }, - { 19, "genericDataReason", ASN1_NOT_EXTENSION_ROOT, + { 19, "genericDataReason", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 20, "neededFeatureNotSupported", ASN1_NOT_EXTENSION_ROOT, + { 20, "neededFeatureNotSupported", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 21, "tunnelledSignallingRejected", ASN1_NOT_EXTENSION_ROOT, + { 21, "tunnelledSignallingRejected", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 22, "invalidCID", ASN1_NOT_EXTENSION_ROOT, + { 22, "invalidCID", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 23, "invalidCID", ASN1_NOT_EXTENSION_ROOT, + { 23, "invalidCID", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, - { 24, "securityError", ASN1_NOT_EXTENSION_ROOT, + { 24, "securityError", ASN1_NOT_EXTENSION_ROOT, dissect_h225_SecurityErrors }, - { 25, "hopCountExceeded", ASN1_NOT_EXTENSION_ROOT, + { 25, "hopCountExceeded", ASN1_NOT_EXTENSION_ROOT, dissect_h225_NULL }, { 0, NULL, 0, NULL } }; @@ -2395,13 +2395,13 @@ dissect_h225_numberOfScnConnections(tvbuff_t *tvb, int offset, packet_info *pinf static per_sequence_t connectionParameters_sequence[] = { { "connectionType", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_ScnConnectionType }, - { "numberOfScnConnections", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, + { "numberOfScnConnections", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_numberOfScnConnections }, { "connectionAggregation", ASN1_EXTENSION_ROOT, ASN1_NOT_OPTIONAL, dissect_h225_ScnConnectionAggregation }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_connectionParameters(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_connectionParameters, ett_h225_connectionParameters, connectionParameters_sequence); @@ -2429,7 +2429,7 @@ static per_sequence_t RasUsageSpecification_when_sequence[] = { dissect_h225_NULL }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RasUsageSpecification_when(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RasUsageSpecification_when, ett_h225_RasUsageSpecification_when, RasUsageSpecification_when_sequence); @@ -2445,7 +2445,7 @@ static per_sequence_t RasUsageSpecification_callStartingPoint_sequence[] = { dissect_h225_NULL }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RasUsageSpecification_callStartingPoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RasUsageSpecification_callStartingPoint, ett_h225_RasUsageSpecification_callStartingPoint, RasUsageSpecification_callStartingPoint_sequence); @@ -2464,7 +2464,7 @@ static per_sequence_t RasUsageSpecification_sequence[] = { dissect_h225_RasUsageInfoTypes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RasUsageSpecification(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RasUsageSpecification, ett_h225_RasUsageSpecification, RasUsageSpecification_sequence); @@ -2501,13 +2501,13 @@ dissect_h225_ipAddress_port(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static per_sequence_t ipAddress_sequence[] = { - { "ip", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, + { "ip", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_h225_ipAddress_ip }, - { "port", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, + { "port", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_h225_ipAddress_port }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ipAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ipAddress, ett_h225_ipAddress, ipAddress_sequence); @@ -2556,7 +2556,7 @@ static per_sequence_t ipSourceRoute_sequence[] = { dissect_h225_routing }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ipSourceRoute(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ipSourceRoute, ett_h225_ipSourceRoute, ipSourceRoute_sequence); @@ -2595,11 +2595,11 @@ static per_sequence_t ipxAddress_sequence[] = { dissect_h225_ipxNode }, { "netnum", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_h225_ipxNetnum }, - { "port", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, + { "port", ASN1_NO_EXTENSIONS, ASN1_NOT_OPTIONAL, dissect_h225_ipxPort }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ipxAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ipxAddress, ett_h225_ipxAddress, ipxAddress_sequence); @@ -2632,7 +2632,7 @@ static per_sequence_t ip6Address_sequence[] = { dissect_h225_ipv6Address_port }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ip6Address(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ip6Address, ett_h225_ip6Address, ip6Address_sequence); @@ -2662,7 +2662,7 @@ dissect_h225_nsap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre static int dissect_h225_nonStandardAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardAddress); return offset; } @@ -2790,25 +2790,25 @@ static per_sequence_t TransportChannelInfo_sequence[] = { dissect_h225_recvAddress }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_rtpAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_rtpAddress, ett_h225_TransportChannelInfo, TransportChannelInfo_sequence); return offset; } -static int +static int dissect_h225_rtcpAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_rtcpAddress, ett_h225_TransportChannelInfo, TransportChannelInfo_sequence); return offset; } -static int +static int dissect_h225_h245(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_h245, ett_h225_TransportChannelInfo, TransportChannelInfo_sequence); return offset; } -static int +static int dissect_h225_callSignaling(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_callSignaling, ett_h225_TransportChannelInfo, TransportChannelInfo_sequence); @@ -2838,7 +2838,7 @@ static per_sequence_t CarrierInfo_sequence[] = { dissect_h225_carrierName }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CarrierInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CarrierInfo, ett_h225_CarrierInfo, CarrierInfo_sequence); @@ -2895,7 +2895,7 @@ static per_sequence_t CallIdentifier_sequence[] = { dissect_h225_guid }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallIdentifier, ett_h225_CallIdentifier, CallIdentifier_sequence); @@ -2926,7 +2926,7 @@ static per_sequence_t CallLinkage_sequence[] = { dissect_h225_threadId }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallLinkage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallLinkage, ett_h225_CallLinkage, CallLinkage_sequence); @@ -2935,7 +2935,7 @@ dissect_h225_CallLinkage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr -static int +static int dissect_h225_ClearToken(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { NOT_DECODED_YET("ClearToken"); @@ -2986,7 +2986,7 @@ static per_sequence_t AlternateGK_sequence[] = { dissect_h225_priority }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AlternateGK(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AlternateGK, ett_h225_AlternateGK, AlternateGK_sequence); @@ -3014,7 +3014,7 @@ static per_sequence_t AltGKInfo_sequence[] = { dissect_h225_altGKisPermanent }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AltGKInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AltGKInfo, ett_h225_AltGKInfo, AltGKInfo_sequence); @@ -3041,7 +3041,7 @@ static per_sequence_t AlternateTransportAddress_sequence[] = { dissect_h225_sctp }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AlternateTransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AlternateTransportAddress, ett_h225_AlternateTransportAddress, AlternateTransportAddress_sequence); @@ -3157,7 +3157,7 @@ static per_sequence_t UUIEsRequested_sequence[] = { dissect_h225_notify_bool }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_UUIEsRequested(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_UUIEsRequested, ett_h225_UUIEsRequested, UUIEsRequested_sequence); @@ -3188,7 +3188,7 @@ static per_sequence_t Q954Details_sequence[] = { dissect_h225_threePartyService }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_Q954Info(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_Q954Details, ett_h225_Q954Details, Q954Details_sequence); @@ -3265,7 +3265,7 @@ static per_sequence_t QseriesOptions_sequence[] = { dissect_h225_Q954Info }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_callServices(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_QseriesOptions, ett_h225_QseriesOptions, QseriesOptions_sequence); @@ -3324,14 +3324,14 @@ static per_sequence_t RTPSession_sequence[] = { dissect_h225_BandWidth }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RTPSession(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RTPSession, ett_h225_RTPSession, RTPSession_sequence); return offset; } -static int +static int dissect_h225_CryptoH323Token(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { NOT_DECODED_YET("CryptoH323Token"); @@ -3365,7 +3365,7 @@ static per_sequence_t StatusUUIE_sequence[] = { dissect_h225_cryptoTokens }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_StatusUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_StatusUUIE, ett_h225_StatusUUIE, StatusUUIE_sequence); @@ -3382,7 +3382,7 @@ static per_sequence_t StatusInquiryUUIE_sequence[] = { dissect_h225_cryptoTokens }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_StatusInquiryUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_StatusInquiryUUIE, ett_h225_StatusInquiryUUIE, StatusInquiryUUIE_sequence); @@ -3399,7 +3399,7 @@ static per_sequence_t SetupAcknowledgeUUIE_sequence[] = { dissect_h225_cryptoTokens }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_SetupAcknowledgeUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_SetupAcknowledgeUUIE, ett_h225_SetupAcknowledgeUUIE, SetupAcknowledgeUUIE_sequence); @@ -3416,7 +3416,7 @@ static per_sequence_t NotifyUUIE_sequence[] = { dissect_h225_cryptoTokens }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_NotifyUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_NotifyUUIE, ett_h225_NotifyUUIE, NotifyUUIE_sequence); @@ -3488,7 +3488,7 @@ static per_sequence_t GSMUIM_sequence[] = { dissect_h225_vplmn }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GSMUIM(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GSMUIM, ett_h225_GSMUIM, GSMUIM_sequence); @@ -3627,7 +3627,7 @@ static per_sequence_t ANSI41UIM_sequence[] = { dissect_h225_soc }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ANSI41UIM(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ANSI41UIM, ett_h225_ANSI41UIM, ANSI41UIM_sequence); @@ -3702,7 +3702,7 @@ static per_sequence_t e164Number_sequence[] = { dissect_h225_publicNumberDigits }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_e164Number(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_e164Number, ett_h225_e164Number, e164Number_sequence); @@ -3715,7 +3715,7 @@ static per_sequence_t privateNumber_sequence[] = { dissect_h225_privateNumberDigits }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_privateNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_privateNumber, ett_h225_privateNumber, privateNumber_sequence); @@ -3782,7 +3782,7 @@ static per_sequence_t TunnelledProtocolAlternateIdentifier_sequence[] = { dissect_h225_protocolVariant }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_TunnelledProtocolAlternateIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_TunnelledProtocolAlternateIdentifier, ett_h225_TunnelledProtocolAlternateIdentifier, TunnelledProtocolAlternateIdentifier_sequence); @@ -3891,7 +3891,7 @@ static per_sequence_t SupportedPrefix_sequence[] = { dissect_h225_prefix }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_SupportedPrefix(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_SupportedPrefix, ett_h225_SupportedPrefix, SupportedPrefix_sequence); @@ -3915,7 +3915,7 @@ static per_sequence_t H310Caps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H310Caps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H310Caps, ett_h225_H310Caps, H310Caps_sequence); @@ -3932,7 +3932,7 @@ static per_sequence_t H320Caps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H320Caps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H320Caps, ett_h225_H320Caps, H320Caps_sequence); @@ -3949,7 +3949,7 @@ static per_sequence_t H321Caps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H321Caps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H321Caps, ett_h225_H321Caps, H321Caps_sequence); @@ -3966,7 +3966,7 @@ static per_sequence_t H322Caps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H322Caps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H322Caps, ett_h225_H322Caps, H322Caps_sequence); @@ -3983,7 +3983,7 @@ static per_sequence_t H323Caps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H323Caps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H323Caps, ett_h225_H323Caps, H323Caps_sequence); @@ -4000,7 +4000,7 @@ static per_sequence_t H324Caps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H324Caps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H324Caps, ett_h225_H324Caps, H324Caps_sequence); @@ -4017,7 +4017,7 @@ static per_sequence_t VoiceCaps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_VoiceCaps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_VoiceCaps, ett_h225_VoiceCaps, VoiceCaps_sequence); @@ -4034,7 +4034,7 @@ static per_sequence_t T120OnlyCaps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_T120OnlyCaps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_T120OnlyCaps, ett_h225_T120OnlyCaps, T120OnlyCaps_sequence); @@ -4050,7 +4050,7 @@ static per_sequence_t NonStandardProtocol_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_NonStandardProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_NonStandardProtocol, ett_h225_NonStandardProtocol, NonStandardProtocol_sequence); @@ -4067,7 +4067,7 @@ static per_sequence_t SIPCaps_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_SIPCaps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_SIPCaps, ett_h225_SIPCaps, SIPCaps_sequence); @@ -4081,7 +4081,7 @@ static per_sequence_t AddressPattern_range_sequence[] = { dissect_h225_endOfRange }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AddressPattern_range(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AddressPattern_range, ett_h225_AddressPattern_range, AddressPattern_range_sequence); @@ -4116,7 +4116,7 @@ static per_sequence_t ConferenceList_sequence[] = { dissect_h225_nonStandardData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ConferenceList(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ConferenceList, ett_h225_ConferenceList, ConferenceList_sequence); @@ -4142,7 +4142,7 @@ static per_sequence_t T38FaxAnnexbOnlyCaps_sequence[] = { dissect_h245_T38FaxProfile }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_T38FaxAnnexbOnlyCaps(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_T38FaxAnnexbOnlyCaps, ett_h225_T38FaxAnnexbOnlyCaps, T38FaxAnnexbOnlyCaps_sequence); @@ -4215,7 +4215,7 @@ static per_sequence_t GatewayInfo_sequence[] = { dissect_h225_nonStandardData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_gateway(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GatewayInfo, ett_h225_GatewayInfo, GatewayInfo_sequence); @@ -4228,7 +4228,7 @@ static per_sequence_t McuInfo_sequence[] = { dissect_h225_protocol }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_mcu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_McuInfo, ett_h225_McuInfo, McuInfo_sequence); @@ -4256,7 +4256,7 @@ static per_choice_t TunnelledProtocol_id_choice[] = { dissect_h225_TunnelledProtocolAlternateIdentifier }, { 0, NULL, 0, NULL } }; -static int +static int dissect_h225_TunnelledProtocol_id(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h225_TunnelledProtocol_id, ett_h225_TunnelledProtocol_id, TunnelledProtocol_id_choice, "id", NULL); @@ -4276,13 +4276,13 @@ static per_sequence_t TunnelledProtocol_sequence[] = { dissect_h225_TunnelledProtocol_subIdentifier }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_TunnelledProtocol, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); return offset; } -static int +static int dissect_h225_desiredTunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_desiredTunnelledProtocol, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); @@ -4318,7 +4318,7 @@ static per_sequence_t CicInfo_sequence[] = { dissect_h225_CicInfo_pointCode }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CicInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CicInfo, ett_h225_CicInfo, CicInfo_sequence); @@ -4355,7 +4355,7 @@ static per_sequence_t GroupID_sequence[] = { dissect_h225_GroupID_group }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GroupID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GroupID, ett_h225_GroupID, GroupID_sequence); @@ -4371,13 +4371,13 @@ static per_sequence_t CircuitIdentifier_sequence[] = { dissect_h225_CarrierInfo }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_sourceCircuitID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_sourceCircuitID, ett_h225_CircuitIdentifier, CircuitIdentifier_sequence); return offset; } -static int +static int dissect_h225_destinationCircuitID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_destinationCircuitID, ett_h225_CircuitIdentifier, CircuitIdentifier_sequence); @@ -4441,7 +4441,7 @@ static per_sequence_t EnumeratedParameter_sequence[] = { dissect_h225_Content }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_EnumeratedParameter(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_EnumeratedParameter, ett_h225_EnumeratedParameter, EnumeratedParameter_sequence); @@ -4463,7 +4463,7 @@ static per_sequence_t GenericData_sequence[] = { dissect_h225_parameters }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GenericData, ett_h225_GenericData, GenericData_sequence); @@ -4475,7 +4475,7 @@ dissect_h225_genericData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr offset=dissect_per_sequence_of(tvb, offset, pinfo, tree, hf_h225_genericData, ett_h225_genericData, dissect_h225_GenericData); return offset; } -static int +static int dissect_h225_FeatureDescriptor(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_FeatureDescriptor, ett_h225_GenericData, GenericData_sequence); @@ -4652,7 +4652,7 @@ static per_sequence_t FeatureSet_sequence[] = { dissect_h225_supportedFeatures }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_FeatureSet(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_FeatureSet, ett_h225_FeatureSet, FeatureSet_sequence); @@ -4685,7 +4685,7 @@ static per_sequence_t CallsAvailable_sequence[] = { dissect_h225_CarrierInfo }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallsAvailable(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallsAvailable, ett_h225_CallsAvailable, CallsAvailable_sequence); @@ -4802,13 +4802,13 @@ static per_sequence_t CallCapacityInfo_sequence[] = { dissect_h225_sipGwCallsAvailable }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_maximumCallCapacity(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_maximumCallCapacity, ett_h225_CallCapacityInfo, CallCapacityInfo_sequence); return offset; } -static int +static int dissect_h225_currentCallCapacity(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_currentCallCapacity, ett_h225_CallCapacityInfo, CallCapacityInfo_sequence); @@ -4822,7 +4822,7 @@ static per_sequence_t CallCapacity_sequence[] = { dissect_h225_currentCallCapacity }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallCapacity(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallCapacity, ett_h225_CallCapacity, CallCapacity_sequence); @@ -4861,7 +4861,7 @@ static per_sequence_t VendorIdentifier_sequence[] = { dissect_h225_enterpriseNumber }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_VendorIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_VendorIdentifier, ett_h225_VendorIdentifier, VendorIdentifier_sequence); @@ -4881,7 +4881,7 @@ static per_sequence_t CapacityReportingCapability_sequence[] = { dissect_h225_canReportCallCapacity }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CapacityReportingCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CapacityReportingCapability, ett_h225_CapacityReportingCapability, CapacityReportingCapability_sequence); @@ -4909,7 +4909,7 @@ static per_sequence_t CallCreditCapability_sequence[] = { dissect_h225_canEnforceDurationLimit }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallCreditCapability(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallCreditCapability, ett_h225_CallCreditCapability, CallCreditCapability_sequence); @@ -4941,7 +4941,7 @@ static per_sequence_t BandwidthDetails_sequence[] = { dissect_h225_rtcpAddress }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_BandwidthDetails(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_BandwidthDetails, ett_h225_BandwidthDetails, BandwidthDetails_sequence); @@ -4983,7 +4983,7 @@ static per_sequence_t CircuitInfo_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CircuitInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CircuitInfo, ett_h225_CircuitInfo, CircuitInfo_sequence); @@ -4994,7 +4994,7 @@ static int dissect_h225_fastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 length; - + offset=dissect_per_length_determinant(tvb, offset, pinfo, tree, hf_h225_fastStart_item_length, &length); offset=dissect_h245_OpenLogicalChannel(tvb, offset, pinfo, tree); @@ -5034,7 +5034,7 @@ static per_sequence_t InformationUUIE_sequence[] = { dissect_h225_CircuitInfo }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_InformationUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_InformationUUIE, ett_h225_InformationUUIE, InformationUUIE_sequence); @@ -5331,31 +5331,31 @@ static per_sequence_t EndPointType_sequence[] = { dissect_h225_TunnelledProtocol }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_EndPointType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_EndPointType, ett_h225_EndPointType, EndPointType_sequence); return offset; } -static int +static int dissect_h225_destinationType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_destinationType, ett_h225_EndPointType, EndPointType_sequence); return offset; } -static int +static int dissect_h225_terminalType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_terminalType, ett_h225_EndPointType, EndPointType_sequence); return offset; } -static int +static int dissect_h225_sourceInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_sourceInfo, ett_h225_EndPointType, EndPointType_sequence); return offset; } -static int +static int dissect_h225_destinationInfo(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_destinationInfo, ett_h225_EndPointType, EndPointType_sequence); @@ -5402,7 +5402,7 @@ static per_sequence_t CallProceedingUUIE_sequence[] = { dissect_h225_FeatureSet }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallProceedingUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallProceedingUUIE, ett_h225_CallProceedingUUIE, CallProceedingUUIE_sequence); @@ -5416,7 +5416,7 @@ static per_sequence_t CapacityReportingSpecification_when_sequence[] = { dissect_h225_NULL }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CapacityReportingSpecification_when(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CapacityReportingSpecification_when, ett_h225_CapacityReportingSpecification_when, CapacityReportingSpecification_when_sequence); @@ -5428,7 +5428,7 @@ static per_sequence_t CapacityReportingSpecification_sequence[] = { dissect_h225_CapacityReportingSpecification_when }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CapacityReportingSpecification(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CapacityReportingSpecification, ett_h225_CapacityReportingSpecification, CapacityReportingSpecification_sequence); @@ -5459,7 +5459,7 @@ static per_sequence_t ProgressUUIE_sequence[] = { dissect_h225_NULL }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ProgressUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ProgressUUIE, ett_h225_ProgressUUIE, ProgressUUIE_sequence); @@ -5525,7 +5525,7 @@ static per_sequence_t EndPoint_sequence[] = { dissect_h225_FeatureSet }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_EndPoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_EndPoint, ett_h225_EndPoint, EndPoint_sequence); @@ -5533,7 +5533,7 @@ dissect_h225_EndPoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } -static int +static int dissect_h225_icv(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { NOT_DECODED_YET("icv"); @@ -5554,7 +5554,7 @@ static per_sequence_t ICV_sequence[] = { dissect_h225_icv }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ICV(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ICV, ett_h225_ICV, ICV_sequence); @@ -5580,7 +5580,7 @@ static per_sequence_t BandwidthConfirm_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_BandwidthConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_BandwidthConfirm, ett_h225_BandwidthConfirm, BandwidthConfirm_sequence); @@ -5603,7 +5603,7 @@ static per_sequence_t UnregistrationConfirm_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_UnregistrationConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_UnregistrationConfirm, ett_h225_UnregistrationConfirm, UnregistrationConfirm_sequence); @@ -5626,7 +5626,7 @@ static per_sequence_t NonStandardMessage_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_NonStandardMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_NonStandardMessage, ett_h225_NonStandardMessage, NonStandardMessage_sequence); @@ -5647,7 +5647,7 @@ static per_sequence_t InfoRequestAck_sequence[] = { dissect_h225_ICV }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_InfoRequestAck(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_InfoRequestAck, ett_h225_InfoRequestAck, InfoRequestAck_sequence); @@ -5670,7 +5670,7 @@ static per_sequence_t InfoRequestNak_sequence[] = { dissect_h225_ICV }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_InfoRequestNak(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_InfoRequestNak, ett_h225_InfoRequestNak, InfoRequestNak_sequence); @@ -5694,7 +5694,7 @@ static per_sequence_t ResourcesAvailableConfirm_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ResourcesAvailableConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ResourcesAvailableConfirm, ett_h225_ResourcesAvailableConfirm, ResourcesAvailableConfirm_sequence); @@ -5775,7 +5775,7 @@ static per_sequence_t GatekeeperRequest_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GatekeeperRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GatekeeperRequest, ett_h225_GatekeeperRequest, GatekeeperRequest_sequence); @@ -5801,7 +5801,7 @@ static per_sequence_t ServiceControlResponse_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ServiceControlResponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ServiceControlResponse, ett_h225_ServiceControlResponse, ServiceControlResponse_sequence); @@ -5829,7 +5829,7 @@ static per_sequence_t DisengageReject_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_DisengageReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_DisengageReject, ett_h225_DisengageReject, DisengageReject_sequence); @@ -5859,7 +5859,7 @@ static per_sequence_t BandwidthReject_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_BandwidthReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_BandwidthReject, ett_h225_BandwidthReject, BandwidthReject_sequence); @@ -5887,7 +5887,7 @@ static per_sequence_t UnregistrationReject_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_UnregistrationReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_UnregistrationReject, ett_h225_UnregistrationReject, UnregistrationReject_sequence); @@ -5942,7 +5942,7 @@ static per_sequence_t UnregistrationRequest_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_UnregistrationRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_UnregistrationRequest, ett_h225_UnregistrationRequest, UnregistrationRequest_sequence); @@ -5976,7 +5976,7 @@ static per_sequence_t invalidTerminalAliases_sequence[] = { dissect_h225_SupportedPrefixes }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_invalidTerminalAliases(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_invalidTerminalAliases, ett_h225_invalidTerminalAliases, invalidTerminalAliases_sequence); @@ -6096,7 +6096,7 @@ static per_sequence_t RegistrationReject_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RegistrationReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RegistrationReject, ett_h225_RegistrationReject, RegistrationReject_sequence); @@ -6129,7 +6129,7 @@ static per_sequence_t GatekeeperReject_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GatekeeperReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GatekeeperReject, ett_h225_GatekeeperReject, GatekeeperReject_sequence); @@ -6178,7 +6178,7 @@ static per_sequence_t ResourcesAvailableIndicate_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ResourcesAvailableIndicate(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ResourcesAvailableIndicate, ett_h225_ResourcesAvailableIndicate, ResourcesAvailableIndicate_sequence); @@ -6186,7 +6186,7 @@ dissect_h225_ResourcesAvailableIndicate(tvbuff_t *tvb, int offset, packet_info * } -static int +static int dissect_h225_amountString(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { NOT_DECODED_YET("amountString"); @@ -6226,7 +6226,7 @@ static per_sequence_t CallCreditServiceControl_sequence[] = { dissect_h225_CCSCcallStartingPoint }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_CallCreditServiceControl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_CallCreditServiceControl, ett_h225_CallCreditServiceControl, CallCreditServiceControl_sequence); @@ -6261,7 +6261,7 @@ static per_sequence_t ExtendedAliasAddress_sequence[] = { dissect_h225_ScreeningIndicator }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ExtendedAliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ExtendedAliasAddress, ett_h225_ExtendedAliasAddress, ExtendedAliasAddress_sequence); @@ -6291,7 +6291,7 @@ static per_sequence_t UnknownMessageResponse_sequence[] = { dissect_h225_messageNotUnderstood }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_UnknownMessageResponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_UnknownMessageResponse, ett_h225_UnknownMessageResponse, UnknownMessageResponse_sequence); @@ -6462,7 +6462,7 @@ static per_sequence_t AdmissionRequest_sequence[] = { dissect_h225_canMapSrcAlias }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AdmissionRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AdmissionRequest, ett_h225_AdmissionRequest, AdmissionRequest_sequence); @@ -6513,7 +6513,7 @@ static per_sequence_t InfoRequest_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_InfoRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_InfoRequest, ett_h225_InfoRequest, InfoRequest_sequence); @@ -6545,7 +6545,7 @@ static per_sequence_t RequestInProgress_sequence[] = { dissect_h225_delay }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RequestInProgress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RequestInProgress, ett_h225_RequestInProgress, RequestInProgress_sequence); @@ -6613,7 +6613,7 @@ static per_sequence_t ServiceControlSession_sequence[] = { dissect_h225_ServiceControlSession_reason }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ServiceControlSession(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ServiceControlSession, ett_h225_ServiceControlSession, ServiceControlSession_sequence); @@ -6675,7 +6675,7 @@ static per_sequence_t AlertingUUIE_sequence[] = { dissect_h225_FeatureSet }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AlertingUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AlertingUUIE, ett_h225_AlertingUUIE, AlertingUUIE_sequence); @@ -6715,7 +6715,7 @@ static per_sequence_t ReleaseCompleteUUIE_sequence[] = { dissect_h225_FeatureSet }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ReleaseCompleteUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ReleaseCompleteUUIE, ett_h225_ReleaseCompleteUUIE, ReleaseCompleteUUIE_sequence); @@ -6774,7 +6774,7 @@ static per_sequence_t FacilityUUIE_sequence[] = { dissect_h225_H245Security }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_FacilityUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_FacilityUUIE, ett_h225_FacilityUUIE, FacilityUUIE_sequence); @@ -6806,7 +6806,7 @@ static per_sequence_t AdmissionReject_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AdmissionReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AdmissionReject, ett_h225_AdmissionReject, AdmissionReject_sequence); @@ -7002,7 +7002,7 @@ static per_sequence_t SetupUUIE_sequence[] = { dissect_h225_hopCount }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_SetupUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { contains_faststart = FALSE; @@ -7059,7 +7059,7 @@ static per_sequence_t ConnectUUIE_sequence[] = { dissect_h225_FeatureSet }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ConnectUUIE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ConnectUUIE, ett_h225_ConnectUUIE, ConnectUUIE_sequence); @@ -7116,7 +7116,7 @@ static int dissect_h225_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { guint32 value; - + contains_faststart = FALSE; offset=dissect_per_choice(tvb, offset, pinfo, tree, hf_h225_h323_message_body, ett_h225_h323_message_body, h323_message_body_choice, "h323_message_body", &(value)); @@ -7199,7 +7199,7 @@ static per_sequence_t LocationConfirm_sequence[] = { dissect_h225_BandWidth }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_LocationConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_LocationConfirm, ett_h225_LocationConfirm, LocationConfirm_sequence); @@ -7229,7 +7229,7 @@ static per_sequence_t LocationReject_sequence[] = { dissect_h225_serviceControl }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_LocationReject(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_LocationReject, ett_h225_LocationReject, LocationReject_sequence); @@ -7253,7 +7253,7 @@ static per_sequence_t callSpecific_sequence[] = { dissect_h225_answeredCall }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_callSpecific(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_callSpecific, ett_h225_callSpecific, callSpecific_sequence); @@ -7283,26 +7283,26 @@ static per_sequence_t ServiceControlIndication_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_ServiceControlIndication(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_ServiceControlIndication, ett_h225_ServiceControlIndication, ServiceControlIndication_sequence); return offset; } -static int +static int dissect_h225_alertingTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { NOT_DECODED_YET("alertingTime"); return offset; } -static int +static int dissect_h225_connectTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { NOT_DECODED_YET("connectTime"); return offset; } -static int +static int dissect_h225_endTime(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { NOT_DECODED_YET("endTime"); @@ -7312,7 +7312,7 @@ NOT_DECODED_YET("endTime"); static int dissect_h225_nonStandardUsageFields_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardUsageFields_item); return offset; } @@ -7320,8 +7320,8 @@ dissect_h225_nonStandardUsageFields_item(tvbuff_t *tvb, int offset, packet_info static int dissect_h225_nonStandardUsageFields(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, - hf_h225_nonStandardUsageFields, + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, + hf_h225_nonStandardUsageFields, ett_h225_T_nonStandardUsageFields, dissect_h225_nonStandardUsageFields_item); return offset; } @@ -7338,7 +7338,7 @@ static per_sequence_t RasUsageInformation_sequence[] = { dissect_h225_endTime }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RasUsageInformation(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RasUsageInformation, ett_h225_RasUsageInformation, RasUsageInformation_sequence); @@ -7387,7 +7387,7 @@ static per_sequence_t GatekeeperConfirm_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_GatekeeperConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_GatekeeperConfirm, ett_h225_GatekeeperConfirm, GatekeeperConfirm_sequence); @@ -7496,7 +7496,7 @@ static per_sequence_t RegistrationRequest_sequence[] = { dissect_h225_NULL }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RegistrationRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RegistrationRequest, ett_h225_RegistrationRequest, RegistrationRequest_sequence); @@ -7525,7 +7525,7 @@ static per_sequence_t DisengageConfirm_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_DisengageConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_DisengageConfirm, ett_h225_DisengageConfirm, DisengageConfirm_sequence); @@ -7616,7 +7616,7 @@ static per_sequence_t AdmissionConfirm_sequence[] = { dissect_h225_modifiedSrcInfo }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_AdmissionConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_AdmissionConfirm, ett_h225_AdmissionConfirm, AdmissionConfirm_sequence); @@ -7665,7 +7665,7 @@ static per_sequence_t DisengageRequest_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_DisengageRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_DisengageRequest, ett_h225_DisengageRequest, DisengageRequest_sequence); @@ -7741,7 +7741,7 @@ static per_sequence_t LocationRequest_sequence[] = { dissect_h225_canMapSrcAlias }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_LocationRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_LocationRequest, ett_h225_LocationRequest, LocationRequest_sequence); @@ -7794,7 +7794,7 @@ static per_sequence_t BandwidthRequest_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_BandwidthRequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_BandwidthRequest, ett_h225_BandwidthRequest, BandwidthRequest_sequence); @@ -7861,7 +7861,7 @@ static per_sequence_t tunnelledSignallingMessage_sequence[] = { dissect_h225_nonStandardData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_tunnelledSignallingMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_tunnelledSignallingMessage, ett_h225_tunnelledSignallingMessage, tunnelledSignallingMessage_sequence); @@ -7906,7 +7906,7 @@ dissect_h225_h245Control(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr static int dissect_h225_nonStandardControl_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, + offset = dissect_h225_NonStandardParameter(tvb, offset, pinfo, tree, hf_h225_nonStandardControl_item); return offset; } @@ -7914,8 +7914,8 @@ dissect_h225_nonStandardControl_item(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_h225_nonStandardControl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { - offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, - hf_h225_nonStandardControl, + offset = dissect_per_sequence_of(tvb, offset, pinfo, tree, + hf_h225_nonStandardControl, ett_h225_T_nonStandardControl, dissect_h225_nonStandardControl_item); return offset; } @@ -7946,7 +7946,7 @@ static per_sequence_t H323_UU_PDU_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_H323_UU_PDU(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_H323_UU_PDU, ett_h225_H323_UU_PDU, H323_UU_PDU_sequence); @@ -7995,7 +7995,7 @@ static per_sequence_t preGrantedARQ_sequence[] = { dissect_h225_UseSpecifiedTransport }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_preGrantedARQ(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_preGrantedARQ, ett_h225_preGrantedARQ, preGrantedARQ_sequence); @@ -8055,7 +8055,7 @@ static per_sequence_t RegistrationConfirm_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_RegistrationConfirm(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_RegistrationConfirm, ett_h225_RegistrationConfirm, RegistrationConfirm_sequence); @@ -8077,7 +8077,7 @@ static per_sequence_t pdu_item_sequence[] = { dissect_h225_sent }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_pdu_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_pdu_item, ett_h225_pdu_item, pdu_item_sequence); @@ -8174,7 +8174,7 @@ static per_sequence_t perCallInfo_item_sequence[] = { dissect_h225_CircuitInfo }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_perCallInfo_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_perCallInfo_item, ett_h225_perCallInfo_item, perCallInfo_item_sequence); @@ -8243,7 +8243,7 @@ static per_sequence_t InfoRequestResponse_sequence[] = { dissect_h225_genericData }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_InfoRequestResponse(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_InfoRequestResponse, ett_h225_InfoRequestResponse, InfoRequestResponse_sequence); @@ -8275,7 +8275,7 @@ static per_sequence_t user_data_sequence[] = { dissect_h225_user_information }, { NULL, 0, 0, NULL } }; -static int +static int dissect_h225_user_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { offset=dissect_per_sequence(tvb, offset, pinfo, tree, hf_h225_user_data, ett_h225_user_data, user_data_sequence); @@ -10135,8 +10135,8 @@ proto_register_h225(void) &h225_reassembly); register_dissector("h225", dissect_h225_H323UserInformation, proto_h225); - nsp_object_dissector_table = register_dissector_table("h225.nsp.object", "H.245 NonStandardParameter (object)", FT_STRING, BASE_NONE); - nsp_h221_dissector_table = register_dissector_table("h225.nsp.h221", "H.245 NonStandardParameter (h221)", FT_UINT32, BASE_HEX); + nsp_object_dissector_table = register_dissector_table("h225.nsp.object", "H.245 NonStandardParameter (object)", FT_STRING, BASE_NONE); + nsp_h221_dissector_table = register_dissector_table("h225.nsp.h221", "H.245 NonStandardParameter (h221)", FT_UINT32, BASE_HEX); } void |