diff options
Diffstat (limited to 'epan/dissectors/packet-coseventcomm.c')
| -rw-r--r-- | epan/dissectors/packet-coseventcomm.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/epan/dissectors/packet-coseventcomm.c b/epan/dissectors/packet-coseventcomm.c index f8d461857c..d8d8d8e901 100644 --- a/epan/dissectors/packet-coseventcomm.c +++ b/epan/dissectors/packet-coseventcomm.c @@ -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; |