diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-15 06:27:53 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-15 06:27:53 +0000 |
commit | aada0116b7c65f6ea0b54c6375efd604c8be9874 (patch) | |
tree | 5ddfb373621892ab25a7e5f4ccbca8594060b811 | |
parent | 71c5821e2e34025cc16624ba6fdea5c094061a6a (diff) |
H.225, H.245, H.450 regenerated with new asn2eth
svn path=/trunk/; revision=18156
-rw-r--r-- | asn1/h225/Makefile.nmake | 2 | ||||
-rw-r--r-- | asn1/h225/h225-exp.cnf | 10 | ||||
-rw-r--r-- | asn1/h225/h225.cnf | 6 | ||||
-rw-r--r-- | asn1/h245/Makefile.nmake | 2 | ||||
-rw-r--r-- | asn1/h245/h245-exp.cnf | 9 | ||||
-rw-r--r-- | asn1/h450/Makefile.nmake | 2 | ||||
-rw-r--r-- | asn1/h450/h450.cnf | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-h225.c | 98 | ||||
-rw-r--r-- | epan/dissectors/packet-h225.h | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-h245.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-h450.c | 53 |
11 files changed, 113 insertions, 81 deletions
diff --git a/asn1/h225/Makefile.nmake b/asn1/h225/Makefile.nmake index 471a1d4bd1..29598c7498 100644 --- a/asn1/h225/Makefile.nmake +++ b/asn1/h225/Makefile.nmake @@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn $(PROTOCOL_NAME).cnf packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE @echo Error: You need Python to use asn2eth.py @exit 1 diff --git a/asn1/h225/h225-exp.cnf b/asn1/h225/h225-exp.cnf index f4b09bcc51..5210c7a6c3 100644 --- a/asn1/h225/h225-exp.cnf +++ b/asn1/h225/h225-exp.cnf @@ -1,3 +1,12 @@ +# Do not modify this file. +# It is created automatically by the ASN.1 to Ethereal dissector compiler +# .\h225-exp.cnf +# ../../tools/asn2eth.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn + +#.MODULE +H323-MESSAGES h225 +#.END + #.TYPE_ATTR PresentationIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PresentationIndicator_vals) BITMASK = 0 ScreeningIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ScreeningIndicator_vals) BITMASK = 0 @@ -5,6 +14,7 @@ NonStandardParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL AliasAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AliasAddress_vals) BITMASK = 0 PartyNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PartyNumber_vals) BITMASK = 0 CallIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +GenericData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 RasMessage TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(RasMessage_vals) BITMASK = 0 #.END diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 784dc92a03..ea8db64420 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -3,11 +3,6 @@ # Copyright 2004 Anders Broman # $Id$ -#.MODULE_IMPORT -H235-SECURITY-MESSAGES h235 -MULTIMEDIA-SYSTEM-CONTROL h245 -#.END - #.INCLUDE ../h235/h235-exp.cnf #.INCLUDE ../h245/h245-exp.cnf @@ -34,6 +29,7 @@ PartyNumber PresentationIndicator ScreeningIndicator CallIdentifier +GenericData #---------------------------------------------------------------------------------------- #.TYPE_RENAME CallCreditServiceControl/callStartingPoint CallCreditServiceControl_callStartingPoint diff --git a/asn1/h245/Makefile.nmake b/asn1/h245/Makefile.nmake index 5705fc5604..4745e7acf9 100644 --- a/asn1/h245/Makefile.nmake +++ b/asn1/h245/Makefile.nmake @@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py $(PROTOCOL_NAME).asn $(PROTOCOL_NAME).cnf packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn + $(PYTHON) ../../tools/asn2eth.py -e -p $(PROTOCOL_NAME) -c $(PROTOCOL_NAME).cnf -s packet-$(PROTOCOL_NAME)-template $(PROTOCOL_NAME).asn !ELSE @echo Error: You need Python to use asn2eth.py @exit 1 diff --git a/asn1/h245/h245-exp.cnf b/asn1/h245/h245-exp.cnf index b0a4d50473..ad2f44ad8e 100644 --- a/asn1/h245/h245-exp.cnf +++ b/asn1/h245/h245-exp.cnf @@ -1,3 +1,12 @@ +# Do not modify this file. +# It is created automatically by the ASN.1 to Ethereal dissector compiler +# .\h245-exp.cnf +# ../../tools/asn2eth.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn + +#.MODULE +MULTIMEDIA-SYSTEM-CONTROL h245 +#.END + #.TYPE_ATTR DataProtocolCapability TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(DataProtocolCapability_vals) BITMASK = 0 T38FaxProfile TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 diff --git a/asn1/h450/Makefile.nmake b/asn1/h450/Makefile.nmake index b2002c49e0..995cabbce8 100644 --- a/asn1/h450/Makefile.nmake +++ b/asn1/h450/Makefile.nmake @@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES) $(DISSECTOR_FILES): ../../tools/asn2eth.py h4501.asn packet-$(PROTOCOL_NAME)-template.c packet-$(PROTOCOL_NAME)-template.h $(PROTOCOL_NAME).cnf !IFDEF PYTHON - $(PYTHON) ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn + $(PYTHON) ../../tools/asn2eth.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn !ELSE @echo Error: You need Python to use asn2eth.py @exit 1 diff --git a/asn1/h450/h450.cnf b/asn1/h450/h450.cnf index 5bc8d2c51c..2f3ef90bdb 100644 --- a/asn1/h450/h450.cnf +++ b/asn1/h450/h450.cnf @@ -3,12 +3,12 @@ # Copyright 2004 Anders Broman # $Id$ -#.MODULE_IMPORT -H323-MESSAGES h225 +#.INCLUDE ../h225/h225-exp.cnf + +#.MODULE Remote-Operations-Apdus ros #.END -#.INCLUDE ../h225/h225-exp.cnf #---------------------------------------------------------------------------------------- #.PDU CallTransferIdentify diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 76b6278af5..b867ef1776 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* .\packet-h225.c */ -/* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ +/* ../../tools/asn2eth.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ /* Input file: packet-h225-template.c */ @@ -1205,7 +1205,7 @@ static int dissect_compound_item(tvbuff_t *tvb, int offset, packet_info *pinfo, } /* GenericData -> GenericData/parameters -> EnumeratedParameter -> Content -> Content/nested -> GenericData */ -static int dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); static int dissect_genericData_item(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) { return dissect_h225_GenericData(tvb, offset, pinfo, tree, hf_h225_genericData_item); @@ -1282,7 +1282,7 @@ static int dissect_protocolIdentifier(tvbuff_t *tvb, int offset, packet_info *pi static int dissect_h225_T_h245ipv4(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 219 "h225.cnf" +#line 215 "h225.cnf" tvbuff_t *value_tvb; ipv4_address = 0; @@ -2131,7 +2131,7 @@ static const per_sequence_t H221NonStandard_sequence[] = { static int dissect_h225_H221NonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 513 "h225.cnf" +#line 509 "h225.cnf" t35CountryCode = 0; t35Extension = 0; manufacturerCode = 0; @@ -2139,7 +2139,7 @@ dissect_h225_H221NonStandard(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_H221NonStandard, H221NonStandard_sequence); -#line 517 "h225.cnf" +#line 513 "h225.cnf" h221NonStandard = ((t35CountryCode * 256) + t35Extension) * 65536 + manufacturerCode; proto_tree_add_uint(tree, hf_h221Manufacturer, tvb, (offset>>3)-4, 4, h221NonStandard); @@ -2167,7 +2167,7 @@ static const per_choice_t NonStandardIdentifier_choice[] = { static int dissect_h225_NonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 494 "h225.cnf" +#line 490 "h225.cnf" guint32 value; nsiOID = ""; @@ -2199,7 +2199,7 @@ static int dissect_nonStandardIdentifier(tvbuff_t *tvb, int offset, packet_info static int dissect_h225_T_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 528 "h225.cnf" +#line 524 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, @@ -2225,7 +2225,7 @@ static const per_sequence_t NonStandardParameter_sequence[] = { int dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 526 "h225.cnf" +#line 522 "h225.cnf" nsp_handle = NULL; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, @@ -2280,7 +2280,7 @@ static const per_choice_t H245TransportAddress_choice[] = { static int dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 323 "h225.cnf" +#line 319 "h225.cnf" ipv4_address=0; ipv4_port=0; @@ -2289,7 +2289,7 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb, int offset, packet_info *pinfo ett_h225_H245TransportAddress, H245TransportAddress_choice, NULL); -#line 329 "h225.cnf" +#line 325 "h225.cnf" /* we need this info for TAPing */ h225_pi->is_h245 = TRUE; h225_pi->h245_address = ipv4_address; @@ -2321,7 +2321,7 @@ static int dissect_h245Address(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int dissect_h225_DialedDigits(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 201 "h225.cnf" +#line 197 "h225.cnf" tvbuff_t *value_tvb = NULL; guint len = 0; @@ -3920,13 +3920,13 @@ static const per_sequence_t TunnelledProtocol_sequence[] = { static int dissect_h225_TunnelledProtocol(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 471 "h225.cnf" +#line 467 "h225.cnf" tpOID = ""; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_TunnelledProtocol, TunnelledProtocol_sequence); -#line 473 "h225.cnf" +#line 469 "h225.cnf" tp_handle = dissector_get_string_handle(tp_dissector_table, tpOID); return offset; @@ -4170,7 +4170,7 @@ static int dissect_callType(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int dissect_h225_T_guid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 450 "h225.cnf" +#line 446 "h225.cnf" tvbuff_t *guid_tvb; offset = dissect_per_octet_string(tvb,offset,pinfo,tree,hf_index,GUID_LEN,GUID_LEN,&guid_tvb); @@ -4431,7 +4431,7 @@ static int dissect_cryptoTokens(tvbuff_t *tvb, int offset, packet_info *pinfo, p static int dissect_h225_FastStart_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 168 "h225.cnf" +#line 164 "h225.cnf" tvbuff_t *value_tvb = NULL; char codec_str[50]; @@ -4639,8 +4639,8 @@ const value_string h225_ScreeningIndicator_vals[] = { int dissect_h225_ScreeningIndicator(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 4, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -5402,7 +5402,7 @@ static const per_sequence_t GenericData_sequence[] = { { NULL, 0, 0, NULL } }; -static int +int dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_GenericData, GenericData_sequence); @@ -5489,7 +5489,7 @@ static int dissect_supportedFeatures(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_h225_ParallelH245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 230 "h225.cnf" +#line 226 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, @@ -5615,13 +5615,13 @@ static const per_sequence_t Setup_UUIE_sequence[] = { static int dissect_h225_Setup_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 277 "h225.cnf" +#line 273 "h225.cnf" contains_faststart = FALSE; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Setup_UUIE, Setup_UUIE_sequence); -#line 281 "h225.cnf" +#line 277 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_SETUP; if (contains_faststart == TRUE ) @@ -5677,7 +5677,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _ offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_CallProceeding_UUIE, CallProceeding_UUIE_sequence); -#line 290 "h225.cnf" +#line 286 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CALL_PROCEDING; if (contains_faststart == TRUE ) @@ -5720,7 +5720,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pro offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Connect_UUIE, Connect_UUIE_sequence); -#line 314 "h225.cnf" +#line 310 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_CONNECT; if (contains_faststart == TRUE ) @@ -5761,7 +5761,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Alerting_UUIE, Alerting_UUIE_sequence); -#line 299 "h225.cnf" +#line 295 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_ALERTING; if (contains_faststart == TRUE ) @@ -5792,7 +5792,7 @@ dissect_h225_Information_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Information_UUIE, Information_UUIE_sequence); -#line 254 "h225.cnf" +#line 250 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_INFORMATION; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -5923,7 +5923,7 @@ static const per_choice_t ReleaseCompleteReason_choice[] = { static int dissect_h225_ReleaseCompleteReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 443 "h225.cnf" +#line 439 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -5960,7 +5960,7 @@ dissect_h225_ReleaseComplete_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_ReleaseComplete_UUIE, ReleaseComplete_UUIE_sequence); -#line 308 "h225.cnf" +#line 304 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_RELEASE_COMPLET; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -6004,7 +6004,7 @@ static const per_choice_t FacilityReason_choice[] = { static int dissect_h225_FacilityReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 367 "h225.cnf" +#line 363 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -6086,7 +6086,7 @@ dissect_h225_Facility_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Facility_UUIE, Facility_UUIE_sequence); -#line 269 "h225.cnf" +#line 265 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_FACILITY; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -6118,7 +6118,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, pr offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Progress_UUIE, Progress_UUIE_sequence); -#line 260 "h225.cnf" +#line 256 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_PROGRESS; if (contains_faststart == TRUE ) @@ -6138,7 +6138,7 @@ static int dissect_h225_T_empty(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_per_null(tvb, offset, pinfo, tree, hf_index); -#line 244 "h225.cnf" +#line 240 "h225.cnf" h225_pi->cs_type = H225_EMPTY; return offset; @@ -6161,7 +6161,7 @@ dissect_h225_Status_UUIE(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, ett_h225_Status_UUIE, Status_UUIE_sequence); -#line 248 "h225.cnf" +#line 244 "h225.cnf" /* Add to packet info */ h225_pi->cs_type = H225_STATUS; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -6269,7 +6269,7 @@ static const per_choice_t T_h323_message_body_choice[] = { static int dissect_h225_T_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 141 "h225.cnf" +#line 137 "h225.cnf" guint32 message_body_val; contains_faststart = FALSE; @@ -6309,7 +6309,7 @@ static int dissect_h323_message_body(tvbuff_t *tvb, int offset, packet_info *pin static int dissect_h225_T_h4501SupplementaryService_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 459 "h225.cnf" +#line 455 "h225.cnf" tvbuff_t *h4501_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, @@ -6359,7 +6359,7 @@ static int dissect_h245Tunneling(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_h225_H245Control_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 237 "h225.cnf" +#line 233 "h225.cnf" tvbuff_t *h245_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, @@ -6434,7 +6434,7 @@ static int dissect_callLinkage(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int dissect_h225_T_messageContent_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 481 "h225.cnf" +#line 477 "h225.cnf" tvbuff_t *next_tvb = NULL; offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index, @@ -6476,7 +6476,7 @@ static const per_sequence_t T_tunnelledSignallingMessage_sequence[] = { static int dissect_h225_T_tunnelledSignallingMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 479 "h225.cnf" +#line 475 "h225.cnf" tp_handle = NULL; offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, @@ -7498,7 +7498,7 @@ static const per_choice_t GatekeeperRejectReason_choice[] = { static int dissect_h225_GatekeeperRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 374 "h225.cnf" +#line 370 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -7790,7 +7790,7 @@ static const per_choice_t RegistrationRejectReason_choice[] = { static int dissect_h225_RegistrationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 429 "h225.cnf" +#line 425 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -7856,7 +7856,7 @@ static const per_choice_t UnregRequestReason_choice[] = { static int dissect_h225_UnregRequestReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 381 "h225.cnf" +#line 377 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -7948,7 +7948,7 @@ static const per_choice_t UnregRejectReason_choice[] = { static int dissect_h225_UnregRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 388 "h225.cnf" +#line 384 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -8017,7 +8017,7 @@ static int dissect_callModel(tvbuff_t *tvb, int offset, packet_info *pinfo, prot static int dissect_h225_DestinationInfo_item(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 196 "h225.cnf" +#line 192 "h225.cnf" h225_pi->is_destinationInfo = TRUE; @@ -8273,7 +8273,7 @@ static const per_choice_t AdmissionRejectReason_choice[] = { static int dissect_h225_AdmissionRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 415 "h225.cnf" +#line 411 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -8417,7 +8417,7 @@ static const per_choice_t BandRejectReason_choice[] = { static int dissect_h225_BandRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 395 "h225.cnf" +#line 391 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -8475,7 +8475,7 @@ static const per_choice_t DisengageReason_choice[] = { static int dissect_h225_DisengageReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 402 "h225.cnf" +#line 398 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -8570,7 +8570,7 @@ static const per_choice_t DisengageRejectReason_choice[] = { static int dissect_h225_DisengageRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 408 "h225.cnf" +#line 404 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -8727,7 +8727,7 @@ static const per_choice_t LocationRejectReason_choice[] = { static int dissect_h225_LocationRejectReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 422 "h225.cnf" +#line 418 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -9154,7 +9154,7 @@ static const per_choice_t InfoRequestNakReason_choice[] = { static int dissect_h225_InfoRequestNakReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 436 "h225.cnf" +#line 432 "h225.cnf" guint32 value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, @@ -9386,7 +9386,7 @@ static const per_choice_t RasMessage_choice[] = { int dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { -#line 184 "h225.cnf" +#line 180 "h225.cnf" guint32 rasmessage_value; offset = dissect_per_choice(tvb, offset, pinfo, tree, hf_index, diff --git a/epan/dissectors/packet-h225.h b/epan/dissectors/packet-h225.h index ded9f5200a..6104403546 100644 --- a/epan/dissectors/packet-h225.h +++ b/epan/dissectors/packet-h225.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* .\packet-h225.h */ -/* ../../tools/asn2eth.py -X -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ +/* ../../tools/asn2eth.py -e -p h225 -c h225.cnf -s packet-h225-template h225.asn */ /* Input file: packet-h225-template.h */ @@ -112,6 +112,7 @@ int dissect_h225_NonStandardParameter(tvbuff_t *tvb, int offset, packet_info *pi int dissect_h225_AliasAddress(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_h225_PartyNumber(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_h225_CallIdentifier(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_h225_GenericData(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_h225_RasMessage(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); /*--- End of included file: packet-h225-exp.h ---*/ diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 44538a919d..49e606e624 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* .\packet-h245.c */ -/* ../../tools/asn2eth.py -X -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */ +/* ../../tools/asn2eth.py -e -p h245 -c h245.cnf -s packet-h245-template h245.asn */ /* Input file: packet-h245-template.c */ @@ -17437,6 +17437,7 @@ dissect_h245_Moderfc2733(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot /*--- PDUs ---*/ static void dissect_OpenLogicalChannel_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h245_OpenLogicalChannel(tvb, 0, pinfo, tree, hf_h245_OpenLogicalChannel_PDU); } diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index de1839dd4c..afdd93dd57 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* .\packet-h450.c */ -/* ../../tools/asn2eth.py -X -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */ +/* ../../tools/asn2eth.py -e -p h450 -c h450.cnf -s packet-h450-template h4501.asn */ /* Input file: packet-h450-template.c */ @@ -1721,8 +1721,8 @@ static const value_string h450_EndDesignation_vals[] = { static int dissect_h450_EndDesignation(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 1, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 2, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -1740,8 +1740,8 @@ static const value_string h450_CallStatus_vals[] = { static int dissect_h450_CallStatus(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 1, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 2, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -1877,8 +1877,8 @@ static const value_string h450_Procedure_vals[] = { static int dissect_h450_Procedure(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 2, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 3, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -1931,11 +1931,12 @@ static const value_string h450_BasicService_vals[] = { { 0, NULL } }; +static guint32 BasicService_value_map[40+0] = {0, 1, 2, 3, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75}; static int dissect_h450_BasicService(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 75, NULL, NULL, FALSE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 40, NULL, NULL, FALSE, 0, BasicService_value_map); return offset; } @@ -2266,8 +2267,8 @@ static const value_string h450_DiversionReason_vals[] = { static int dissect_h450_DiversionReason(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 4, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -2308,8 +2309,8 @@ static const value_string h450_SubscriptionOption_vals[] = { static int dissect_h450_SubscriptionOption(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 2, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 3, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -2892,8 +2893,8 @@ static const value_string h450_ParkCondition_vals[] = { static int dissect_h450_ParkCondition(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 4, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -2963,8 +2964,8 @@ static const value_string h450_CallType_vals[] = { static int dissect_h450_CallType(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 1, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 2, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -4005,8 +4006,8 @@ static const value_string h450_PartyCategory_vals[] = { static int dissect_h450_PartyCategory(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_per_constrained_integer(tvb, offset, pinfo, tree, hf_index, - 0, 3, NULL, NULL, TRUE); + offset = dissect_per_enumerated(tvb, offset, pinfo, tree, hf_index, + 4, NULL, NULL, TRUE, 0, NULL); return offset; } @@ -4121,45 +4122,59 @@ dissect_h450_Unspecified(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, prot /*--- PDUs ---*/ static void dissect_CallTransferIdentify_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferIdentify(tvb, 0, pinfo, tree, hf_h450_CallTransferIdentify_PDU); } static void dissect_CallTransferAbandon_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferAbandon(tvb, 0, pinfo, tree, hf_h450_CallTransferAbandon_PDU); } static void dissect_CallTransferInitiate_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferInitiate(tvb, 0, pinfo, tree, hf_h450_CallTransferInitiate_PDU); } static void dissect_CallTransferSetup_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferSetup(tvb, 0, pinfo, tree, hf_h450_CallTransferSetup_PDU); } static void dissect_CallTransferUpdate_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferUpdate(tvb, 0, pinfo, tree, hf_h450_CallTransferUpdate_PDU); } static void dissect_SubaddressTransfer_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_SubaddressTransfer(tvb, 0, pinfo, tree, hf_h450_SubaddressTransfer_PDU); } static void dissect_CallTransferComplete_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferComplete(tvb, 0, pinfo, tree, hf_h450_CallTransferComplete_PDU); } static void dissect_CallTransferActive_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallTransferActive(tvb, 0, pinfo, tree, hf_h450_CallTransferActive_PDU); } static void dissect_ActivateDiversionQArg_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_ActivateDiversionQArg(tvb, 0, pinfo, tree, hf_h450_ActivateDiversionQArg_PDU); } static void dissect_ActivateDiversionQRes_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_ActivateDiversionQRes(tvb, 0, pinfo, tree, hf_h450_ActivateDiversionQRes_PDU); } static void dissect_DeactivateDiversionQRes_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_DeactivateDiversionQRes(tvb, 0, pinfo, tree, hf_h450_DeactivateDiversionQRes_PDU); } static void dissect_InterrogateDiversionQRes_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_InterrogateDiversionQRes(tvb, 0, pinfo, tree, hf_h450_InterrogateDiversionQRes_PDU); } static void dissect_CheckRestrictionRes_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CheckRestrictionRes(tvb, 0, pinfo, tree, hf_h450_CheckRestrictionRes_PDU); } static void dissect_CallReroutingRes_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + per_aligment_type_callback(TRUE); dissect_h450_CallReroutingRes(tvb, 0, pinfo, tree, hf_h450_CallReroutingRes_PDU); } |