osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Replace process_RequestOperation macro by a real function to speedup compilation time 

svn path=/trunk/; revision=44779
This commit is contained in:
Pascal Quantin 2012-09-05 12:45:54 +00:00
parent 881a115a88
commit e6538311a6
5 changed files with 1042 additions and 1002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
epan/dissectors/packet-coseventcomm.c
View File

@ -631,17 +631,25 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs
return tree;
}
static void
process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, MessageHeader *header, gchar *operation)
{
proto_item *pi;
if(header->message_type == Reply) {
/* fill-up info column */
col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation);
};
/* fill-up the field */
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);
PROTO_ITEM_SET_GENERATED(pi);
}
static gboolean
dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname)
{
gboolean stream_is_big_endian; /* big endianess */
proto_tree *tree _U_;
#define process_RequestOperation(){ \
proto_item *pi; \
if(header->message_type == Reply){ col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation); }; /* fill-up info column */ \
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);PROTO_ITEM_SET_GENERATED(pi); /* fill-up the field */ \
};
stream_is_big_endian = is_big_endian(header); /* get endianess */
@ -660,7 +668,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "push") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PushConsumer") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PushConsumer_push(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -668,7 +676,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "disconnect_push_consumer") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PushConsumer") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PushConsumer_disconnect_push_consumer(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -676,7 +684,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "disconnect_push_supplier") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PushSupplier") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PushSupplier_disconnect_push_supplier(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -684,7 +692,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "pull") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PullSupplier") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PullSupplier_pull(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -692,7 +700,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "try_pull") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PullSupplier") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PullSupplier_try_pull(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -700,7 +708,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "disconnect_pull_supplier") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PullSupplier") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PullSupplier_disconnect_pull_supplier(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -708,7 +716,7 @@ dissect_coseventcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *
if (strcmp(operation, "disconnect_pull_consumer") == 0
&& (!idlname || strcmp(idlname, "CosEventComm/PullConsumer") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosEventComm_PullConsumer_disconnect_pull_consumer(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;

44
epan/dissectors/packet-cosnaming.c
View File

@ -1401,17 +1401,25 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs
return tree;
}
static void
process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, MessageHeader *header, gchar *operation)
{
proto_item *pi;
if(header->message_type == Reply) {
/* fill-up info column */
col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation);
};
/* fill-up the field */
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);
PROTO_ITEM_SET_GENERATED(pi);
}
static gboolean
dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname)
{
gboolean stream_is_big_endian; /* big endianess */
proto_tree *tree _U_;
#define process_RequestOperation(){ \
proto_item *pi; \
if(header->message_type == Reply){ col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation); }; /* fill-up info column */ \
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);PROTO_ITEM_SET_GENERATED(pi); /* fill-up the field */ \
};
stream_is_big_endian = is_big_endian(header); /* get endianess */
@ -1430,7 +1438,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "bind") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_bind(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1438,7 +1446,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "rebind") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_rebind(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1446,7 +1454,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "bind_context") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_bind_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1454,7 +1462,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "rebind_context") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_rebind_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1462,7 +1470,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "resolve") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_resolve(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1470,7 +1478,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "unbind") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_unbind(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1478,7 +1486,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "new_context") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_new_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1486,7 +1494,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "bind_new_context") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_bind_new_context(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1494,7 +1502,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "destroy") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_destroy(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1502,7 +1510,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "list") == 0
&& (!idlname || strcmp(idlname, "CosNaming/NamingContext") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_NamingContext_list(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1510,7 +1518,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "next_one") == 0
&& (!idlname || strcmp(idlname, "CosNaming/BindingIterator") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_BindingIterator_next_one(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1518,7 +1526,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "next_n") == 0
&& (!idlname || strcmp(idlname, "CosNaming/BindingIterator") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_BindingIterator_next_n(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -1526,7 +1534,7 @@ dissect_cosnaming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *off
if (strcmp(operation, "destroy") == 0
&& (!idlname || strcmp(idlname, "CosNaming/BindingIterator") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_CosNaming_BindingIterator_destroy(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;

1884
epan/dissectors/packet-parlay.c
View File

File diff suppressed because it is too large Load Diff

64
epan/dissectors/packet-tango.c
View File

@ -3422,17 +3422,25 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs
return tree;
}
static void
process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, MessageHeader *header, gchar *operation)
{
proto_item *pi;
if(header->message_type == Reply) {
/* fill-up info column */
col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation);
};
/* fill-up the field */
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);
PROTO_ITEM_SET_GENERATED(pi);
}
static gboolean
dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname)
{
gboolean stream_is_big_endian; /* big endianess */
proto_tree *tree _U_;
#define process_RequestOperation(){ \
proto_item *pi; \
if(header->message_type == Reply){ col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation); }; /* fill-up info column */ \
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);PROTO_ITEM_SET_GENERATED(pi); /* fill-up the field */ \
};
stream_is_big_endian = is_big_endian(header); /* get endianess */
@ -3451,7 +3459,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_inout") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_command_inout(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3459,7 +3467,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "get_attribute_config") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_get_attribute_config(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3467,7 +3475,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "set_attribute_config") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_set_attribute_config(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3475,7 +3483,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "read_attributes") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_read_attributes(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3483,7 +3491,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "write_attributes") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_write_attributes(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3491,7 +3499,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "ping") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_ping(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3499,7 +3507,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "black_box") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_black_box(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3507,7 +3515,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "info") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_info(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3515,7 +3523,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_list_query") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_command_list_query(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3523,7 +3531,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_query") == 0
&& (!idlname || strcmp(idlname, "Tango/Device") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_command_query(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3531,7 +3539,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_inout_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_command_inout_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3539,7 +3547,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "read_attributes_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_read_attributes_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3547,7 +3555,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "get_attribute_config_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_get_attribute_config_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3555,7 +3563,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_list_query_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_command_list_query_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3563,7 +3571,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_query_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_command_query_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3571,7 +3579,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "command_inout_history_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_command_inout_history_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3579,7 +3587,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "read_attribute_history_2") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_2") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_2_read_attribute_history_2(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3587,7 +3595,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "read_attributes_3") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_3") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_3_read_attributes_3(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3595,7 +3603,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "write_attributes_3") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_3") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_3_write_attributes_3(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3603,7 +3611,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "read_attribute_history_3") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_3") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_3_read_attribute_history_3(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3611,7 +3619,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "info_3") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_3") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_3_info_3(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3619,7 +3627,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "get_attribute_config_3") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_3") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_3_get_attribute_config_3(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -3627,7 +3635,7 @@ dissect_tango(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset,
if (strcmp(operation, "set_attribute_config_3") == 0
&& (!idlname || strcmp(idlname, "Tango/Device_3") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_Tango_Device_3_set_attribute_config_3(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;

20
tools/wireshark_gen.py
View File

@ -1670,7 +1670,7 @@ void proto_register_giop_@dissector_name@(void) {
template_op_delegate_code = """\
if (strcmp(operation, "@opname@") == 0
&& (!idlname || strcmp(idlname, \"@interface@\") == 0)) {
process_RequestOperation(); /* fill-up Request_Operation field & info column */
process_RequestOperation(tvb, pinfo, ptree, header, operation); /* fill-up Request_Operation field & info column */
tree = start_dissecting(tvb, pinfo, ptree, offset);
decode_@sname@(tvb, pinfo, tree, offset, header, operation, stream_is_big_endian);
return TRUE;
@ -2047,17 +2047,25 @@ start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offs
return tree;
}
static void
process_RequestOperation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, MessageHeader *header, gchar *operation)
{
proto_item *pi;
if(header->message_type == Reply) {
/* fill-up info column */
col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation);
};
/* fill-up the field */
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);
PROTO_ITEM_SET_GENERATED(pi);
}
static gboolean
dissect_@dissname@(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ptree, int *offset, MessageHeader *header, gchar *operation, gchar *idlname)
{
gboolean stream_is_big_endian; /* big endianess */
proto_tree *tree _U_;
#define process_RequestOperation(){ \\
proto_item *pi; \\
if(header->message_type == Reply){ col_append_fstr(pinfo->cinfo, COL_INFO, " op = %s",operation); }; /* fill-up info column */ \\
pi=proto_tree_add_string_format_value(ptree,hf_operationrequest,tvb,0,0,operation," %s",operation);PROTO_ITEM_SET_GENERATED(pi); /* fill-up the field */ \\
};
stream_is_big_endian = is_big_endian(header); /* get endianess */