diff options
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-cosnaming.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-gias.c | 74 | ||||
| -rw-r--r-- | epan/dissectors/packet-parlay.c | 92 | ||||
| -rw-r--r-- | epan/dissectors/packet-tango.c | 8 | ||||
| -rwxr-xr-x | tools/wireshark_gen.py | 71 |
7 files changed, 73 insertions, 184 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index ea6a3c41ac..4a2eb764d7 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -305,6 +305,7 @@ set(DIRTY_ASN1_DISSECTOR_SRC set(DIRTY_CORBA_IDL_DISSECTOR_SRC dissectors/packet-coseventcomm.c dissectors/packet-cosnaming.c + dissectors/packet-gias.c dissectors/packet-parlay.c dissectors/packet-tango.c ) @@ -709,7 +710,6 @@ set(DISSECTOR_SRC dissectors/packet-gearman.c dissectors/packet-ged125.c dissectors/packet-geneve.c - dissectors/packet-gias.c dissectors/packet-gift.c dissectors/packet-giop.c dissectors/packet-git.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 05634a04a5..63ad7b759a 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -218,6 +218,7 @@ DIRTY_ASN1_DISSECTOR_SRC = \ DIRTY_CORBA_IDL_DISSECTOR_SRC = \ packet-coseventcomm.c \ packet-cosnaming.c \ + packet-gias.c \ packet-parlay.c \ packet-tango.c @@ -625,7 +626,6 @@ DISSECTOR_SRC = \ packet-gearman.c \ packet-ged125.c \ packet-geneve.c \ - packet-gias.c \ packet-gift.c \ packet-giop.c \ packet-git.c \ diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c index 4c9b28ba1c..4977a3c890 100644 --- a/epan/dissectors/packet-cosnaming.c +++ b/epan/dissectors/packet-cosnaming.c @@ -143,7 +143,7 @@ static const value_string CosNaming_NamingContext_NotFoundReason[] = { static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { - proto_item *item _U_; + proto_item *item = NULL; /* Operation specific Variable declarations Begin */ guint32 u_octet4; @@ -151,8 +151,6 @@ decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo guint32 i_CosNaming_NamingContext_NotFound_rest_of_name; /* Operation specific Variable declarations End */ - (void)item; /* Avoid coverity param_set_but_unused parse warning */ - u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary); /* coverity[returned_pointer] */ item = proto_tree_add_uint(tree, hf_CosNaming_NamingContext_NotFound_why, tvb, *offset-4, 4, u_octet4); @@ -174,15 +172,13 @@ decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { - proto_item *item _U_; + proto_item *item = NULL; /* Operation specific Variable declarations Begin */ guint32 u_octet4_loop_CosNaming_NamingContext_CannotProceed_rest_of_name; guint32 i_CosNaming_NamingContext_CannotProceed_rest_of_name; /* Operation specific Variable declarations End */ - (void)item; /* Avoid coverity param_set_but_unused parse warning */ - get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary); u_octet4_loop_CosNaming_NamingContext_CannotProceed_rest_of_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); diff --git a/epan/dissectors/packet-gias.c b/epan/dissectors/packet-gias.c index dc35867aa4..9085cbdaca 100644 --- a/epan/dissectors/packet-gias.c +++ b/epan/dissectors/packet-gias.c @@ -64,7 +64,7 @@ static guint32 boundary = GIOP_HEADER_SIZE; /* initial value */ static int hf_operationrequest = -1;/* Request_Operation field */ -/* Operation filters */ + /* Operation filters */ static int hf_CB_Callback_notify_theState = -1; static int hf_GIAS_Library_get_manager_types_return_loop = -1; static int hf_GIAS_Library_get_manager_types_return = -1; @@ -203,7 +203,7 @@ static int hf_GIAS_GetRelatedFilesRequest_complete_locations_loop = -1; static int hf_GIAS_GetRelatedFilesRequest_complete_locations = -1; static int hf_GIAS_CreateAssociationRequest_complete_return = -1; static int hf_GIAS_UpdateByQueryRequest_complete_return = -1; -/* Struct filters */ + /* Struct filters */ static int hf_UCO_NameName_name1 = -1; static int hf_UCO_NameName_name2 = -1; static int hf_UCO_NameValue_aname = -1; @@ -352,19 +352,10 @@ static int hf_GIAS_PackageElement_files_loop = -1; static int hf_GIAS_PackageElement_files = -1; static int hf_GIAS_DeliveryManifest_package_name = -1; static int hf_GIAS_DeliveryManifest_elements_loop = -1; -/* User exception filters */ -#if 0 -static int hf_UCO_InvalidInputParameter_details = -1; -#endif + /* User exception filters */ static int hf_UCO_InvalidInputParameter_badInputParameters = -1; static int hf_UCO_InvalidInputParameter_badInputParameters_loop = -1; -#if 0 -static int hf_UCO_ProcessingFault_details = -1; -#endif -#if 0 -static int hf_UCO_SystemFault_details = -1; -#endif -/* Union filters */ + /* Union filters */ static int hf_UCO_Buffer_Buffer = -1; static int hf_UCO_Buffer_octet_buffer_loop = -1; static int hf_UCO_Buffer_octet_buffer = -1; @@ -398,7 +389,7 @@ static int hf_GIAS_Domain_bd = -1; static int hf_GIAS_Domain_bv = -1; static int hf_GIAS_LifeEvent_LifeEvent = -1; static int hf_GIAS_LifeEvent_ev = -1; -/* Expert info filters */ + /* Expert info filters */ static expert_field ei_gias_unknown_giop_msg = EI_INIT; static expert_field ei_gias_unknown_exception = EI_INIT; static expert_field ei_gias_unknown_reply_status = EI_INIT; @@ -415,18 +406,14 @@ static void decode_UCO_NameName_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /* Struct = IDL:UCO/NameValue:1.0 */ static void decode_UCO_NameValue_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#if 0 /* Struct = IDL:UCO/Ratio:1.0 */ static void decode_UCO_Ratio_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif /* Struct = IDL:UCO/FileLocation:1.0 */ static void decode_UCO_FileLocation_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#if 0 /* Struct = IDL:UCO/DirectAccessLocation:1.0 */ static void decode_UCO_DirectAccessLocation_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif /* Struct = IDL:UCO/Date:1.0 */ static void decode_UCO_Date_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); @@ -464,43 +451,29 @@ static void decode_UCO_RequestDescription_st(tvbuff_t *tvb _U_, packet_info *pin /* Struct = IDL:UCO/Coordinate2d:1.0 */ static void decode_UCO_Coordinate2d_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#if 0 /* Struct = IDL:UCO/Coordinate3d:1.0 */ static void decode_UCO_Coordinate3d_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif -#if 0 /* Struct = IDL:UCO/LinearDimension:1.0 */ static void decode_UCO_LinearDimension_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif -#if 0 /* Struct = IDL:UCO/Circle:1.0 */ static void decode_UCO_Circle_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif -#if 0 /* Struct = IDL:UCO/Ellipse:1.0 */ static void decode_UCO_Ellipse_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif /* Struct = IDL:UCO/Rectangle:1.0 */ static void decode_UCO_Rectangle_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#if 0 /* Struct = IDL:UCO/SimpleGSImage:1.0 */ static void decode_UCO_SimpleGSImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif -#if 0 /* Struct = IDL:UCO/SimpleCImage:1.0 */ static void decode_UCO_SimpleCImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif -#if 0 /* Struct = IDL:UCO/CompressedImage:1.0 */ static void decode_UCO_CompressedImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif /* Struct = IDL:UCO/Status:1.0 */ static void decode_UCO_Status_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); @@ -517,10 +490,8 @@ static void decode_UCO_EntityGraph_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /* Struct = IDL:UCO/exception_details:1.0 */ static void decode_UCO_exception_details_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#if 0 /* Struct = IDL:GIAS/ImageSpec:1.0 */ static void decode_GIAS_ImageSpec_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif /* Struct = IDL:GIAS/AlterationSpec:1.0 */ static void decode_GIAS_AlterationSpec_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); @@ -607,10 +578,8 @@ static void decode_GIAS_DeliveryManifest_st(tvbuff_t *tvb _U_, packet_info *pinf /* Union prototype declaration Start */ -#if 0 /* Union = IDL:UCO/Buffer:1.0 */ static void decode_UCO_Buffer_un(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); -#endif /* Union = IDL:GIAS/Destination:1.0 */ @@ -922,7 +891,7 @@ decode_ex_UCO_InvalidInputParameter(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /* End struct "UCO_exception_details" */ u_octet4_loop_UCO_InvalidInputParameter_badInputParameters = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); /* coverity[returned_pointer] */ - /*item = */proto_tree_add_uint(tree, hf_UCO_InvalidInputParameter_badInputParameters_loop, tvb,*offset-4, 4, u_octet4_loop_UCO_InvalidInputParameter_badInputParameters); + item = proto_tree_add_uint(tree, hf_UCO_InvalidInputParameter_badInputParameters_loop, tvb,*offset-4, 4, u_octet4_loop_UCO_InvalidInputParameter_badInputParameters); for (i_UCO_InvalidInputParameter_badInputParameters=0; i_UCO_InvalidInputParameter_badInputParameters < u_octet4_loop_UCO_InvalidInputParameter_badInputParameters; i_UCO_InvalidInputParameter_badInputParameters++) { @@ -5297,7 +5266,6 @@ decode_UCO_NameValue_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *t } -#if 0 /* Struct = IDL:UCO/Ratio:1.0 */ static void decode_UCO_Ratio_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5308,7 +5276,6 @@ decode_UCO_Ratio_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_double(tree, hf_UCO_Ratio_denominator, tvb, *offset-8, 8, get_CDR_double(tvb,offset,stream_is_big_endian, boundary)); } -#endif /* Struct = IDL:UCO/FileLocation:1.0 */ static void @@ -5327,7 +5294,6 @@ decode_UCO_FileLocation_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree } -#if 0 /* Struct = IDL:UCO/DirectAccessLocation:1.0 */ static void decode_UCO_DirectAccessLocation_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5347,7 +5313,6 @@ decode_UCO_DirectAccessLocation_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr decode_UCO_FileLocation_st(tvb, pinfo, tree, item, offset, header, operation, stream_is_big_endian); /* End struct "UCO_FileLocation" */ } -#endif /* Struct = IDL:UCO/Date:1.0 */ static void @@ -5614,7 +5579,6 @@ decode_UCO_Coordinate2d_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree } -#if 0 /* Struct = IDL:UCO/Coordinate3d:1.0 */ static void decode_UCO_Coordinate3d_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5627,9 +5591,7 @@ decode_UCO_Coordinate3d_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree proto_tree_add_double(tree, hf_UCO_Coordinate3d_z, tvb, *offset-8, 8, get_CDR_double(tvb,offset,stream_is_big_endian, boundary)); } -#endif -#if 0 /* Struct = IDL:UCO/LinearDimension:1.0 */ static void decode_UCO_LinearDimension_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5640,9 +5602,7 @@ decode_UCO_LinearDimension_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_UCO_LinearDimension_reference_system); } -#endif -#if 0 /* Struct = IDL:UCO/Circle:1.0 */ static void decode_UCO_Circle_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5655,9 +5615,7 @@ decode_UCO_Circle_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree decode_UCO_LinearDimension_st(tvb, pinfo, tree, item, offset, header, operation, stream_is_big_endian); /* End struct "UCO_LinearDimension" */ } -#endif -#if 0 /* Struct = IDL:UCO/Ellipse:1.0 */ static void decode_UCO_Ellipse_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5675,7 +5633,6 @@ decode_UCO_Ellipse_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tre proto_tree_add_double(tree, hf_UCO_Ellipse_north_angle, tvb, *offset-8, 8, get_CDR_double(tvb,offset,stream_is_big_endian, boundary)); } -#endif /* Struct = IDL:UCO/Rectangle:1.0 */ static void @@ -5690,7 +5647,6 @@ decode_UCO_Rectangle_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *t /* End struct "UCO_Coordinate2d" */ } -#if 0 /* Struct = IDL:UCO/SimpleGSImage:1.0 */ static void decode_UCO_SimpleGSImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5701,14 +5657,11 @@ decode_UCO_SimpleGSImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre proto_tree_add_uint(tree, hf_UCO_SimpleGSImage_height, tvb, *offset-4, 4, get_CDR_ulong(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "UCO_Buffer" */ - decode_UCO_Buffer_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "UCO_Buffer" */ } -#endif -#if 0 /* Struct = IDL:UCO/SimpleCImage:1.0 */ static void decode_UCO_SimpleCImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5719,24 +5672,19 @@ decode_UCO_SimpleCImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree proto_tree_add_uint(tree, hf_UCO_SimpleCImage_height, tvb, *offset-4, 4, get_CDR_ulong(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "UCO_Buffer" */ - decode_UCO_Buffer_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "UCO_Buffer" */ /* Begin union "UCO_Buffer" */ - decode_UCO_Buffer_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "UCO_Buffer" */ /* Begin union "UCO_Buffer" */ - decode_UCO_Buffer_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "UCO_Buffer" */ } -#endif -#if 0 /* Struct = IDL:UCO/CompressedImage:1.0 */ static void decode_UCO_CompressedImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5770,7 +5718,6 @@ decode_UCO_CompressedImage_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t } } -#endif /* Struct = IDL:UCO/Status:1.0 */ static void @@ -5880,7 +5827,6 @@ decode_UCO_exception_details_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -#if 0 /* Struct = IDL:GIAS/ImageSpec:1.0 */ static void decode_GIAS_ImageSpec_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, proto_item *item _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -5926,7 +5872,6 @@ decode_GIAS_ImageSpec_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree * item = proto_tree_add_uint(tree, hf_GIAS_ImageSpec_encoding, tvb, *offset-4, 4, u_octet4); } -#endif /* Struct = IDL:GIAS/AlterationSpec:1.0 */ static void @@ -6114,7 +6059,6 @@ decode_GIAS_AttributeInformation_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p item = proto_tree_add_uint(tree, hf_GIAS_AttributeInformation_attribute_type, tvb, *offset-4, 4, u_octet4); /* Begin union "GIAS_Domain" */ - decode_GIAS_Domain_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "GIAS_Domain" */ @@ -6250,12 +6194,10 @@ decode_GIAS_QueryLifeSpan_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr (void)item; /* Avoid coverity param_set_but_unused parse warning */ /* Begin union "GIAS_LifeEvent" */ - decode_GIAS_LifeEvent_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "GIAS_LifeEvent" */ /* Begin union "GIAS_LifeEvent" */ - decode_GIAS_LifeEvent_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "GIAS_LifeEvent" */ @@ -6266,7 +6208,6 @@ decode_GIAS_QueryLifeSpan_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr for (i_GIAS_QueryLifeSpan_frequency=0; i_GIAS_QueryLifeSpan_frequency < u_octet4_loop_GIAS_QueryLifeSpan_frequency; i_GIAS_QueryLifeSpan_frequency++) { /* Begin union "GIAS_LifeEvent" */ - decode_GIAS_LifeEvent_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "GIAS_LifeEvent" */ @@ -6354,7 +6295,6 @@ decode_GIAS_DeliveryDetails_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ { /* Begin union "GIAS_Destination" */ - decode_GIAS_Destination_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "GIAS_Destination" */ @@ -6523,7 +6463,6 @@ decode_GIAS_DeliveryManifest_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto } -#if 0 /* Union = IDL:UCO/Buffer:1.0 */ static void decode_UCO_Buffer_un(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -6692,7 +6631,6 @@ decode_UCO_Buffer_un(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree } } -#endif /* Union = IDL:GIAS/Destination:1.0 */ static void diff --git a/epan/dissectors/packet-parlay.c b/epan/dissectors/packet-parlay.c index f5f660b602..906ce17ffe 100644 --- a/epan/dissectors/packet-parlay.c +++ b/epan/dissectors/packet-parlay.c @@ -9140,7 +9140,6 @@ decode_org_csapi_fw_fw_application_notification_IpAppEventNotification_reportNot switch(header->message_type) { case Request: /* Begin union "org_csapi_fw_TpFwEventInfo" */ - decode_org_csapi_fw_TpFwEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpFwEventInfo" */ @@ -9209,7 +9208,6 @@ decode_org_csapi_fw_fw_application_notification_IpEventNotification_createNotifi switch(header->message_type) { case Request: /* Begin union "org_csapi_fw_TpFwEventCriteria" */ - decode_org_csapi_fw_TpFwEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpFwEventCriteria" */ @@ -13455,7 +13453,6 @@ decode_org_csapi_fw_fw_enterprise_operator_notification_IpClientEventNotificatio switch(header->message_type) { case Request: /* Begin union "org_csapi_fw_TpFwEventInfo" */ - decode_org_csapi_fw_TpFwEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpFwEventInfo" */ @@ -13524,7 +13521,6 @@ decode_org_csapi_fw_fw_enterprise_operator_notification_IpEventNotification_crea switch(header->message_type) { case Request: /* Begin union "org_csapi_fw_TpFwEventCriteria" */ - decode_org_csapi_fw_TpFwEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpFwEventCriteria" */ @@ -16595,7 +16591,6 @@ decode_org_csapi_fw_fw_service_notification_IpFwEventNotification_createNotifica switch(header->message_type) { case Request: /* Begin union "org_csapi_fw_TpFwEventCriteria" */ - decode_org_csapi_fw_TpFwEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpFwEventCriteria" */ @@ -16664,7 +16659,6 @@ decode_org_csapi_fw_fw_service_notification_IpSvcEventNotification_reportNotific switch(header->message_type) { case Request: /* Begin union "org_csapi_fw_TpFwEventInfo" */ - decode_org_csapi_fw_TpFwEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpFwEventInfo" */ @@ -17144,7 +17138,6 @@ decode_org_csapi_cc_gccs_IpCall_routeReq(tvbuff_t *tvb _U_, packet_info *pinfo _ for (i_org_csapi_cc_gccs_IpCall_routeReq_appInfo=0; i_org_csapi_cc_gccs_IpCall_routeReq_appInfo < u_octet4_loop_org_csapi_cc_gccs_IpCall_routeReq_appInfo; i_org_csapi_cc_gccs_IpCall_routeReq_appInfo++) { /* Begin union "org_csapi_cc_gccs_TpCallAppInfo" */ - decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_gccs_TpCallAppInfo" */ @@ -17818,7 +17811,6 @@ decode_org_csapi_cc_gccs_IpCallControlManager_setCallLoadControl(tvbuff_t *tvb _ proto_tree_add_int(tree, hf_org_csapi_cc_gccs_IpCallControlManager_setCallLoadControl_duration, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_cc_TpCallLoadControlMechanism" */ - decode_org_csapi_cc_TpCallLoadControlMechanism_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallLoadControlMechanism" */ @@ -18565,7 +18557,6 @@ decode_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_setCallLoadControl(tvbu proto_tree_add_int(tree, hf_org_csapi_cc_mpccs_IpMultiPartyCallControlManager_setCallLoadControl_duration, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_cc_TpCallLoadControlMechanism" */ - decode_org_csapi_cc_TpCallLoadControlMechanism_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallLoadControlMechanism" */ @@ -18726,7 +18717,6 @@ decode_org_csapi_cc_mpccs_IpCallLeg_routeReq(tvbuff_t *tvb _U_, packet_info *pin for (i_org_csapi_cc_mpccs_IpCallLeg_routeReq_appInfo=0; i_org_csapi_cc_mpccs_IpCallLeg_routeReq_appInfo < u_octet4_loop_org_csapi_cc_mpccs_IpCallLeg_routeReq_appInfo; i_org_csapi_cc_mpccs_IpCallLeg_routeReq_appInfo++) { /* Begin union "org_csapi_cc_TpCallAppInfo" */ - decode_org_csapi_cc_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAppInfo" */ @@ -19658,7 +19648,6 @@ decode_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq(tvbuff_t *tv for (i_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_appInfo=0; i_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_appInfo < u_octet4_loop_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_appInfo; i_org_csapi_cc_mpccs_IpMultiPartyCall_createAndRouteCallLegReq_appInfo++) { /* Begin union "org_csapi_cc_TpCallAppInfo" */ - decode_org_csapi_cc_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAppInfo" */ @@ -19951,7 +19940,6 @@ decode_org_csapi_cc_mpccs_IpAppMultiPartyCallControlManager_reportNotification(t switch(header->rep_status) { case NO_EXCEPTION: /* Begin union "org_csapi_cc_mpccs_TpAppMultiPartyCallBack" */ - decode_org_csapi_cc_mpccs_TpAppMultiPartyCallBack_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_mpccs_TpAppMultiPartyCallBack" */ @@ -20600,7 +20588,6 @@ decode_org_csapi_cc_mmccs_IpAppMultiMediaCallControlManager_reportMediaNotificat switch(header->rep_status) { case NO_EXCEPTION: /* Begin union "org_csapi_cc_mmccs_TpAppMultiMediaCallBack" */ - decode_org_csapi_cc_mmccs_TpAppMultiMediaCallBack_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_mmccs_TpAppMultiMediaCallBack" */ @@ -20930,7 +20917,6 @@ decode_org_csapi_cc_cccs_IpConfCallControlManager_createConference(tvbuff_t *tvb proto_tree_add_int(tree, hf_org_csapi_cc_cccs_IpConfCallControlManager_createConference_numberOfSubConferences, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_cc_cccs_TpConfPolicy" */ - decode_org_csapi_cc_cccs_TpConfPolicy_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_cccs_TpConfPolicy" */ @@ -21014,7 +21000,6 @@ decode_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources(tvbuff_t *tvb proto_tree_add_int(tree, hf_org_csapi_cc_cccs_IpConfCallControlManager_reserveResources_duration, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_cc_cccs_TpConfPolicy" */ - decode_org_csapi_cc_cccs_TpConfPolicy_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_cccs_TpConfPolicy" */ @@ -21384,7 +21369,6 @@ decode_org_csapi_cc_cccs_IpSubConfCall_changeConferencePolicy(tvbuff_t *tvb _U_, proto_tree_add_int(tree, hf_org_csapi_cc_cccs_IpSubConfCall_changeConferencePolicy_subConferenceSessionID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_cc_cccs_TpConfPolicy" */ - decode_org_csapi_cc_cccs_TpConfPolicy_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_cccs_TpConfPolicy" */ @@ -21473,7 +21457,6 @@ decode_org_csapi_cc_cccs_IpConfCall_createSubConference(tvbuff_t *tvb _U_, packe get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary); /* Begin union "org_csapi_cc_cccs_TpConfPolicy" */ - decode_org_csapi_cc_cccs_TpConfPolicy_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_cccs_TpConfPolicy" */ @@ -22068,7 +22051,6 @@ decode_org_csapi_ui_IpAppUICall_getMessageRes(tvbuff_t *tvb _U_, packet_info *pi proto_tree_add_int(tree, hf_org_csapi_ui_IpAppUICall_getMessageRes_assignmentID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -22342,7 +22324,6 @@ decode_org_csapi_ui_IpUI_sendInfoReq(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree_add_int(tree, hf_org_csapi_ui_IpUI_sendInfoReq_userInteractionSessionID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -22355,7 +22336,6 @@ decode_org_csapi_ui_IpUI_sendInfoReq(tvbuff_t *tvb _U_, packet_info *pinfo _U_, for (i_org_csapi_ui_IpUI_sendInfoReq_variableInfo=0; i_org_csapi_ui_IpUI_sendInfoReq_variableInfo < u_octet4_loop_org_csapi_ui_IpUI_sendInfoReq_variableInfo; i_org_csapi_ui_IpUI_sendInfoReq_variableInfo++) { /* Begin union "org_csapi_ui_TpUIVariableInfo" */ - decode_org_csapi_ui_TpUIVariableInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIVariableInfo" */ @@ -22406,7 +22386,6 @@ decode_org_csapi_ui_IpUI_sendInfoAndCollectReq(tvbuff_t *tvb _U_, packet_info *p proto_tree_add_int(tree, hf_org_csapi_ui_IpUI_sendInfoAndCollectReq_userInteractionSessionID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -22419,7 +22398,6 @@ decode_org_csapi_ui_IpUI_sendInfoAndCollectReq(tvbuff_t *tvb _U_, packet_info *p for (i_org_csapi_ui_IpUI_sendInfoAndCollectReq_variableInfo=0; i_org_csapi_ui_IpUI_sendInfoAndCollectReq_variableInfo < u_octet4_loop_org_csapi_ui_IpUI_sendInfoAndCollectReq_variableInfo; i_org_csapi_ui_IpUI_sendInfoAndCollectReq_variableInfo++) { /* Begin union "org_csapi_ui_TpUIVariableInfo" */ - decode_org_csapi_ui_TpUIVariableInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIVariableInfo" */ @@ -22565,7 +22543,6 @@ decode_org_csapi_ui_IpUICall_recordMessageReq(tvbuff_t *tvb _U_, packet_info *pi proto_tree_add_int(tree, hf_org_csapi_ui_IpUICall_recordMessageReq_userInteractionSessionID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -22748,7 +22725,6 @@ decode_org_csapi_ui_IpUIManager_createUICall(tvbuff_t *tvb _U_, packet_info *pin get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary); /* Begin union "org_csapi_ui_TpUITargetObject" */ - decode_org_csapi_ui_TpUITargetObject_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUITargetObject" */ @@ -23005,7 +22981,6 @@ decode_org_csapi_ui_IpAppUIAdminManager_getMessageRes(tvbuff_t *tvb _U_, packet_ proto_tree_add_int(tree, hf_org_csapi_ui_IpAppUIAdminManager_getMessageRes_assignmentID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -23394,7 +23369,6 @@ decode_org_csapi_ui_IpUIAdminManager_putMessageReq(tvbuff_t *tvb _U_, packet_inf proto_tree_add_int(tree, hf_org_csapi_ui_IpUIAdminManager_putMessageReq_usrInteractionSessionID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -25706,7 +25680,6 @@ decode_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification(tvbu for (i_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_contactInformation=0; i_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_contactInformation < u_octet4_loop_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_contactInformation; i_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_contactInformation++) { /* Begin union "org_csapi_mm_TpBindingEntry" */ - decode_org_csapi_mm_TpBindingEntry_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mm_TpBindingEntry" */ @@ -25731,7 +25704,6 @@ decode_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification(tvbu for (i_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_return=0; i_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_return < u_octet4_loop_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_return; i_org_csapi_mm_ub_IpAppUserBinding_triggeredBindingRequestNotification_return++) { /* Begin union "org_csapi_mm_TpBindingEntry" */ - decode_org_csapi_mm_TpBindingEntry_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mm_TpBindingEntry" */ @@ -27088,7 +27060,6 @@ decode_org_csapi_gms_IpMessagingManager_enableMessagingNotification(tvbuff_t *tv get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary); /* Begin union "org_csapi_gms_TpMessagingEventCriteria" */ - decode_org_csapi_gms_TpMessagingEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMessagingEventCriteria" */ @@ -27239,7 +27210,6 @@ decode_org_csapi_gms_IpAppMessagingManager_messagingEventNotify(tvbuff_t *tvb _U get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary); /* Begin union "org_csapi_gms_TpMessagingEventInfo" */ - decode_org_csapi_gms_TpMessagingEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMessagingEventInfo" */ @@ -27463,7 +27433,6 @@ decode_org_csapi_gms_IpMailbox_getInfoProperties(tvbuff_t *tvb _U_, packet_info for (i_org_csapi_gms_IpMailbox_getInfoProperties_return=0; i_org_csapi_gms_IpMailbox_getInfoProperties_return < u_octet4_loop_org_csapi_gms_IpMailbox_getInfoProperties_return; i_org_csapi_gms_IpMailbox_getInfoProperties_return++) { /* Begin union "org_csapi_gms_TpMailboxInfoProperty" */ - decode_org_csapi_gms_TpMailboxInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMailboxInfoProperty" */ @@ -27512,7 +27481,6 @@ decode_org_csapi_gms_IpMailbox_setInfoProperties(tvbuff_t *tvb _U_, packet_info for (i_org_csapi_gms_IpMailbox_setInfoProperties_mailboxInfoProperties=0; i_org_csapi_gms_IpMailbox_setInfoProperties_mailboxInfoProperties < u_octet4_loop_org_csapi_gms_IpMailbox_setInfoProperties_mailboxInfoProperties; i_org_csapi_gms_IpMailbox_setInfoProperties_mailboxInfoProperties++) { /* Begin union "org_csapi_gms_TpMailboxInfoProperty" */ - decode_org_csapi_gms_TpMailboxInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMailboxInfoProperty" */ @@ -27717,7 +27685,6 @@ decode_org_csapi_gms_IpMessage_getInfoProperties(tvbuff_t *tvb _U_, packet_info for (i_org_csapi_gms_IpMessage_getInfoProperties_return=0; i_org_csapi_gms_IpMessage_getInfoProperties_return < u_octet4_loop_org_csapi_gms_IpMessage_getInfoProperties_return; i_org_csapi_gms_IpMessage_getInfoProperties_return++) { /* Begin union "org_csapi_gms_TpMessageInfoProperty" */ - decode_org_csapi_gms_TpMessageInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMessageInfoProperty" */ @@ -27768,7 +27735,6 @@ decode_org_csapi_gms_IpMessage_setInfoProperties(tvbuff_t *tvb _U_, packet_info for (i_org_csapi_gms_IpMessage_setInfoProperties_messageInfoProperties=0; i_org_csapi_gms_IpMessage_setInfoProperties_messageInfoProperties < u_octet4_loop_org_csapi_gms_IpMessage_setInfoProperties_messageInfoProperties; i_org_csapi_gms_IpMessage_setInfoProperties_messageInfoProperties++) { /* Begin union "org_csapi_gms_TpMessageInfoProperty" */ - decode_org_csapi_gms_TpMessageInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMessageInfoProperty" */ @@ -27932,7 +27898,6 @@ decode_org_csapi_gms_IpMailboxFolder_getInfoProperties(tvbuff_t *tvb _U_, packet for (i_org_csapi_gms_IpMailboxFolder_getInfoProperties_return=0; i_org_csapi_gms_IpMailboxFolder_getInfoProperties_return < u_octet4_loop_org_csapi_gms_IpMailboxFolder_getInfoProperties_return; i_org_csapi_gms_IpMailboxFolder_getInfoProperties_return++) { /* Begin union "org_csapi_gms_TpFolderInfoProperty" */ - decode_org_csapi_gms_TpFolderInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpFolderInfoProperty" */ @@ -27981,7 +27946,6 @@ decode_org_csapi_gms_IpMailboxFolder_setInfoProperties(tvbuff_t *tvb _U_, packet for (i_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderInfoProperties=0; i_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderInfoProperties < u_octet4_loop_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderInfoProperties; i_org_csapi_gms_IpMailboxFolder_setInfoProperties_folderInfoProperties++) { /* Begin union "org_csapi_gms_TpFolderInfoProperty" */ - decode_org_csapi_gms_TpFolderInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpFolderInfoProperty" */ @@ -28036,7 +28000,6 @@ decode_org_csapi_gms_IpMailboxFolder_putMessage(tvbuff_t *tvb _U_, packet_info * for (i_org_csapi_gms_IpMailboxFolder_putMessage_messageInfoProperties=0; i_org_csapi_gms_IpMailboxFolder_putMessage_messageInfoProperties < u_octet4_loop_org_csapi_gms_IpMailboxFolder_putMessage_messageInfoProperties; i_org_csapi_gms_IpMailboxFolder_putMessage_messageInfoProperties++) { /* Begin union "org_csapi_gms_TpMessageInfoProperty" */ - decode_org_csapi_gms_TpMessageInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_gms_TpMessageInfoProperty" */ @@ -37265,7 +37228,6 @@ decode_org_csapi_policy_provisioning_IpPolicyDomain_createVariable(tvbuff_t *tvb giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_org_csapi_policy_provisioning_IpPolicyDomain_createVariable_variableName); /* Begin union "org_csapi_policy_TpPolicyType" */ - decode_org_csapi_policy_TpPolicyType_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_policy_TpPolicyType" */ @@ -37346,7 +37308,6 @@ decode_org_csapi_policy_provisioning_IpPolicyDomain_getVariableType(tvbuff_t *tv switch(header->rep_status) { case NO_EXCEPTION: /* Begin union "org_csapi_policy_TpPolicyType" */ - decode_org_csapi_policy_TpPolicyType_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_policy_TpPolicyType" */ @@ -42883,7 +42844,6 @@ decode_org_csapi_pam_access_IpPAMAvailability_getPreference(tvbuff_t *tvb _U_, p switch(header->rep_status) { case NO_EXCEPTION: /* Begin union "org_csapi_pam_TpPAMPreferenceData" */ - decode_org_csapi_pam_TpPAMPreferenceData_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_pam_TpPAMPreferenceData" */ @@ -42927,7 +42887,6 @@ decode_org_csapi_pam_access_IpPAMAvailability_setPreference(tvbuff_t *tvb _U_, p giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_org_csapi_pam_access_IpPAMAvailability_setPreference_operation); /* Begin union "org_csapi_pam_TpPAMPreferenceData" */ - decode_org_csapi_pam_TpPAMPreferenceData_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_pam_TpPAMPreferenceData" */ @@ -43336,7 +43295,6 @@ decode_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify(tvbuff_t *tvb _U_, p for (i_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventInfo=0; i_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventInfo < u_octet4_loop_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventInfo; i_org_csapi_pam_event_IpAppPAMEventHandler_eventNotify_eventInfo++) { /* Begin union "org_csapi_pam_TpPAMNotificationInfo" */ - decode_org_csapi_pam_TpPAMNotificationInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_pam_TpPAMNotificationInfo" */ @@ -43527,7 +43485,6 @@ decode_org_csapi_pam_event_IpPAMEventHandler_registerForEvent(tvbuff_t *tvb _U_, for (i_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_eventList=0; i_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_eventList < u_octet4_loop_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_eventList; i_org_csapi_pam_event_IpPAMEventHandler_registerForEvent_eventList++) { /* Begin union "org_csapi_pam_TpPAMEventInfo" */ - decode_org_csapi_pam_TpPAMEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_pam_TpPAMEventInfo" */ @@ -44074,7 +44031,6 @@ decode_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification(tvbuff_t for (i_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_eventInfo=0; i_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_eventInfo < u_octet4_loop_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_eventInfo; i_org_csapi_mmm_IpAppMultiMediaMessagingManager_reportNotification_eventInfo++) { /* Begin union "org_csapi_mmm_TpMessagingEventInfo" */ - decode_org_csapi_mmm_TpMessagingEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessagingEventInfo" */ @@ -44399,7 +44355,6 @@ decode_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification(tvbuff_t *t for (i_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_eventCriteria=0; i_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_eventCriteria < u_octet4_loop_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_eventCriteria; i_org_csapi_mmm_IpMultiMediaMessagingManager_createNotification_eventCriteria++) { /* Begin union "org_csapi_mmm_TpMessagingEventCriteria" */ - decode_org_csapi_mmm_TpMessagingEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessagingEventCriteria" */ @@ -44485,7 +44440,6 @@ decode_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification(tvbuff_t *t for (i_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_eventCriteria=0; i_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_eventCriteria < u_octet4_loop_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_eventCriteria; i_org_csapi_mmm_IpMultiMediaMessagingManager_changeNotification_eventCriteria++) { /* Begin union "org_csapi_mmm_TpMessagingEventCriteria" */ - decode_org_csapi_mmm_TpMessagingEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessagingEventCriteria" */ @@ -45706,7 +45660,6 @@ decode_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes(tvbuff_t *tvb _U_, packet for (i_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_headers=0; i_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_headers < u_octet4_loop_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_headers; i_org_csapi_mmm_IpAppMailbox_getMessageHeadersRes_headers++) { /* Begin union "org_csapi_mmm_TpMessageHeaderField" */ - decode_org_csapi_mmm_TpMessageHeaderField_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageHeaderField" */ @@ -46010,7 +45963,6 @@ decode_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes(tvbuff_t *tvb _U_, for (i_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_returnedProperties=0; i_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_returnedProperties < u_octet4_loop_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_returnedProperties; i_org_csapi_mmm_IpAppMailbox_getMailboxInfoPropertiesRes_returnedProperties++) { /* Begin union "org_csapi_mmm_TpMailboxInfoProperty" */ - decode_org_csapi_mmm_TpMailboxInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMailboxInfoProperty" */ @@ -46067,7 +46019,6 @@ decode_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes(tvbuff_t *tvb _U_, for (i_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_returnedProperties=0; i_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_returnedProperties < u_octet4_loop_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_returnedProperties; i_org_csapi_mmm_IpAppMailbox_getFolderInfoPropertiesRes_returnedProperties++) { /* Begin union "org_csapi_mmm_TpFolderInfoProperty" */ - decode_org_csapi_mmm_TpFolderInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpFolderInfoProperty" */ @@ -46124,7 +46075,6 @@ decode_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes(tvbuff_t *tvb _U_, for (i_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_returnedProperties=0; i_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_returnedProperties < u_octet4_loop_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_returnedProperties; i_org_csapi_mmm_IpAppMailbox_getMessageInfoPropertiesRes_returnedProperties++) { /* Begin union "org_csapi_mmm_TpMessageInfoProperty" */ - decode_org_csapi_mmm_TpMessageInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageInfoProperty" */ @@ -46181,7 +46131,6 @@ decode_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes(tvbuff_t *tvb _U_, for (i_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_propertiesUpdated=0; i_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_propertiesUpdated < u_octet4_loop_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_propertiesUpdated; i_org_csapi_mmm_IpAppMailbox_setMessageInfoPropertiesRes_propertiesUpdated++) { /* Begin union "org_csapi_mmm_TpMessageInfoProperty" */ - decode_org_csapi_mmm_TpMessageInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageInfoProperty" */ @@ -47158,7 +47107,6 @@ decode_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq(tvbuff_t *tvb _U_, pa for (i_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_properties=0; i_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_properties < u_octet4_loop_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_properties; i_org_csapi_mmm_IpMailbox_setMessageInfoPropertiesReq_properties++) { /* Begin union "org_csapi_mmm_TpMessageInfoProperty" */ - decode_org_csapi_mmm_TpMessageInfoProperty_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageInfoProperty" */ @@ -47529,7 +47477,6 @@ decode_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived(tvbuff_t *tvb _U_, for (i_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_headers=0; i_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_headers < u_octet4_loop_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_headers; i_org_csapi_mmm_IpAppMultiMediaMessaging_messageReceived_headers++) { /* Begin union "org_csapi_mmm_TpMessageHeaderField" */ - decode_org_csapi_mmm_TpMessageHeaderField_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageHeaderField" */ @@ -47594,7 +47541,6 @@ decode_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq(tvbuff_t *tvb _U_, pac for (i_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_messageTreatment=0; i_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_messageTreatment < u_octet4_loop_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_messageTreatment; i_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_messageTreatment++) { /* Begin union "org_csapi_mmm_TpMessageTreatment" */ - decode_org_csapi_mmm_TpMessageTreatment_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageTreatment" */ @@ -47617,7 +47563,6 @@ decode_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq(tvbuff_t *tvb _U_, pac for (i_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_additionalHeaders=0; i_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_additionalHeaders < u_octet4_loop_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_additionalHeaders; i_org_csapi_mmm_IpMultiMediaMessaging_sendMessageReq_additionalHeaders++) { /* Begin union "org_csapi_mmm_TpMessageHeaderField" */ - decode_org_csapi_mmm_TpMessageHeaderField_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageHeaderField" */ @@ -47856,7 +47801,6 @@ decode_org_csapi_TpAoCInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t { /* Begin union "org_csapi_TpAoCOrder" */ - decode_org_csapi_TpAoCOrder_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_TpAoCOrder" */ @@ -47894,7 +47838,6 @@ decode_org_csapi_TpAttribute_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_org_csapi_TpAttribute_AttributeName); /* Begin union "org_csapi_TpAttributeValue" */ - decode_org_csapi_TpAttributeValue_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_TpAttributeValue" */ @@ -48360,14 +48303,12 @@ decode_org_csapi_fw_TpLoadStatistic_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ { /* Begin union "org_csapi_fw_TpLoadStatisticEntityID" */ - decode_org_csapi_fw_TpLoadStatisticEntityID_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpLoadStatisticEntityID" */ giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_org_csapi_fw_TpLoadStatistic_TimeStamp); /* Begin union "org_csapi_fw_TpLoadStatisticInfo" */ - decode_org_csapi_fw_TpLoadStatisticInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpLoadStatisticInfo" */ @@ -48403,7 +48344,6 @@ decode_org_csapi_fw_TpAuthDomain_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p { /* Begin union "org_csapi_fw_TpDomainID" */ - decode_org_csapi_fw_TpDomainID_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpDomainID" */ @@ -48519,7 +48459,6 @@ decode_org_csapi_fw_TpFwMigrationServiceAvailableInfo_st(tvbuff_t *tvb _U_, pack for (i_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationAdditionalInfo=0; i_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationAdditionalInfo < u_octet4_loop_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationAdditionalInfo; i_org_csapi_fw_TpFwMigrationServiceAvailableInfo_MigrationAdditionalInfo++) { /* Begin union "org_csapi_fw_TpMigrationAdditionalInfo" */ - decode_org_csapi_fw_TpMigrationAdditionalInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_fw_TpMigrationAdditionalInfo" */ @@ -48799,7 +48738,6 @@ decode_org_csapi_cc_TpCallError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr item = proto_tree_add_uint(tree, hf_org_csapi_cc_TpCallError_ErrorType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_TpCallAdditionalErrorInfo" */ - decode_org_csapi_cc_TpCallAdditionalErrorInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAdditionalErrorInfo" */ @@ -48890,7 +48828,6 @@ decode_org_csapi_cc_TpCallTreatment_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ item = proto_tree_add_uint(tree, hf_org_csapi_cc_TpCallTreatment_ReleaseCause, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_TpCallAdditionalTreatmentInfo" */ - decode_org_csapi_cc_TpCallAdditionalTreatmentInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAdditionalTreatmentInfo" */ @@ -48942,7 +48879,6 @@ decode_org_csapi_cc_TpCallChargePlan_st(tvbuff_t *tvb _U_, packet_info *pinfo _U item = proto_tree_add_uint(tree, hf_org_csapi_cc_TpCallChargePlan_PartyToCharge, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_TpCallPartyToChargeAdditionalInfo" */ - decode_org_csapi_cc_TpCallPartyToChargeAdditionalInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallPartyToChargeAdditionalInfo" */ @@ -49022,7 +48958,6 @@ decode_org_csapi_cc_gccs_TpCallReport_st(tvbuff_t *tvb _U_, packet_info *pinfo _ item = proto_tree_add_uint(tree, hf_org_csapi_cc_gccs_TpCallReport_CallReportType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_gccs_TpCallAdditionalReportInfo" */ - decode_org_csapi_cc_gccs_TpCallAdditionalReportInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_gccs_TpCallAdditionalReportInfo" */ @@ -49048,7 +48983,6 @@ decode_org_csapi_cc_gccs_TpCallReportRequest_st(tvbuff_t *tvb _U_, packet_info * item = proto_tree_add_uint(tree, hf_org_csapi_cc_gccs_TpCallReportRequest_CallReportType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_gccs_TpCallAdditionalReportCriteria" */ - decode_org_csapi_cc_gccs_TpCallAdditionalReportCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_gccs_TpCallAdditionalReportCriteria" */ @@ -49086,7 +49020,6 @@ decode_org_csapi_cc_gccs_TpCallEventInfo_st(tvbuff_t *tvb _U_, packet_info *pinf for (i_org_csapi_cc_gccs_TpCallEventInfo_CallAppInfo=0; i_org_csapi_cc_gccs_TpCallEventInfo_CallAppInfo < u_octet4_loop_org_csapi_cc_gccs_TpCallEventInfo_CallAppInfo; i_org_csapi_cc_gccs_TpCallEventInfo_CallAppInfo++) { /* Begin union "org_csapi_cc_gccs_TpCallAppInfo" */ - decode_org_csapi_cc_gccs_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_gccs_TpCallAppInfo" */ @@ -49155,7 +49088,6 @@ decode_org_csapi_cc_gccs_TpCallTreatment_st(tvbuff_t *tvb _U_, packet_info *pinf decode_org_csapi_cc_gccs_TpCallReleaseCause_st(tvb, pinfo, tree, item, offset, header, operation, stream_is_big_endian); /* End struct "org_csapi_cc_gccs_TpCallReleaseCause" */ /* Begin union "org_csapi_cc_TpCallAdditionalTreatmentInfo" */ - decode_org_csapi_cc_TpCallAdditionalTreatmentInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAdditionalTreatmentInfo" */ @@ -49214,7 +49146,6 @@ decode_org_csapi_cc_TpCallEventRequest_st(tvbuff_t *tvb _U_, packet_info *pinfo item = proto_tree_add_uint(tree, hf_org_csapi_cc_TpCallEventRequest_CallEventType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_TpAdditionalCallEventCriteria" */ - decode_org_csapi_cc_TpAdditionalCallEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpAdditionalCallEventCriteria" */ @@ -49297,7 +49228,6 @@ decode_org_csapi_cc_TpCallEventInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ item = proto_tree_add_uint(tree, hf_org_csapi_cc_TpCallEventInfo_CallEventType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_TpCallAdditionalEventInfo" */ - decode_org_csapi_cc_TpCallAdditionalEventInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAdditionalEventInfo" */ @@ -49387,7 +49317,6 @@ decode_org_csapi_cc_TpCallNotificationInfo_st(tvbuff_t *tvb _U_, packet_info *pi for (i_org_csapi_cc_TpCallNotificationInfo_CallAppInfo=0; i_org_csapi_cc_TpCallNotificationInfo_CallAppInfo < u_octet4_loop_org_csapi_cc_TpCallNotificationInfo_CallAppInfo; i_org_csapi_cc_TpCallNotificationInfo_CallAppInfo++) { /* Begin union "org_csapi_cc_TpCallAppInfo" */ - decode_org_csapi_cc_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAppInfo" */ @@ -49435,7 +49364,6 @@ decode_org_csapi_cc_TpCallLegInfoReport_st(tvbuff_t *tvb _U_, packet_info *pinfo for (i_org_csapi_cc_TpCallLegInfoReport_CallAppInfo=0; i_org_csapi_cc_TpCallLegInfoReport_CallAppInfo < u_octet4_loop_org_csapi_cc_TpCallLegInfoReport_CallAppInfo; i_org_csapi_cc_TpCallLegInfoReport_CallAppInfo++) { /* Begin union "org_csapi_cc_TpCallAppInfo" */ - decode_org_csapi_cc_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAppInfo" */ @@ -49529,7 +49457,6 @@ decode_org_csapi_cc_mmccs_TpMediaStreamRequest_st(tvbuff_t *tvb _U_, packet_info item = proto_tree_add_uint(tree, hf_org_csapi_cc_mmccs_TpMediaStreamRequest_Direction, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest" */ - decode_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest" */ @@ -49559,7 +49486,6 @@ decode_org_csapi_cc_mmccs_TpMediaStream_st(tvbuff_t *tvb _U_, packet_info *pinfo item = proto_tree_add_uint(tree, hf_org_csapi_cc_mmccs_TpMediaStream_Direction, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest" */ - decode_org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_mmccs_TpMediaStreamDataTypeRequest" */ @@ -49691,7 +49617,6 @@ decode_org_csapi_cc_cccs_TpJoinEventInfo_st(tvbuff_t *tvb _U_, packet_info *pinf for (i_org_csapi_cc_cccs_TpJoinEventInfo_CallAppInfo=0; i_org_csapi_cc_cccs_TpJoinEventInfo_CallAppInfo < u_octet4_loop_org_csapi_cc_cccs_TpJoinEventInfo_CallAppInfo; i_org_csapi_cc_cccs_TpJoinEventInfo_CallAppInfo++) { /* Begin union "org_csapi_cc_TpCallAppInfo" */ - decode_org_csapi_cc_TpCallAppInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cc_TpCallAppInfo" */ @@ -50550,7 +50475,6 @@ decode_org_csapi_dsc_TpDataSessionChargePlan_st(tvbuff_t *tvb _U_, packet_info * { /* Begin union "org_csapi_dsc_TpDataSessionChargeOrder" */ - decode_org_csapi_dsc_TpDataSessionChargeOrder_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_dsc_TpDataSessionChargeOrder" */ @@ -50578,7 +50502,6 @@ decode_org_csapi_dsc_TpDataSessionError_st(tvbuff_t *tvb _U_, packet_info *pinfo item = proto_tree_add_uint(tree, hf_org_csapi_dsc_TpDataSessionError_ErrorType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_dsc_TpDataSessionAdditionalErrorInfo" */ - decode_org_csapi_dsc_TpDataSessionAdditionalErrorInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_dsc_TpDataSessionAdditionalErrorInfo" */ @@ -50671,7 +50594,6 @@ decode_org_csapi_dsc_TpDataSessionReport_st(tvbuff_t *tvb _U_, packet_info *pinf item = proto_tree_add_uint(tree, hf_org_csapi_dsc_TpDataSessionReport_DataSessionReportType, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_dsc_TpDataSessionAdditionalReportInfo" */ - decode_org_csapi_dsc_TpDataSessionAdditionalReportInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_dsc_TpDataSessionAdditionalReportInfo" */ @@ -51483,7 +51405,6 @@ decode_org_csapi_cs_TpApplicationDescription_st(tvbuff_t *tvb _U_, packet_info * for (i_org_csapi_cs_TpApplicationDescription_AppInformation=0; i_org_csapi_cs_TpApplicationDescription_AppInformation < u_octet4_loop_org_csapi_cs_TpApplicationDescription_AppInformation; i_org_csapi_cs_TpApplicationDescription_AppInformation++) { /* Begin union "org_csapi_cs_TpAppInformation" */ - decode_org_csapi_cs_TpAppInformation_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cs_TpAppInformation" */ @@ -51499,7 +51420,6 @@ decode_org_csapi_cs_TpChargingParameter_st(tvbuff_t *tvb _U_, packet_info *pinfo proto_tree_add_int(tree, hf_org_csapi_cs_TpChargingParameter_ParameterID, tvb, *offset-4, 4, get_CDR_long(tvb,offset,stream_is_big_endian, boundary)); /* Begin union "org_csapi_cs_TpChargingParameterValue" */ - decode_org_csapi_cs_TpChargingParameterValue_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_cs_TpChargingParameterValue" */ @@ -51580,7 +51500,6 @@ decode_org_csapi_policy_TpPolicyType_TpPolicyRecordType_st(tvbuff_t *tvb _U_, pa for (i_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Types=0; i_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Types < u_octet4_loop_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Types; i_org_csapi_policy_TpPolicyType_TpPolicyRecordType_Types++) { /* Begin union "org_csapi_policy_TpPolicyType" */ - decode_org_csapi_policy_TpPolicyType_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_policy_TpPolicyType" */ @@ -51607,7 +51526,6 @@ decode_org_csapi_policy_TpPolicyType_TpPolicyListType_st(tvbuff_t *tvb _U_, pack for (i_org_csapi_policy_TpPolicyType_TpPolicyListType_ElementType=0; i_org_csapi_policy_TpPolicyType_TpPolicyListType_ElementType < u_octet4_loop_org_csapi_policy_TpPolicyType_TpPolicyListType_ElementType; i_org_csapi_policy_TpPolicyType_TpPolicyListType_ElementType++) { /* Begin union "org_csapi_policy_TpPolicyType" */ - decode_org_csapi_policy_TpPolicyType_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_policy_TpPolicyType" */ @@ -51623,7 +51541,6 @@ decode_org_csapi_policy_TpPolicyVar_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_org_csapi_policy_TpPolicyVar_VarName); /* Begin union "org_csapi_policy_TpPolicyType" */ - decode_org_csapi_policy_TpPolicyType_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_policy_TpPolicyType" */ @@ -51680,7 +51597,6 @@ decode_org_csapi_pam_TpPAMAttribute_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ giop_add_CDR_string(tree, tvb, offset, stream_is_big_endian, boundary, hf_org_csapi_pam_TpPAMAttribute_AttributeName); /* Begin union "org_csapi_TpAttributeValue" */ - decode_org_csapi_TpAttributeValue_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_TpAttributeValue" */ @@ -51748,7 +51664,6 @@ decode_org_csapi_pam_TpPAMContext_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, (void)item; /* Avoid coverity param_set_but_unused parse warning */ /* Begin union "org_csapi_pam_TpPAMContextData" */ - decode_org_csapi_pam_TpPAMContextData_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_pam_TpPAMContextData" */ @@ -52735,7 +52650,6 @@ decode_org_csapi_pam_TpPAMErrorInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ item = proto_tree_add_uint(tree, hf_org_csapi_pam_TpPAMErrorInfo_Cause, tvb, *offset-4, 4, u_octet4); /* Begin union "org_csapi_pam_TpPAMNotificationInfo" */ - decode_org_csapi_pam_TpPAMNotificationInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_pam_TpPAMNotificationInfo" */ @@ -52946,7 +52860,6 @@ decode_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_st(tvbuff_t *tvb _U_, packet for (i_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_ExtendedHeaderInformation=0; i_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_ExtendedHeaderInformation < u_octet4_loop_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_ExtendedHeaderInformation; i_org_csapi_mmm_TpNewMailboxMessageArrivedInfo_ExtendedHeaderInformation++) { /* Begin union "org_csapi_mmm_TpMessageHeaderField" */ - decode_org_csapi_mmm_TpMessageHeaderField_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageHeaderField" */ @@ -53051,7 +52964,6 @@ decode_org_csapi_mmm_TpMessagingNotificationRequested_st(tvbuff_t *tvb _U_, pack for (i_org_csapi_mmm_TpMessagingNotificationRequested_EventCriteria=0; i_org_csapi_mmm_TpMessagingNotificationRequested_EventCriteria < u_octet4_loop_org_csapi_mmm_TpMessagingNotificationRequested_EventCriteria; i_org_csapi_mmm_TpMessagingNotificationRequested_EventCriteria++) { /* Begin union "org_csapi_mmm_TpMessagingEventCriteria" */ - decode_org_csapi_mmm_TpMessagingEventCriteria_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessagingEventCriteria" */ @@ -53135,7 +53047,6 @@ decode_org_csapi_mmm_TpNewMessageArrivedInfo_st(tvbuff_t *tvb _U_, packet_info * for (i_org_csapi_mmm_TpNewMessageArrivedInfo_Headers=0; i_org_csapi_mmm_TpNewMessageArrivedInfo_Headers < u_octet4_loop_org_csapi_mmm_TpNewMessageArrivedInfo_Headers; i_org_csapi_mmm_TpNewMessageArrivedInfo_Headers++) { /* Begin union "org_csapi_mmm_TpMessageHeaderField" */ - decode_org_csapi_mmm_TpMessageHeaderField_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpMessageHeaderField" */ @@ -53369,7 +53280,6 @@ decode_org_csapi_TpAttributeValue_un(tvbuff_t *tvb _U_, packet_info *pinfo _U_, if (disc_s_TpAttributeValue == 0 ) { /* Begin union "org_csapi_TpSimpleAttributeValue" */ - decode_org_csapi_TpSimpleAttributeValue_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_TpSimpleAttributeValue" */ @@ -54164,7 +54074,6 @@ decode_org_csapi_cc_TpCallAdditionalTreatmentInfo_un(tvbuff_t *tvb _U_, packet_i if (disc_s_TpCallAdditionalTreatmentInfo == 2 ) { /* Begin union "org_csapi_ui_TpUIInfo" */ - decode_org_csapi_ui_TpUIInfo_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_ui_TpUIInfo" */ @@ -56767,7 +56676,6 @@ decode_org_csapi_mmm_TpMessageTreatment_un(tvbuff_t *tvb _U_, packet_info *pinfo if (disc_s_TpMessageTreatment == 3 ) { /* Begin union "org_csapi_mmm_TpDeliveryTime" */ - decode_org_csapi_mmm_TpDeliveryTime_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); /* End union "org_csapi_mmm_TpDeliveryTime" */ diff --git a/epan/dissectors/packet-tango.c b/epan/dissectors/packet-tango.c index 38e40fce70..8ff5418bd3 100644 --- a/epan/dissectors/packet-tango.c +++ b/epan/dissectors/packet-tango.c @@ -454,15 +454,13 @@ static const value_string Tango_DispLevel[] = { static void decode_ex_Tango_DevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { - proto_item *item _U_; + proto_item *item = NULL; /* Operation specific Variable declarations Begin */ guint32 u_octet4_loop_Tango_DevFailed_errors; guint32 i_Tango_DevFailed_errors; /* Operation specific Variable declarations End */ - (void)item; /* Avoid coverity param_set_but_unused parse warning */ - u_octet4_loop_Tango_DevFailed_errors = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); /* coverity[returned_pointer] */ item = proto_tree_add_uint(tree, hf_Tango_DevFailed_errors_loop, tvb,*offset-4, 4, u_octet4_loop_Tango_DevFailed_errors); @@ -480,15 +478,13 @@ decode_ex_Tango_DevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree static void decode_ex_Tango_MultiDevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { - proto_item *item _U_; + proto_item *item = NULL; /* Operation specific Variable declarations Begin */ guint32 u_octet4_loop_Tango_MultiDevFailed_errors; guint32 i_Tango_MultiDevFailed_errors; /* Operation specific Variable declarations End */ - (void)item; /* Avoid coverity param_set_but_unused parse warning */ - u_octet4_loop_Tango_MultiDevFailed_errors = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); /* coverity[returned_pointer] */ item = proto_tree_add_uint(tree, hf_Tango_MultiDevFailed_errors_loop, tvb,*offset-4, 4, u_octet4_loop_Tango_MultiDevFailed_errors); diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 3028825fef..a920aa0ef2 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -397,8 +397,10 @@ class wireshark_gen_C: for m in ex.members(): for decl in m.declarators(): if (m.memberType().unalias().kind() == idltype.tk_sequence): + if (self.isSeqNativeType(m.memberType().unalias().seqType())): + self.st.out(self.template_hf, name=sname + "_" + decl.identifier()) self.st.out(self.template_hf, name=sname + "_" + decl.identifier() + "_loop") - else: + elif (m.memberType().unalias().kind() != idltype.tk_struct): self.st.out(self.template_hf, name=sname + "_" + decl.identifier()) # @@ -769,19 +771,33 @@ class wireshark_gen_C: if self.DEBUG: print "XXX genExHelper" + # check to see if we need an item + need_item = 0 + for m in ex.members(): + if (self.isItemVarType(m.memberType())): + need_item = 1 + break + + sname = self.namespace(ex, "_") self.curr_sname = sname # update current opnode/exnode scoped name if not self.fn_hash_built: self.fn_hash[sname] = [] # init empty list as val for this sname key # but only if the fn_hash is not already built - self.st.out(self.template_exception_helper_function_start, sname=sname, exname=ex.repoId()) + if (need_item): + self.st.out(self.template_exception_helper_function_start_item, sname=sname, exname=ex.repoId()) + else: + self.st.out(self.template_exception_helper_function_start_no_item, sname=sname, exname=ex.repoId()) self.st.inc_indent() if (len(self.fn_hash[sname]) > 0): self.st.out(self.template_helper_function_vars_start) self.dumpCvars(sname) - self.st.out(self.template_helper_function_vars_end ) + if (need_item): + self.st.out(self.template_helper_function_vars_end_item ) + else: + self.st.out(self.template_helper_function_vars_end ) for m in ex.members(): if self.DEBUG: @@ -1115,6 +1131,26 @@ class wireshark_gen_C: else: return 0 + def isItemVarType(self,type): + + pt = type.unalias().kind() # param CDR type + + if self.DEBUG: + print "XXX isItemVarType: kind = " , pt + + elif pt == idltype.tk_fixed: + return 1 + elif pt == idltype.tk_any: + return 1 + elif pt == idltype.tk_enum: + return 1 + elif pt == idltype.tk_struct: + return 1 + elif pt == idltype.tk_sequence: + return 1 + else: + return 0 + # # getCDR() @@ -1375,7 +1411,7 @@ class wireshark_gen_C: elif pt == idltype.tk_alias: if self.DEBUG: print "XXXXX Alias type hf XXXXX " , type - self.get_CDR_alias_hf(type,pn) + self.get_CDR_alias_hf(type,desc,filter,pn) else: self.genWARNING("Unknown typecode = " + '%i ' % pt) # put comment in source code @@ -1446,7 +1482,7 @@ class wireshark_gen_C: if (self.isSeqNativeType(type.unalias().seqType())): self.getCDR_hf(type.unalias().seqType(),desc,filter,pn) - def get_CDR_alias_hf(self,type,pn): + def get_CDR_alias_hf(self,type,desc,filter,pn): if self.DEBUG: print "XXX get_CDR_alias_hf, type = " ,type , " pn = " , pn print "XXX get_CDR_alias_hf, type.decl() = " ,type.decl() @@ -1462,7 +1498,7 @@ class wireshark_gen_C: #self.st.out(self.template_get_CDR_array_start, aname=pn, aval=string_indices) #self.addvar(self.c_i + pn + ";") #self.st.inc_indent() - self.getCDR_hf(type.decl().alias().aliasType(), pn ) + self.getCDR_hf(type.decl().alias().aliasType(), desc, filter, pn ) #self.st.dec_indent() #self.st.out(self.template_get_CDR_array_end) @@ -1473,7 +1509,7 @@ class wireshark_gen_C: print "XXX get_CDR_alias_hf, type = " ,type , " pn = " , pn print "XXX get_CDR_alias_hf, type.decl() = " ,type.decl() - self.getCDR_hf(type, decl.identifier() ) + self.getCDR_hf(type, desc, filter, decl.identifier() ) # @@ -1764,10 +1800,13 @@ class wireshark_gen_C: # def get_CDR_sequence_octet(self,type, pn): + if self.DEBUG: + print "XXX get_CDR_sequence_octet" + self.st.out(self.template_get_CDR_sequence_length, seqname=pn) self.st.out(self.template_get_CDR_sequence_octet, seqname=pn) self.addvar(self.c_i_lim + pn + ";") - self.addvar("gchar * binary_seq_" + pn + ";") + self.addvar("const gchar * binary_seq_" + pn + ";") self.addvar("gchar * text_seq_" + pn + ";") @@ -2030,6 +2069,9 @@ class wireshark_gen_C: (void)item; /* Avoid coverity param_set_but_unused parse warning */ """ + template_helper_function_vars_end_item = """\ +/* Operation specific Variable declarations End */ +""" template_helper_function_start = """\ static void @@ -2440,6 +2482,7 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) { {&hf_@hfname@_loop, {"Seq length of @descname@","giop-@dissector_name@.@filtername@.size",FT_UINT32,BASE_DEC,NULL,0x0,NULL,HFILL}},""" template_get_CDR_sequence_octet_hf = """\ + {&hf_@hfname@_loop, {"Seq length of @descname@","giop-@dissector_name@.@filtername@.size",FT_UINT32,BASE_DEC,NULL,0x0,NULL,HFILL}}, {&hf_@hfname@, {"@descname@","giop-@dissector_name@.@filtername@",FT_UINT8,BASE_HEX,NULL,0x0,NULL,HFILL}},""" # @@ -2700,7 +2743,7 @@ if (strcmp(header->exception_id, "@exname@") == 0) { # - template_exception_helper_function_start = """\ + template_exception_helper_function_start_no_item = """\ /* Exception = @exname@ */ static void decode_ex_@sname@(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) @@ -2708,6 +2751,14 @@ decode_ex_@sname@(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U proto_item *item _U_; """ + template_exception_helper_function_start_item = """\ +/* Exception = @exname@ */ +static void +decode_ex_@sname@(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) +{ + proto_item *item = NULL; +""" + template_exception_helper_function_end = """\ } """ @@ -2988,7 +3039,7 @@ decode_@name@_st(tvb, pinfo, tree, item, offset, header, operation, stream_is_bi /* Union = @unname@ */ static void decode_@name@_un(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_); """ - template_decode_union = """ + template_decode_union = """\ decode_@name@_un(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian); """ |