diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-05-29 16:32:08 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-05-29 16:32:08 +0000 |
| commit | 5e85b3550657e6637e7fed54f0bb68580a907ceb (patch) | |
| tree | 80d5679d1f7d810be35da984dc38b032b7215688 /plugins | |
| parent | 667fed59159c79cf87c688f031845cbf7343eedc (diff) | |
Ethereal->Wireshark
svn path=/trunk/; revision=18239
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 108 | ||||
| -rw-r--r-- | plugins/giop/packet-parlay.c | 26 | ||||
| -rw-r--r-- | plugins/giop/packet-tango.c | 407 |
3 files changed, 16 insertions, 525 deletions
diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 5c877eefe0..0512772053 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -9,7 +9,7 @@ /* * Wireshark - Network traffic analyzer * By Gerald Combs - * Copyright 1999 Gerald Combs + * Copyright 1999 - 2006 Gerald Combs */ @@ -57,15 +57,12 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Struct prototype declaration Start */ - /* Struct prototype declaration End */ - /* Union prototype declaration Start */ - /* Union prototype declaration End */ @@ -77,23 +74,19 @@ static int proto_coseventcomm = -1; static gint ett_coseventcomm = -1; - /* Initialise the initial Alignment */ static guint32 boundary = GIOP_HEADER_SIZE; /* initial value */ - /* Initialise the Registered fields */ /* TODO - Use registered fields */ - /* * IDL Operations Start */ - static const char CosEventComm_PushConsumer_push_op[] = "push" ; static const char CosEventComm_PushConsumer_disconnect_push_consumer_op[] = "disconnect_push_consumer" ; @@ -107,34 +100,28 @@ static const char CosEventComm_PullConsumer_disconnect_pull_consumer_op[] = "dis * IDL Operations End */ - /* Begin Exception (containing members) String Declare */ /* End Exception (containing members) String Declare */ - /* * IDL Attributes Start */ - /* * IDL Attributes End */ - /* * IDL Enums Start */ - /* * IDL Enums End */ - /* Begin Exception Helper Functions */ @@ -142,8 +129,6 @@ static const char CosEventComm_PullConsumer_disconnect_pull_consumer_op[] = "dis /* End Exception Helper Functions */ - - /* * Main delegator for exception handling * @@ -159,25 +144,19 @@ static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, - return FALSE; /* user exception not found */ } - /* Begin Attribute Helper Functions */ - /* End Attribute Helper Functions */ - - /* * IDL:omg.org/CosEventComm/PushConsumer/push:1.0 */ - static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -188,7 +167,6 @@ static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -197,7 +175,6 @@ static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - break; case Reply: @@ -206,10 +183,8 @@ static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -222,8 +197,6 @@ static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info g_warning("Unknown Exception "); - - break; @@ -237,20 +210,16 @@ static void decode_CosEventComm_PushConsumer_push(tvbuff_t *tvb _U_, packet_info g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:omg.org/CosEventComm/PushConsumer/disconnect_push_consumer:1.0 */ - static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -261,7 +230,6 @@ static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t * /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -276,10 +244,8 @@ static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t * case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -292,8 +258,6 @@ static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t * g_warning("Unknown Exception "); - - break; @@ -307,20 +271,16 @@ static void decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvbuff_t * g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:omg.org/CosEventComm/PushSupplier/disconnect_push_supplier:1.0 */ - static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -331,7 +291,6 @@ static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t * /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -346,10 +305,8 @@ static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t * case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -362,8 +319,6 @@ static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t * g_warning("Unknown Exception "); - - break; @@ -377,20 +332,16 @@ static void decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvbuff_t * g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:omg.org/CosEventComm/PullSupplier/pull:1.0 */ - static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -401,7 +352,6 @@ static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -418,7 +368,6 @@ static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - break; case USER_EXCEPTION: @@ -431,8 +380,6 @@ static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info g_warning("Unknown Exception "); - - break; @@ -446,20 +393,16 @@ static void decode_CosEventComm_PullSupplier_pull(tvbuff_t *tvb _U_, packet_info g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:omg.org/CosEventComm/PullSupplier/try_pull:1.0 */ - static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -471,7 +414,6 @@ static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_ /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -488,7 +430,6 @@ static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_ get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - u_octet1 = get_CDR_boolean(tvb,offset); if (tree) { proto_tree_add_text(tree,tvb,*offset-1,1,"has_event = %u",u_octet1); @@ -506,8 +447,6 @@ static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_ g_warning("Unknown Exception "); - - break; @@ -521,20 +460,16 @@ static void decode_CosEventComm_PullSupplier_try_pull(tvbuff_t *tvb _U_, packet_ g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:omg.org/CosEventComm/PullSupplier/disconnect_pull_supplier:1.0 */ - static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -545,7 +480,6 @@ static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t * /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -560,10 +494,8 @@ static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t * case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -576,8 +508,6 @@ static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t * g_warning("Unknown Exception "); - - break; @@ -591,20 +521,16 @@ static void decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvbuff_t * g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:omg.org/CosEventComm/PullConsumer/disconnect_pull_consumer:1.0 */ - static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -615,7 +541,6 @@ static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t * /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -630,10 +555,8 @@ static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t * case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -646,8 +569,6 @@ static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t * g_warning("Unknown Exception "); - - break; @@ -661,15 +582,12 @@ static void decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvbuff_t * g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * Called once we accept the packet as being for us; it sets the * Protocol and Info columns and creates the top-level protocol @@ -713,14 +631,11 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr } - - switch(header->message_type) { case Request: case Reply: - if (strcmp(operation, CosEventComm_PushConsumer_push_op) == 0 && (!idlname || strcmp(idlname, "CosEventComm/PushConsumer") == 0)) { tree = start_dissecting(tvb, pinfo, ptree, offset); @@ -787,14 +702,12 @@ static gboolean dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tr } /* switch */ - return FALSE; } /* End of main dissector */ - /* Register the protocol with Wireshark */ void proto_register_giop_coseventcomm(void) { @@ -827,57 +740,40 @@ void proto_register_giop_coseventcomm(void) { } - - /* register me as handler for these interfaces */ void proto_register_handoff_giop_coseventcomm(void) { - /* Register for Explicit Dissection */ register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PullConsumer", proto_coseventcomm ); /* explicit dissector */ - - - /* Register for Explicit Dissection */ register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PullSupplier", proto_coseventcomm ); /* explicit dissector */ - - - /* Register for Explicit Dissection */ register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PushConsumer", proto_coseventcomm ); /* explicit dissector */ - - - /* Register for Explicit Dissection */ register_giop_user_module(dissect_coseventcomm, "COSEVENTCOMM", "CosEventComm/PushSupplier", proto_coseventcomm ); /* explicit dissector */ - - - /* Register for Heuristic Dissection */ register_giop_user(dissect_coseventcomm, "COSEVENTCOMM" ,proto_coseventcomm); /* heuristic dissector */ - } - #ifndef ENABLE_STATIC G_MODULE_EXPORT void @@ -892,7 +788,5 @@ G_MODULE_EXPORT void plugin_reg_handoff(void){ proto_register_handoff_giop_coseventcomm(); } - #endif - diff --git a/plugins/giop/packet-parlay.c b/plugins/giop/packet-parlay.c index e28e414fa1..5b7d57d8d1 100644 --- a/plugins/giop/packet-parlay.c +++ b/plugins/giop/packet-parlay.c @@ -9,7 +9,7 @@ /* * Wireshark - Network traffic analyzer * By Gerald Combs - * Copyright 1999 Gerald Combs + * Copyright 1999 - 2006 Gerald Combs */ @@ -74628,7 +74628,7 @@ static void decode_org_csapi_pam_access_IpPAMIdentityPresence_setIdentityPresenc s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" PRId64,s_octet8); } u_octet4_loop_authToken = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -75121,7 +75121,7 @@ static void decode_org_csapi_pam_access_IpPAMAgentPresence_setAgentPresenceExpir s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" PRId64,s_octet8); } u_octet4_loop_authToken = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -75245,7 +75245,7 @@ static void decode_org_csapi_pam_access_IpPAMAgentPresence_setCapabilityPresence s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"expiresIn = %" PRId64,s_octet8); } u_octet4_loop_authToken = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -93284,7 +93284,7 @@ static void decode_org_csapi_pam_TpPAMAttribute_st(tvbuff_t *tvb _U_, packet_inf s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAttribute_ExpiresIn = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAttribute_ExpiresIn = %" PRId64,s_octet8); } } @@ -94484,7 +94484,7 @@ static void decode_org_csapi_pam_TpPAMACPSEventData_st(tvbuff_t *tvb _U_, packet s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMACPSEventData_ReportingPeriod = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMACPSEventData_ReportingPeriod = %" PRId64,s_octet8); } } @@ -94624,7 +94624,7 @@ static void decode_org_csapi_pam_TpPAMAPSEventData_st(tvbuff_t *tvb _U_, packet_ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAPSEventData_ReportingPeriod = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAPSEventData_ReportingPeriod = %" PRId64,s_octet8); } } @@ -94755,7 +94755,7 @@ static void decode_org_csapi_pam_TpPAMIPSEventData_st(tvbuff_t *tvb _U_, packet_ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMIPSEventData_ReportingPeriod = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMIPSEventData_ReportingPeriod = %" PRId64,s_octet8); } } @@ -94904,7 +94904,7 @@ static void decode_org_csapi_pam_TpPAMAVCEventData_st(tvbuff_t *tvb _U_, packet_ s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAVCEventData_ReportingPeriod = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMAVCEventData_ReportingPeriod = %" PRId64,s_octet8); } } @@ -95031,7 +95031,7 @@ static void decode_org_csapi_pam_TpPAMWCEventData_st(tvbuff_t *tvb _U_, packet_i s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMWCEventData_ReportingPeriod = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"TpPAMWCEventData_ReportingPeriod = %" PRId64,s_octet8); } } @@ -96143,7 +96143,7 @@ static void decode_org_csapi_TpSimpleAttributeValue_un(tvbuff_t *tvb _U_, packet s_octet8 = get_CDR_long_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"Int64Value = PRIo64",s_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"Int64Value = %" PRId64,s_octet8); } return; /* End Compare for this discriminant type */ @@ -96153,7 +96153,7 @@ static void decode_org_csapi_TpSimpleAttributeValue_un(tvbuff_t *tvb _U_, packet u_octet8 = get_CDR_ulong_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { - proto_tree_add_text(tree,tvb,*offset-8,8,"UnsignedInt64Value = PRIu64",u_octet8); + proto_tree_add_text(tree,tvb,*offset-8,8,"UnsignedInt64Value = %" PRIu64,u_octet8); } return; /* End Compare for this discriminant type */ @@ -107880,7 +107880,7 @@ static gboolean dissect_parlay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pt -/* Register the protocol with Ethereal */ +/* Register the protocol with Wireshark */ void proto_register_giop_parlay(void) { diff --git a/plugins/giop/packet-tango.c b/plugins/giop/packet-tango.c index a6f443aa76..88948a1058 100644 --- a/plugins/giop/packet-tango.c +++ b/plugins/giop/packet-tango.c @@ -9,7 +9,7 @@ /* * Wireshark - Network traffic analyzer * By Gerald Combs - * Copyright 1999 Gerald Combs + * Copyright 1999 - 2006 Gerald Combs */ @@ -57,176 +57,127 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre /* Struct prototype declaration Start */ - - /* Struct = IDL:Tango/DevVarLongStringArray:1.0 */ static void decode_Tango_DevVarLongStringArray_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevVarDoubleStringArray:1.0 */ static void decode_Tango_DevVarDoubleStringArray_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/TimeVal:1.0 */ static void decode_Tango_TimeVal_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevCmdInfo:1.0 */ static void decode_Tango_DevCmdInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevCmdInfo_2:1.0 */ static void decode_Tango_DevCmdInfo_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevError:1.0 */ static void decode_Tango_DevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/NamedDevError:1.0 */ static void decode_Tango_NamedDevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeConfig:1.0 */ static void decode_Tango_AttributeConfig_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeConfig_2:1.0 */ static void decode_Tango_AttributeConfig_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeValue:1.0 */ static void decode_Tango_AttributeValue_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeDim:1.0 */ static void decode_Tango_AttributeDim_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeValue_3:1.0 */ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/ChangeEventProp:1.0 */ static void decode_Tango_ChangeEventProp_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/PeriodicEventProp:1.0 */ static void decode_Tango_PeriodicEventProp_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/ArchiveEventProp:1.0 */ static void decode_Tango_ArchiveEventProp_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/EventProperties:1.0 */ static void decode_Tango_EventProperties_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeAlarm:1.0 */ static void decode_Tango_AttributeAlarm_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/AttributeConfig_3:1.0 */ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevInfo:1.0 */ static void decode_Tango_DevInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevInfo_3:1.0 */ static void decode_Tango_DevInfo_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevCmdHistory:1.0 */ static void decode_Tango_DevCmdHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevAttrHistory:1.0 */ static void decode_Tango_DevAttrHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - - /* Struct = IDL:Tango/DevAttrHistory_3:1.0 */ static void decode_Tango_DevAttrHistory_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_); - /* Struct prototype declaration End */ - /* Union prototype declaration Start */ - /* Union prototype declaration End */ @@ -238,23 +189,19 @@ static int proto_tango = -1; static gint ett_tango = -1; - /* Initialise the initial Alignment */ static guint32 boundary = GIOP_HEADER_SIZE; /* initial value */ - /* Initialise the Registered fields */ /* TODO - Use registered fields */ - /* * IDL Operations Start */ - static const char Tango_Device_command_inout_op[] = "command_inout" ; static const char Tango_Device_get_attribute_config_op[] = "get_attribute_config" ; @@ -284,7 +231,6 @@ static const char Tango_Device_3_set_attribute_config_3_op[] = "set_attribute_co * IDL Operations End */ - /* Begin Exception (containing members) String Declare */ @@ -293,11 +239,9 @@ static const char user_exception_Tango_MultiDevFailed[] = "IDL:Tango/MultiDevFai /* End Exception (containing members) String Declare */ - /* * IDL Attributes Start */ - static const char get_Tango_Device_name_at[] = "_get_name" ; static const char get_Tango_Device_description_at[] = "_get_description" ; @@ -309,16 +253,13 @@ static const char get_Tango_Device_adm_name_at[] = "_get_adm_name" ; * IDL Attributes End */ - /* * IDL Enums Start */ - /* * Enum = IDL:Tango/AttrQuality:1.0 */ - static const value_string Tango_AttrQuality[] = { @@ -330,11 +271,9 @@ static const value_string Tango_AttrQuality[] = { { 0, NULL }, }; - /* * Enum = IDL:Tango/AttrWriteType:1.0 */ - static const value_string Tango_AttrWriteType[] = { @@ -345,11 +284,9 @@ static const value_string Tango_AttrWriteType[] = { { 0, NULL }, }; - /* * Enum = IDL:Tango/AttrDataFormat:1.0 */ - static const value_string Tango_AttrDataFormat[] = { @@ -359,11 +296,9 @@ static const value_string Tango_AttrDataFormat[] = { { 0, NULL }, }; - /* * Enum = IDL:Tango/DevSource:1.0 */ - static const value_string Tango_DevSource[] = { @@ -373,11 +308,9 @@ static const value_string Tango_DevSource[] = { { 0, NULL }, }; - /* * Enum = IDL:Tango/ErrSeverity:1.0 */ - static const value_string Tango_ErrSeverity[] = { @@ -387,11 +320,9 @@ static const value_string Tango_ErrSeverity[] = { { 0, NULL }, }; - /* * Enum = IDL:Tango/DevState:1.0 */ - static const value_string Tango_DevState[] = { @@ -412,11 +343,9 @@ static const value_string Tango_DevState[] = { { 0, NULL }, }; - /* * Enum = IDL:Tango/DispLevel:1.0 */ - static const value_string Tango_DispLevel[] = { @@ -425,16 +354,13 @@ static const value_string Tango_DispLevel[] = { { 0, NULL }, }; - /* * IDL Enums End */ - /* Begin Exception Helper Functions */ - /* Exception = IDL:Tango/DevFailed:1.0 */ static void decode_ex_Tango_DevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -449,10 +375,8 @@ static void decode_ex_Tango_DevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4_loop_DevFailed_errors = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of DevFailed_errors = %u",u_octet4_loop_DevFailed_errors); @@ -466,14 +390,12 @@ static void decode_ex_Tango_DevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, decode_Tango_DevError_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevError" */ } } - /* Exception = IDL:Tango/MultiDevFailed:1.0 */ static void decode_ex_Tango_MultiDevFailed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -488,10 +410,8 @@ static void decode_ex_Tango_MultiDevFailed(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4_loop_MultiDevFailed_errors = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of MultiDevFailed_errors = %u",u_octet4_loop_MultiDevFailed_errors); @@ -505,7 +425,6 @@ static void decode_ex_Tango_MultiDevFailed(tvbuff_t *tvb _U_, packet_info *pinfo decode_Tango_NamedDevError_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_NamedDevError" */ } @@ -515,8 +434,6 @@ static void decode_ex_Tango_MultiDevFailed(tvbuff_t *tvb _U_, packet_info *pinfo /* End Exception Helper Functions */ - - /* * Main delegator for exception handling * @@ -530,14 +447,12 @@ static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, if (!header->exception_id) return FALSE; - if (strcmp(header->exception_id, user_exception_Tango_DevFailed) == 0) { tree = start_dissecting(tvb, pinfo, ptree, offset); decode_ex_Tango_DevFailed(tvb, pinfo, tree, offset, header, operation); /* IDL:Tango/DevFailed:1.0 */ return TRUE; } - if (strcmp(header->exception_id, user_exception_Tango_MultiDevFailed) == 0) { tree = start_dissecting(tvb, pinfo, ptree, offset); decode_ex_Tango_MultiDevFailed(tvb, pinfo, tree, offset, header, operation); /* IDL:Tango/MultiDevFailed:1.0 */ @@ -546,16 +461,13 @@ static gboolean decode_user_exception(tvbuff_t *tvb _U_, packet_info *pinfo _U_, - return FALSE; /* user exception not found */ } - /* Begin Attribute Helper Functions */ - /* Attribute = IDL:Tango/Device/name:1.0 */ static void decode_get_Tango_Device_name_at(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -570,10 +482,8 @@ static void decode_get_Tango_Device_name_at(tvbuff_t *tvb _U_, packet_info *pinf /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"name (%u) = %s", @@ -600,10 +510,8 @@ static void decode_get_Tango_Device_description_at(tvbuff_t *tvb _U_, packet_inf /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"description (%u) = %s", @@ -629,10 +537,8 @@ static void decode_get_Tango_Device_state_at(tvbuff_t *tvb _U_, packet_info *pin /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary); if (tree) { @@ -656,10 +562,8 @@ static void decode_get_Tango_Device_status_at(tvbuff_t *tvb _U_, packet_info *pi /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"status (%u) = %s", @@ -686,10 +590,8 @@ static void decode_get_Tango_Device_adm_name_at(tvbuff_t *tvb _U_, packet_info * /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"adm_name (%u) = %s", @@ -704,13 +606,10 @@ static void decode_get_Tango_Device_adm_name_at(tvbuff_t *tvb _U_, packet_info * /* End Attribute Helper Functions */ - - /* * IDL:Tango/Device/command_inout:1.0 */ - static void decode_Tango_Device_command_inout(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -723,7 +622,6 @@ static void decode_Tango_Device_command_inout(tvbuff_t *tvb _U_, packet_info *pi /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -741,7 +639,6 @@ static void decode_Tango_Device_command_inout(tvbuff_t *tvb _U_, packet_info *pi get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - break; case Reply: @@ -752,7 +649,6 @@ static void decode_Tango_Device_command_inout(tvbuff_t *tvb _U_, packet_info *pi get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - break; case USER_EXCEPTION: @@ -765,8 +661,6 @@ static void decode_Tango_Device_command_inout(tvbuff_t *tvb _U_, packet_info *pi g_warning("Unknown Exception "); - - break; @@ -780,20 +674,16 @@ static void decode_Tango_Device_command_inout(tvbuff_t *tvb _U_, packet_info *pi g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/get_attribute_config:1.0 */ - static void decode_Tango_Device_get_attribute_config(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -810,7 +700,6 @@ static void decode_Tango_Device_get_attribute_config(tvbuff_t *tvb _U_, packet_i /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -856,7 +745,6 @@ static void decode_Tango_Device_get_attribute_config(tvbuff_t *tvb _U_, packet_i decode_Tango_AttributeConfig_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeConfig" */ } @@ -873,8 +761,6 @@ static void decode_Tango_Device_get_attribute_config(tvbuff_t *tvb _U_, packet_i g_warning("Unknown Exception "); - - break; @@ -888,20 +774,16 @@ static void decode_Tango_Device_get_attribute_config(tvbuff_t *tvb _U_, packet_i g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/set_attribute_config:1.0 */ - static void decode_Tango_Device_set_attribute_config(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -914,7 +796,6 @@ static void decode_Tango_Device_set_attribute_config(tvbuff_t *tvb _U_, packet_i /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -934,7 +815,6 @@ static void decode_Tango_Device_set_attribute_config(tvbuff_t *tvb _U_, packet_i decode_Tango_AttributeConfig_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeConfig" */ } @@ -947,10 +827,8 @@ static void decode_Tango_Device_set_attribute_config(tvbuff_t *tvb _U_, packet_i case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -963,8 +841,6 @@ static void decode_Tango_Device_set_attribute_config(tvbuff_t *tvb _U_, packet_i g_warning("Unknown Exception "); - - break; @@ -978,20 +854,16 @@ static void decode_Tango_Device_set_attribute_config(tvbuff_t *tvb _U_, packet_i g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/read_attributes:1.0 */ - static void decode_Tango_Device_read_attributes(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1008,7 +880,6 @@ static void decode_Tango_Device_read_attributes(tvbuff_t *tvb _U_, packet_info * /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1054,7 +925,6 @@ static void decode_Tango_Device_read_attributes(tvbuff_t *tvb _U_, packet_info * decode_Tango_AttributeValue_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue" */ } @@ -1071,8 +941,6 @@ static void decode_Tango_Device_read_attributes(tvbuff_t *tvb _U_, packet_info * g_warning("Unknown Exception "); - - break; @@ -1086,20 +954,16 @@ static void decode_Tango_Device_read_attributes(tvbuff_t *tvb _U_, packet_info * g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/write_attributes:1.0 */ - static void decode_Tango_Device_write_attributes(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1112,7 +976,6 @@ static void decode_Tango_Device_write_attributes(tvbuff_t *tvb _U_, packet_info /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1132,7 +995,6 @@ static void decode_Tango_Device_write_attributes(tvbuff_t *tvb _U_, packet_info decode_Tango_AttributeValue_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue" */ } @@ -1145,10 +1007,8 @@ static void decode_Tango_Device_write_attributes(tvbuff_t *tvb _U_, packet_info case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -1161,8 +1021,6 @@ static void decode_Tango_Device_write_attributes(tvbuff_t *tvb _U_, packet_info g_warning("Unknown Exception "); - - break; @@ -1176,20 +1034,16 @@ static void decode_Tango_Device_write_attributes(tvbuff_t *tvb _U_, packet_info g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/ping:1.0 */ - static void decode_Tango_Device_ping(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1200,7 +1054,6 @@ static void decode_Tango_Device_ping(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1215,10 +1068,8 @@ static void decode_Tango_Device_ping(tvbuff_t *tvb _U_, packet_info *pinfo _U_, case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -1231,8 +1082,6 @@ static void decode_Tango_Device_ping(tvbuff_t *tvb _U_, packet_info *pinfo _U_, g_warning("Unknown Exception "); - - break; @@ -1246,20 +1095,16 @@ static void decode_Tango_Device_ping(tvbuff_t *tvb _U_, packet_info *pinfo _U_, g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/black_box:1.0 */ - static void decode_Tango_Device_black_box(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1275,7 +1120,6 @@ static void decode_Tango_Device_black_box(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1325,8 +1169,6 @@ static void decode_Tango_Device_black_box(tvbuff_t *tvb _U_, packet_info *pinfo g_warning("Unknown Exception "); - - break; @@ -1340,20 +1182,16 @@ static void decode_Tango_Device_black_box(tvbuff_t *tvb _U_, packet_info *pinfo g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/info:1.0 */ - static void decode_Tango_Device_info(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1364,7 +1202,6 @@ static void decode_Tango_Device_info(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1385,7 +1222,6 @@ static void decode_Tango_Device_info(tvbuff_t *tvb _U_, packet_info *pinfo _U_, decode_Tango_DevInfo_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevInfo" */ break; @@ -1400,8 +1236,6 @@ static void decode_Tango_Device_info(tvbuff_t *tvb _U_, packet_info *pinfo _U_, g_warning("Unknown Exception "); - - break; @@ -1415,20 +1249,16 @@ static void decode_Tango_Device_info(tvbuff_t *tvb _U_, packet_info *pinfo _U_, g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/command_list_query:1.0 */ - static void decode_Tango_Device_command_list_query(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1441,7 +1271,6 @@ static void decode_Tango_Device_command_list_query(tvbuff_t *tvb _U_, packet_inf /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1469,7 +1298,6 @@ static void decode_Tango_Device_command_list_query(tvbuff_t *tvb _U_, packet_inf decode_Tango_DevCmdInfo_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevCmdInfo" */ } @@ -1486,8 +1314,6 @@ static void decode_Tango_Device_command_list_query(tvbuff_t *tvb _U_, packet_inf g_warning("Unknown Exception "); - - break; @@ -1501,20 +1327,16 @@ static void decode_Tango_Device_command_list_query(tvbuff_t *tvb _U_, packet_inf g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device/command_query:1.0 */ - static void decode_Tango_Device_command_query(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1527,7 +1349,6 @@ static void decode_Tango_Device_command_query(tvbuff_t *tvb _U_, packet_info *pi /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1557,7 +1378,6 @@ static void decode_Tango_Device_command_query(tvbuff_t *tvb _U_, packet_info *pi decode_Tango_DevCmdInfo_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevCmdInfo" */ break; @@ -1572,8 +1392,6 @@ static void decode_Tango_Device_command_query(tvbuff_t *tvb _U_, packet_info *pi g_warning("Unknown Exception "); - - break; @@ -1587,20 +1405,16 @@ static void decode_Tango_Device_command_query(tvbuff_t *tvb _U_, packet_info *pi g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/command_inout_2:1.0 */ - static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1613,7 +1427,6 @@ static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1631,7 +1444,6 @@ static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary); if (tree) { @@ -1648,7 +1460,6 @@ static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - break; case USER_EXCEPTION: @@ -1661,8 +1472,6 @@ static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info g_warning("Unknown Exception "); - - break; @@ -1676,20 +1485,16 @@ static void decode_Tango_Device_2_command_inout_2(tvbuff_t *tvb _U_, packet_info g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/read_attributes_2:1.0 */ - static void decode_Tango_Device_2_read_attributes_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1706,7 +1511,6 @@ static void decode_Tango_Device_2_read_attributes_2(tvbuff_t *tvb _U_, packet_in /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1758,7 +1562,6 @@ static void decode_Tango_Device_2_read_attributes_2(tvbuff_t *tvb _U_, packet_in decode_Tango_AttributeValue_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue" */ } @@ -1775,8 +1578,6 @@ static void decode_Tango_Device_2_read_attributes_2(tvbuff_t *tvb _U_, packet_in g_warning("Unknown Exception "); - - break; @@ -1790,20 +1591,16 @@ static void decode_Tango_Device_2_read_attributes_2(tvbuff_t *tvb _U_, packet_in g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/get_attribute_config_2:1.0 */ - static void decode_Tango_Device_2_get_attribute_config_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1820,7 +1617,6 @@ static void decode_Tango_Device_2_get_attribute_config_2(tvbuff_t *tvb _U_, pack /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1866,7 +1662,6 @@ static void decode_Tango_Device_2_get_attribute_config_2(tvbuff_t *tvb _U_, pack decode_Tango_AttributeConfig_2_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeConfig_2" */ } @@ -1883,8 +1678,6 @@ static void decode_Tango_Device_2_get_attribute_config_2(tvbuff_t *tvb _U_, pack g_warning("Unknown Exception "); - - break; @@ -1898,20 +1691,16 @@ static void decode_Tango_Device_2_get_attribute_config_2(tvbuff_t *tvb _U_, pack g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/command_list_query_2:1.0 */ - static void decode_Tango_Device_2_command_list_query_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -1924,7 +1713,6 @@ static void decode_Tango_Device_2_command_list_query_2(tvbuff_t *tvb _U_, packet /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -1952,7 +1740,6 @@ static void decode_Tango_Device_2_command_list_query_2(tvbuff_t *tvb _U_, packet decode_Tango_DevCmdInfo_2_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevCmdInfo_2" */ } @@ -1969,8 +1756,6 @@ static void decode_Tango_Device_2_command_list_query_2(tvbuff_t *tvb _U_, packet g_warning("Unknown Exception "); - - break; @@ -1984,20 +1769,16 @@ static void decode_Tango_Device_2_command_list_query_2(tvbuff_t *tvb _U_, packet g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/command_query_2:1.0 */ - static void decode_Tango_Device_2_command_query_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2010,7 +1791,6 @@ static void decode_Tango_Device_2_command_query_2(tvbuff_t *tvb _U_, packet_info /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2040,7 +1820,6 @@ static void decode_Tango_Device_2_command_query_2(tvbuff_t *tvb _U_, packet_info decode_Tango_DevCmdInfo_2_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevCmdInfo_2" */ break; @@ -2055,8 +1834,6 @@ static void decode_Tango_Device_2_command_query_2(tvbuff_t *tvb _U_, packet_info g_warning("Unknown Exception "); - - break; @@ -2070,20 +1847,16 @@ static void decode_Tango_Device_2_command_query_2(tvbuff_t *tvb _U_, packet_info g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/command_inout_history_2:1.0 */ - static void decode_Tango_Device_2_command_inout_history_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2099,7 +1872,6 @@ static void decode_Tango_Device_2_command_inout_history_2(tvbuff_t *tvb _U_, pac /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2141,7 +1913,6 @@ static void decode_Tango_Device_2_command_inout_history_2(tvbuff_t *tvb _U_, pac decode_Tango_DevCmdHistory_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevCmdHistory" */ } @@ -2158,8 +1929,6 @@ static void decode_Tango_Device_2_command_inout_history_2(tvbuff_t *tvb _U_, pac g_warning("Unknown Exception "); - - break; @@ -2173,20 +1942,16 @@ static void decode_Tango_Device_2_command_inout_history_2(tvbuff_t *tvb _U_, pac g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_2/read_attribute_history_2:1.0 */ - static void decode_Tango_Device_2_read_attribute_history_2(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2202,7 +1967,6 @@ static void decode_Tango_Device_2_read_attribute_history_2(tvbuff_t *tvb _U_, pa /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2244,7 +2008,6 @@ static void decode_Tango_Device_2_read_attribute_history_2(tvbuff_t *tvb _U_, pa decode_Tango_DevAttrHistory_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevAttrHistory" */ } @@ -2261,8 +2024,6 @@ static void decode_Tango_Device_2_read_attribute_history_2(tvbuff_t *tvb _U_, pa g_warning("Unknown Exception "); - - break; @@ -2276,20 +2037,16 @@ static void decode_Tango_Device_2_read_attribute_history_2(tvbuff_t *tvb _U_, pa g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_3/read_attributes_3:1.0 */ - static void decode_Tango_Device_3_read_attributes_3(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2306,7 +2063,6 @@ static void decode_Tango_Device_3_read_attributes_3(tvbuff_t *tvb _U_, packet_in /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2358,7 +2114,6 @@ static void decode_Tango_Device_3_read_attributes_3(tvbuff_t *tvb _U_, packet_in decode_Tango_AttributeValue_3_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue_3" */ } @@ -2375,8 +2130,6 @@ static void decode_Tango_Device_3_read_attributes_3(tvbuff_t *tvb _U_, packet_in g_warning("Unknown Exception "); - - break; @@ -2390,20 +2143,16 @@ static void decode_Tango_Device_3_read_attributes_3(tvbuff_t *tvb _U_, packet_in g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_3/write_attributes_3:1.0 */ - static void decode_Tango_Device_3_write_attributes_3(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2416,7 +2165,6 @@ static void decode_Tango_Device_3_write_attributes_3(tvbuff_t *tvb _U_, packet_i /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2436,7 +2184,6 @@ static void decode_Tango_Device_3_write_attributes_3(tvbuff_t *tvb _U_, packet_i decode_Tango_AttributeValue_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue" */ } @@ -2449,10 +2196,8 @@ static void decode_Tango_Device_3_write_attributes_3(tvbuff_t *tvb _U_, packet_i case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -2465,8 +2210,6 @@ static void decode_Tango_Device_3_write_attributes_3(tvbuff_t *tvb _U_, packet_i g_warning("Unknown Exception "); - - break; @@ -2480,20 +2223,16 @@ static void decode_Tango_Device_3_write_attributes_3(tvbuff_t *tvb _U_, packet_i g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_3/read_attribute_history_3:1.0 */ - static void decode_Tango_Device_3_read_attribute_history_3(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2509,7 +2248,6 @@ static void decode_Tango_Device_3_read_attribute_history_3(tvbuff_t *tvb _U_, pa /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2551,7 +2289,6 @@ static void decode_Tango_Device_3_read_attribute_history_3(tvbuff_t *tvb _U_, pa decode_Tango_DevAttrHistory_3_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevAttrHistory_3" */ } @@ -2568,8 +2305,6 @@ static void decode_Tango_Device_3_read_attribute_history_3(tvbuff_t *tvb _U_, pa g_warning("Unknown Exception "); - - break; @@ -2583,20 +2318,16 @@ static void decode_Tango_Device_3_read_attribute_history_3(tvbuff_t *tvb _U_, pa g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_3/info_3:1.0 */ - static void decode_Tango_Device_3_info_3(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2607,7 +2338,6 @@ static void decode_Tango_Device_3_info_3(tvbuff_t *tvb _U_, packet_info *pinfo _ /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2628,7 +2358,6 @@ static void decode_Tango_Device_3_info_3(tvbuff_t *tvb _U_, packet_info *pinfo _ decode_Tango_DevInfo_3_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevInfo_3" */ break; @@ -2643,8 +2372,6 @@ static void decode_Tango_Device_3_info_3(tvbuff_t *tvb _U_, packet_info *pinfo _ g_warning("Unknown Exception "); - - break; @@ -2658,20 +2385,16 @@ static void decode_Tango_Device_3_info_3(tvbuff_t *tvb _U_, packet_info *pinfo _ g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_3/get_attribute_config_3:1.0 */ - static void decode_Tango_Device_3_get_attribute_config_3(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2688,7 +2411,6 @@ static void decode_Tango_Device_3_get_attribute_config_3(tvbuff_t *tvb _U_, pack /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2734,7 +2456,6 @@ static void decode_Tango_Device_3_get_attribute_config_3(tvbuff_t *tvb _U_, pack decode_Tango_AttributeConfig_3_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeConfig_3" */ } @@ -2751,8 +2472,6 @@ static void decode_Tango_Device_3_get_attribute_config_3(tvbuff_t *tvb _U_, pack g_warning("Unknown Exception "); - - break; @@ -2766,20 +2485,16 @@ static void decode_Tango_Device_3_get_attribute_config_3(tvbuff_t *tvb _U_, pack g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* * IDL:Tango/Device_3/set_attribute_config_3:1.0 */ - static void decode_Tango_Device_3_set_attribute_config_3(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header, gchar *operation _U_) { gboolean stream_is_big_endian; /* big endianess */ @@ -2792,7 +2507,6 @@ static void decode_Tango_Device_3_set_attribute_config_3(tvbuff_t *tvb _U_, pack /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); switch(header->message_type) { @@ -2812,7 +2526,6 @@ static void decode_Tango_Device_3_set_attribute_config_3(tvbuff_t *tvb _U_, pack decode_Tango_AttributeConfig_3_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeConfig_3" */ } @@ -2825,10 +2538,8 @@ static void decode_Tango_Device_3_set_attribute_config_3(tvbuff_t *tvb _U_, pack case NO_EXCEPTION: - /* Function returns void */ - break; case USER_EXCEPTION: @@ -2841,8 +2552,6 @@ static void decode_Tango_Device_3_set_attribute_config_3(tvbuff_t *tvb _U_, pack g_warning("Unknown Exception "); - - break; @@ -2856,15 +2565,12 @@ static void decode_Tango_Device_3_set_attribute_config_3(tvbuff_t *tvb _U_, pack g_warning("Unknown GIOP Message"); - break; - } /* switch(header->message_type) */ } - /* Struct = IDL:Tango/DevVarLongStringArray:1.0 */ static void decode_Tango_DevVarLongStringArray_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -2884,10 +2590,8 @@ static void decode_Tango_DevVarLongStringArray_st(tvbuff_t *tvb _U_, packet_info /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4_loop_DevVarLongStringArray_lvalue = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of DevVarLongStringArray_lvalue = %u",u_octet4_loop_DevVarLongStringArray_lvalue); @@ -2922,7 +2626,6 @@ static void decode_Tango_DevVarLongStringArray_st(tvbuff_t *tvb _U_, packet_info } - /* Struct = IDL:Tango/DevVarDoubleStringArray:1.0 */ static void decode_Tango_DevVarDoubleStringArray_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -2942,10 +2645,8 @@ static void decode_Tango_DevVarDoubleStringArray_st(tvbuff_t *tvb _U_, packet_in /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4_loop_DevVarDoubleStringArray_dvalue = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of DevVarDoubleStringArray_dvalue = %u",u_octet4_loop_DevVarDoubleStringArray_dvalue); @@ -2980,7 +2681,6 @@ static void decode_Tango_DevVarDoubleStringArray_st(tvbuff_t *tvb _U_, packet_in } - /* Struct = IDL:Tango/TimeVal:1.0 */ static void decode_Tango_TimeVal_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -2994,10 +2694,8 @@ static void decode_Tango_TimeVal_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4,4,"TimeVal_tv_sec = %i",s_octet4); @@ -3015,7 +2713,6 @@ static void decode_Tango_TimeVal_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } - /* Struct = IDL:Tango/DevCmdInfo:1.0 */ static void decode_Tango_DevCmdInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3031,10 +2728,8 @@ static void decode_Tango_DevCmdInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"DevCmdInfo_cmd_name (%u) = %s", @@ -3079,7 +2774,6 @@ static void decode_Tango_DevCmdInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_ } - /* Struct = IDL:Tango/DevCmdInfo_2:1.0 */ static void decode_Tango_DevCmdInfo_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3095,10 +2789,8 @@ static void decode_Tango_DevCmdInfo_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _ /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"DevCmdInfo_2_cmd_name (%u) = %s", @@ -3149,7 +2841,6 @@ static void decode_Tango_DevCmdInfo_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _ } - /* Struct = IDL:Tango/DevError:1.0 */ static void decode_Tango_DevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3164,10 +2855,8 @@ static void decode_Tango_DevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"DevError_reason (%u) = %s", @@ -3203,7 +2892,6 @@ static void decode_Tango_DevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } - /* Struct = IDL:Tango/NamedDevError:1.0 */ static void decode_Tango_NamedDevError_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3221,10 +2909,8 @@ static void decode_Tango_NamedDevError_st(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"NamedDevError_name (%u) = %s", @@ -3252,14 +2938,12 @@ static void decode_Tango_NamedDevError_st(tvbuff_t *tvb _U_, packet_info *pinfo decode_Tango_DevError_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevError" */ } } - /* Struct = IDL:Tango/AttributeConfig:1.0 */ static void decode_Tango_AttributeConfig_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3277,10 +2961,8 @@ static void decode_Tango_AttributeConfig_st(tvbuff_t *tvb _U_, packet_info *pinf /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"AttributeConfig_name (%u) = %s", @@ -3436,7 +3118,6 @@ static void decode_Tango_AttributeConfig_st(tvbuff_t *tvb _U_, packet_info *pinf } - /* Struct = IDL:Tango/AttributeConfig_2:1.0 */ static void decode_Tango_AttributeConfig_2_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3454,10 +3135,8 @@ static void decode_Tango_AttributeConfig_2_st(tvbuff_t *tvb _U_, packet_info *pi /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"AttributeConfig_2_name (%u) = %s", @@ -3619,7 +3298,6 @@ static void decode_Tango_AttributeConfig_2_st(tvbuff_t *tvb _U_, packet_info *pi } - /* Struct = IDL:Tango/AttributeValue:1.0 */ static void decode_Tango_AttributeValue_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3635,13 +3313,10 @@ static void decode_Tango_AttributeValue_st(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary); if (tree) { @@ -3654,7 +3329,6 @@ static void decode_Tango_AttributeValue_st(tvbuff_t *tvb _U_, packet_info *pinfo decode_Tango_TimeVal_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_TimeVal" */ u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); @@ -3678,7 +3352,6 @@ static void decode_Tango_AttributeValue_st(tvbuff_t *tvb _U_, packet_info *pinfo } - /* Struct = IDL:Tango/AttributeDim:1.0 */ static void decode_Tango_AttributeDim_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3692,10 +3365,8 @@ static void decode_Tango_AttributeDim_st(tvbuff_t *tvb _U_, packet_info *pinfo _ /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - s_octet4 = get_CDR_long(tvb,offset,stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4,4,"AttributeDim_dim_x = %i",s_octet4); @@ -3708,7 +3379,6 @@ static void decode_Tango_AttributeDim_st(tvbuff_t *tvb _U_, packet_info *pinfo _ } - /* Struct = IDL:Tango/AttributeValue_3:1.0 */ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3725,13 +3395,10 @@ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pin /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary); if (tree) { @@ -3744,7 +3411,6 @@ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pin decode_Tango_TimeVal_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_TimeVal" */ u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); @@ -3762,7 +3428,6 @@ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pin decode_Tango_AttributeDim_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeDim" */ /* Begin struct "Tango_AttributeDim" */ @@ -3771,7 +3436,6 @@ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pin decode_Tango_AttributeDim_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeDim" */ u_octet4_loop_AttributeValue_3_err_list = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -3787,14 +3451,12 @@ static void decode_Tango_AttributeValue_3_st(tvbuff_t *tvb _U_, packet_info *pin decode_Tango_DevError_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevError" */ } } - /* Struct = IDL:Tango/ChangeEventProp:1.0 */ static void decode_Tango_ChangeEventProp_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3811,10 +3473,8 @@ static void decode_Tango_ChangeEventProp_st(tvbuff_t *tvb _U_, packet_info *pinf /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"ChangeEventProp_rel_change (%u) = %s", @@ -3853,7 +3513,6 @@ static void decode_Tango_ChangeEventProp_st(tvbuff_t *tvb _U_, packet_info *pinf } - /* Struct = IDL:Tango/PeriodicEventProp:1.0 */ static void decode_Tango_PeriodicEventProp_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3870,10 +3529,8 @@ static void decode_Tango_PeriodicEventProp_st(tvbuff_t *tvb _U_, packet_info *pi /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"PeriodicEventProp_period (%u) = %s", @@ -3903,7 +3560,6 @@ static void decode_Tango_PeriodicEventProp_st(tvbuff_t *tvb _U_, packet_info *pi } - /* Struct = IDL:Tango/ArchiveEventProp:1.0 */ static void decode_Tango_ArchiveEventProp_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3920,10 +3576,8 @@ static void decode_Tango_ArchiveEventProp_st(tvbuff_t *tvb _U_, packet_info *pin /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"ArchiveEventProp_rel_change (%u) = %s", @@ -3971,7 +3625,6 @@ static void decode_Tango_ArchiveEventProp_st(tvbuff_t *tvb _U_, packet_info *pin } - /* Struct = IDL:Tango/EventProperties:1.0 */ static void decode_Tango_EventProperties_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -3984,17 +3637,14 @@ static void decode_Tango_EventProperties_st(tvbuff_t *tvb _U_, packet_info *pinf /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - /* Begin struct "Tango_ChangeEventProp" */ decode_Tango_ChangeEventProp_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_ChangeEventProp" */ /* Begin struct "Tango_PeriodicEventProp" */ @@ -4003,7 +3653,6 @@ static void decode_Tango_EventProperties_st(tvbuff_t *tvb _U_, packet_info *pinf decode_Tango_PeriodicEventProp_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_PeriodicEventProp" */ /* Begin struct "Tango_ArchiveEventProp" */ @@ -4012,12 +3661,10 @@ static void decode_Tango_EventProperties_st(tvbuff_t *tvb _U_, packet_info *pinf decode_Tango_ArchiveEventProp_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_ArchiveEventProp" */ } - /* Struct = IDL:Tango/AttributeAlarm:1.0 */ static void decode_Tango_AttributeAlarm_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4034,10 +3681,8 @@ static void decode_Tango_AttributeAlarm_st(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"AttributeAlarm_min_alarm (%u) = %s", @@ -4112,7 +3757,6 @@ static void decode_Tango_AttributeAlarm_st(tvbuff_t *tvb _U_, packet_info *pinfo } - /* Struct = IDL:Tango/AttributeConfig_3:1.0 */ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4132,10 +3776,8 @@ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pi /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"AttributeConfig_3_name (%u) = %s", @@ -4265,7 +3907,6 @@ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pi decode_Tango_AttributeAlarm_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeAlarm" */ /* Begin struct "Tango_EventProperties" */ @@ -4274,7 +3915,6 @@ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pi decode_Tango_EventProperties_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_EventProperties" */ u_octet4_loop_AttributeConfig_3_extensions = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -4315,7 +3955,6 @@ static void decode_Tango_AttributeConfig_3_st(tvbuff_t *tvb _U_, packet_info *pi } - /* Struct = IDL:Tango/DevInfo:1.0 */ static void decode_Tango_DevInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4331,10 +3970,8 @@ static void decode_Tango_DevInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"DevInfo_dev_class (%u) = %s", @@ -4378,7 +4015,6 @@ static void decode_Tango_DevInfo_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p } - /* Struct = IDL:Tango/DevInfo_3:1.0 */ static void decode_Tango_DevInfo_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4394,10 +4030,8 @@ static void decode_Tango_DevInfo_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet4 = get_CDR_string(tvb, &seq, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-u_octet4,u_octet4,"DevInfo_3_dev_class (%u) = %s", @@ -4450,7 +4084,6 @@ static void decode_Tango_DevInfo_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, } - /* Struct = IDL:Tango/DevCmdHistory:1.0 */ static void decode_Tango_DevCmdHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4466,17 +4099,14 @@ static void decode_Tango_DevCmdHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - /* Begin struct "Tango_TimeVal" */ decode_Tango_TimeVal_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_TimeVal" */ u_octet1 = get_CDR_boolean(tvb,offset); @@ -4486,7 +4116,6 @@ static void decode_Tango_DevCmdHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo get_CDR_any(tvb,tree,offset,stream_is_big_endian, boundary, header); - u_octet4_loop_DevCmdHistory_errors = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); if (tree) { proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of DevCmdHistory_errors = %u",u_octet4_loop_DevCmdHistory_errors); @@ -4500,14 +4129,12 @@ static void decode_Tango_DevCmdHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo decode_Tango_DevError_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevError" */ } } - /* Struct = IDL:Tango/DevAttrHistory:1.0 */ static void decode_Tango_DevAttrHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4523,10 +4150,8 @@ static void decode_Tango_DevAttrHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet1 = get_CDR_boolean(tvb,offset); if (tree) { proto_tree_add_text(tree,tvb,*offset-1,1,"DevAttrHistory_attr_failed = %u",u_octet1); @@ -4538,7 +4163,6 @@ static void decode_Tango_DevAttrHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo decode_Tango_AttributeValue_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue" */ u_octet4_loop_DevAttrHistory_errors = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); @@ -4554,14 +4178,12 @@ static void decode_Tango_DevAttrHistory_st(tvbuff_t *tvb _U_, packet_info *pinfo decode_Tango_DevError_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_DevError" */ } } - /* Struct = IDL:Tango/DevAttrHistory_3:1.0 */ static void decode_Tango_DevAttrHistory_3_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) { @@ -4575,10 +4197,8 @@ static void decode_Tango_DevAttrHistory_3_st(tvbuff_t *tvb _U_, packet_info *pin /* Operation specific Variable declarations End */ - stream_is_big_endian = is_big_endian(header); /* get stream endianess */ - u_octet1 = get_CDR_boolean(tvb,offset); if (tree) { proto_tree_add_text(tree,tvb,*offset-1,1,"DevAttrHistory_3_attr_failed = %u",u_octet1); @@ -4590,12 +4210,10 @@ static void decode_Tango_DevAttrHistory_3_st(tvbuff_t *tvb _U_, packet_info *pin decode_Tango_AttributeValue_3_st(tvb, pinfo, tree, offset, header, operation); - /* End struct "Tango_AttributeValue_3" */ } - /* * Called once we accept the packet as being for us; it sets the * Protocol and Info columns and creates the top-level protocol @@ -4639,14 +4257,11 @@ static gboolean dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptr } - - switch(header->message_type) { case Request: case Reply: - if (strcmp(operation, Tango_Device_command_inout_op) == 0 && (!idlname || strcmp(idlname, "Tango/Device") == 0)) { tree = start_dissecting(tvb, pinfo, ptree, offset); @@ -4855,15 +4470,13 @@ static gboolean dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptr } /* switch */ - return FALSE; } /* End of main dissector */ - -/* Register the protocol with Ethereal */ +/* Register the protocol with Wireshark */ void proto_register_giop_tango(void) { @@ -4895,49 +4508,35 @@ void proto_register_giop_tango(void) { } - - /* register me as handler for these interfaces */ void proto_register_handoff_giop_tango(void) { - /* Register for Explicit Dissection */ register_giop_user_module(dissect_tango, "TANGO", "Tango/Device", proto_tango ); /* explicit dissector */ - - - /* Register for Explicit Dissection */ register_giop_user_module(dissect_tango, "TANGO", "Tango/Device_2", proto_tango ); /* explicit dissector */ - - - /* Register for Explicit Dissection */ register_giop_user_module(dissect_tango, "TANGO", "Tango/Device_3", proto_tango ); /* explicit dissector */ - - - /* Register for Heuristic Dissection */ register_giop_user(dissect_tango, "TANGO" ,proto_tango); /* heuristic dissector */ - } - #ifndef ENABLE_STATIC G_MODULE_EXPORT void @@ -4952,7 +4551,5 @@ G_MODULE_EXPORT void plugin_reg_handoff(void){ proto_register_handoff_giop_tango(); } - #endif - |