Regenerate GIOP dissector plugins (after change in generator !) with following commmands :

:~/wireshark/tools$ ../idl2wrs ../idl/cosnaming.idl > ../plugins/giop/packet-cosnaming.c
:~/wireshark/tools$ ../idl2wrs ../idl/coseventcomm.idl > ../plugins/giop/packet-coseventcomm.c
:~/wireshark/tools$ ../idl2wrs ../idl/parlay/Parlay.idl > ../plugins/giop/packet-parlay.c
:~/wireshark/tools$ ../idl2wrs ../idl/tango.idl > ../plugins/giop/packet-tango.c 

For packet-cosnaming.c, only some white return change
For packet-parley.c, lot of change but only the functions is not in the same order...?! (Order change in 17911)

svn path=/trunk/; revision=39932
This commit is contained in:
Alexis La Goutte 2011-11-18 12:34:16 +00:00
parent f207b03503
commit 331fa3af93
2 changed files with 1363 additions and 1479 deletions

View File

@ -12,7 +12,7 @@
/*
* Wireshark - Network traffic analyzer
* By Gerald Combs
* Copyright 1999 Gerald Combs
* Copyright 1999 - 2006 Gerald Combs
*/
@ -54,6 +54,7 @@ G_MODULE_EXPORT const gchar version[] = "0.0.1";
#pragma warning(disable:4101)
#endif
static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset);
@ -61,29 +62,22 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre
/* Struct prototype declaration Start */
/* Struct = IDL:omg.org/CosNaming/NameComponent:1.0 */
static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_);
/* Struct = IDL:omg.org/CosNaming/Binding:1.0 */
static void decode_CosNaming_Binding_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 */
@ -95,23 +89,19 @@ static int proto_cosnaming = -1;
static gint ett_cosnaming = -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 CosNaming_NamingContext_bind_op[] = "bind" ;
static const char CosNaming_NamingContext_rebind_op[] = "rebind" ;
@ -131,7 +121,6 @@ static const char CosNaming_BindingIterator_destroy_op[] = "destroy" ;
* IDL Operations End
*/
/* Begin Exception (containing members) String Declare */
@ -140,27 +129,22 @@ static const char user_exception_CosNaming_NamingContext_CannotProceed[] = "IDL:
/* End Exception (containing members) String Declare */
/*
* IDL Attributes Start
*/
/*
* IDL Attributes End
*/
/*
* IDL Enums Start
*/
/*
* Enum = IDL:omg.org/CosNaming/BindingType:1.0
*/
static const value_string CosNaming_BindingType[] = {
@ -169,11 +153,9 @@ static const value_string CosNaming_BindingType[] = {
{ 0, NULL },
};
/*
* Enum = IDL:omg.org/CosNaming/NamingContext/NotFoundReason:1.0
*/
static const value_string CosNaming_NamingContext_NotFoundReason[] = {
@ -183,16 +165,13 @@ static const value_string CosNaming_NamingContext_NotFoundReason[] = {
{ 0, NULL },
};
/*
* IDL Enums End
*/
/* Begin Exception Helper Functions */
/* Exception = IDL:omg.org/CosNaming/NamingContext/NotFound:1.0 */
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_, gchar *operation _U_) {
@ -208,10 +187,8 @@ static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet
/* 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) {
@ -231,14 +208,12 @@ static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
}
/* Exception = IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0 */
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_, gchar *operation _U_) {
@ -253,10 +228,8 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, p
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header); /* get stream endianess */
get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary);
@ -273,7 +246,6 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, p
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -283,8 +255,6 @@ static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, p
/* End Exception Helper Functions */
/*
* Main delegator for exception handling
*
@ -298,14 +268,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_CosNaming_NamingContext_NotFound) == 0) {
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_ex_CosNaming_NamingContext_NotFound(tvb, pinfo, tree, offset, header, operation); /* IDL:omg.org/CosNaming/NamingContext/NotFound:1.0 */
return TRUE;
}
if (strcmp(header->exception_id, user_exception_CosNaming_NamingContext_CannotProceed) == 0) {
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_ex_CosNaming_NamingContext_CannotProceed(tvb, pinfo, tree, offset, header, operation); /* IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0 */
@ -314,25 +282,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/CosNaming/NamingContext/bind:1.0
*/
static void decode_CosNaming_NamingContext_bind(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 */
@ -345,7 +307,6 @@ static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -365,7 +326,6 @@ static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -381,10 +341,8 @@ static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -397,8 +355,6 @@ static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *
g_warning("Unknown Exception ");
break;
@ -412,20 +368,16 @@ static void decode_CosNaming_NamingContext_bind(tvbuff_t *tvb _U_, packet_info *
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/rebind:1.0
*/
static void decode_CosNaming_NamingContext_rebind(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 */
@ -438,7 +390,6 @@ static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -458,7 +409,6 @@ static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -474,10 +424,8 @@ static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -490,8 +438,6 @@ static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info
g_warning("Unknown Exception ");
break;
@ -505,20 +451,16 @@ static void decode_CosNaming_NamingContext_rebind(tvbuff_t *tvb _U_, packet_info
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/bind_context:1.0
*/
static void decode_CosNaming_NamingContext_bind_context(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 */
@ -531,7 +473,6 @@ static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packe
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -551,7 +492,6 @@ static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packe
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -567,10 +507,8 @@ static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packe
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -583,8 +521,6 @@ static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packe
g_warning("Unknown Exception ");
break;
@ -598,20 +534,16 @@ static void decode_CosNaming_NamingContext_bind_context(tvbuff_t *tvb _U_, packe
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/rebind_context:1.0
*/
static void decode_CosNaming_NamingContext_rebind_context(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 */
@ -624,7 +556,6 @@ static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, pac
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -644,7 +575,6 @@ static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, pac
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -660,10 +590,8 @@ static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, pac
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -676,8 +604,6 @@ static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, pac
g_warning("Unknown Exception ");
break;
@ -691,20 +617,16 @@ static void decode_CosNaming_NamingContext_rebind_context(tvbuff_t *tvb _U_, pac
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/resolve:1.0
*/
static void decode_CosNaming_NamingContext_resolve(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 */
@ -717,7 +639,6 @@ static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb _U_, packet_inf
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -737,7 +658,6 @@ static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb _U_, packet_inf
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -765,8 +685,6 @@ static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb _U_, packet_inf
g_warning("Unknown Exception ");
break;
@ -780,20 +698,16 @@ static void decode_CosNaming_NamingContext_resolve(tvbuff_t *tvb _U_, packet_inf
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/unbind:1.0
*/
static void decode_CosNaming_NamingContext_unbind(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 */
@ -806,7 +720,6 @@ static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -826,7 +739,6 @@ static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -839,10 +751,8 @@ static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -855,8 +765,6 @@ static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info
g_warning("Unknown Exception ");
break;
@ -870,20 +778,16 @@ static void decode_CosNaming_NamingContext_unbind(tvbuff_t *tvb _U_, packet_info
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/new_context:1.0
*/
static void decode_CosNaming_NamingContext_new_context(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 */
@ -894,7 +798,6 @@ static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb _U_, packet
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -924,8 +827,6 @@ static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb _U_, packet
g_warning("Unknown Exception ");
break;
@ -939,20 +840,16 @@ static void decode_CosNaming_NamingContext_new_context(tvbuff_t *tvb _U_, packet
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/bind_new_context:1.0
*/
static void decode_CosNaming_NamingContext_bind_new_context(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 */
@ -965,7 +862,6 @@ static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb _U_, p
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -985,7 +881,6 @@ static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb _U_, p
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -1013,8 +908,6 @@ static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb _U_, p
g_warning("Unknown Exception ");
break;
@ -1028,20 +921,16 @@ static void decode_CosNaming_NamingContext_bind_new_context(tvbuff_t *tvb _U_, p
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/destroy:1.0
*/
static void decode_CosNaming_NamingContext_destroy(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 */
@ -1052,7 +941,6 @@ static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb _U_, packet_inf
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -1067,10 +955,8 @@ static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb _U_, packet_inf
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -1083,8 +969,6 @@ static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb _U_, packet_inf
g_warning("Unknown Exception ");
break;
@ -1098,20 +982,16 @@ static void decode_CosNaming_NamingContext_destroy(tvbuff_t *tvb _U_, packet_inf
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/NamingContext/list:1.0
*/
static void decode_CosNaming_NamingContext_list(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 */
@ -1125,7 +1005,6 @@ static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -1145,10 +1024,8 @@ static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *
case NO_EXCEPTION:
/* Function returns void */
u_octet4_loop_bl = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
if (tree) {
proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of bl = %u",u_octet4_loop_bl);
@ -1162,7 +1039,6 @@ static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *
decode_CosNaming_Binding_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_Binding" */
}
@ -1182,8 +1058,6 @@ static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *
g_warning("Unknown Exception ");
break;
@ -1197,20 +1071,16 @@ static void decode_CosNaming_NamingContext_list(tvbuff_t *tvb _U_, packet_info *
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/BindingIterator/next_one:1.0
*/
static void decode_CosNaming_BindingIterator_next_one(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 */
@ -1222,7 +1092,6 @@ static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb _U_, packet_
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -1248,7 +1117,6 @@ static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb _U_, packet_
decode_CosNaming_Binding_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_Binding" */
break;
@ -1263,8 +1131,6 @@ static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb _U_, packet_
g_warning("Unknown Exception ");
break;
@ -1278,20 +1144,16 @@ static void decode_CosNaming_BindingIterator_next_one(tvbuff_t *tvb _U_, packet_
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/BindingIterator/next_n:1.0
*/
static void decode_CosNaming_BindingIterator_next_n(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 */
@ -1306,7 +1168,6 @@ static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb _U_, packet_in
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -1344,7 +1205,6 @@ static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb _U_, packet_in
decode_CosNaming_Binding_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_Binding" */
}
@ -1361,8 +1221,6 @@ static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb _U_, packet_in
g_warning("Unknown Exception ");
break;
@ -1376,20 +1234,16 @@ static void decode_CosNaming_BindingIterator_next_n(tvbuff_t *tvb _U_, packet_in
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/*
* IDL:omg.org/CosNaming/BindingIterator/destroy:1.0
*/
static void decode_CosNaming_BindingIterator_destroy(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 */
@ -1400,7 +1254,6 @@ static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb _U_, packet_i
/* Operation specific Variable declarations End */
stream_is_big_endian = is_big_endian(header);
switch(header->message_type) {
@ -1415,10 +1268,8 @@ static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb _U_, packet_i
case NO_EXCEPTION:
/* Function returns void */
break;
case USER_EXCEPTION:
@ -1431,8 +1282,6 @@ static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb _U_, packet_i
g_warning("Unknown Exception ");
break;
@ -1446,15 +1295,12 @@ static void decode_CosNaming_BindingIterator_destroy(tvbuff_t *tvb _U_, packet_i
g_warning("Unknown GIOP Message");
break;
} /* switch(header->message_type) */
}
/* Struct = IDL:omg.org/CosNaming/NameComponent:1.0 */
static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) {
@ -1469,10 +1315,8 @@ static void decode_CosNaming_NameComponent_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,"NameComponent_id (%u) = %s",
@ -1493,7 +1337,6 @@ static void decode_CosNaming_NameComponent_st(tvbuff_t *tvb _U_, packet_info *pi
}
/* Struct = IDL:omg.org/CosNaming/Binding:1.0 */
static void decode_CosNaming_Binding_st(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, gchar *operation _U_) {
@ -1509,10 +1352,8 @@ static void decode_CosNaming_Binding_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_loop_Binding_binding_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary);
if (tree) {
proto_tree_add_text(tree,tvb,*offset-4, 4 ,"Seq length of Binding_binding_name = %u",u_octet4_loop_Binding_binding_name);
@ -1526,7 +1367,6 @@ static void decode_CosNaming_Binding_st(tvbuff_t *tvb _U_, packet_info *pinfo _U
decode_CosNaming_NameComponent_st(tvb, pinfo, tree, offset, header, operation);
/* End struct "CosNaming_NameComponent" */
}
@ -1539,7 +1379,6 @@ static void decode_CosNaming_Binding_st(tvbuff_t *tvb _U_, packet_info *pinfo _U
}
/*
* Called once we accept the packet as being for us; it sets the
* Protocol and Info columns and creates the top-level protocol
@ -1581,14 +1420,11 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree
}
switch(header->message_type) {
case Request:
case Reply:
if (strcmp(operation, CosNaming_NamingContext_bind_op) == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
tree = start_dissecting(tvb, pinfo, ptree, offset);
@ -1697,14 +1533,12 @@ static gboolean dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree
} /* switch */
return FALSE;
} /* End of main dissector */
/* Register the protocol with Wireshark */
void proto_register_giop_cosnaming(void) {
@ -1737,41 +1571,30 @@ void proto_register_giop_cosnaming(void) {
}
/* register me as handler for these interfaces */
void proto_register_handoff_giop_cosnaming(void) {
/* Register for Explicit Dissection */
register_giop_user_module(dissect_cosnaming, "COSNAMING", "CosNaming/BindingIterator", proto_cosnaming ); /* explicit dissector */
/* Register for Explicit Dissection */
register_giop_user_module(dissect_cosnaming, "COSNAMING", "CosNaming/NamingContext", proto_cosnaming ); /* explicit dissector */
/* Register for Heuristic Dissection */
register_giop_user(dissect_cosnaming, "COSNAMING" ,proto_cosnaming); /* heuristic dissector */
}
#ifndef ENABLE_STATIC
G_MODULE_EXPORT void
@ -1786,7 +1609,5 @@ G_MODULE_EXPORT void
plugin_reg_handoff(void){
proto_register_handoff_giop_cosnaming();
}
#endif

File diff suppressed because it is too large Load Diff