diff options
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index f8e6bfcb48..6b23049533 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -857,10 +857,8 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree proto_tree_add_item(jxta_welcome_tree, hf_jxta_welcome_peerid, tvb, token_offset, (gint) strlen(*current_token), ENC_ASCII|ENC_NA); } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_str(pinfo->cinfo, COL_INFO, (initiator ? " -> " : " <- ") ); - col_append_str(pinfo->cinfo, COL_INFO, *current_token); - } + col_append_str(pinfo->cinfo, COL_INFO, (initiator ? " -> " : " <- ") ); + col_append_str(pinfo->cinfo, COL_INFO, *current_token); if (NULL != found_addr) { found_addr->type = AT_URI; @@ -1289,16 +1287,14 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - if (check_col(pinfo->cinfo, COL_INFO)) { - if( complete_messages > 1 ) { - col_add_fstr(pinfo->cinfo, COL_INFO, "%d Messages, %s -> %s", complete_messages, src_addr->str, dst_addr->str); - } else { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message, %s -> %s", src_addr->str, dst_addr->str); - } - - col_set_writable(pinfo->cinfo, FALSE); + if( complete_messages > 1 ) { + col_add_fstr(pinfo->cinfo, COL_INFO, "%d Messages, %s -> %s", complete_messages, src_addr->str, dst_addr->str); + } else { + col_add_fstr(pinfo->cinfo, COL_INFO, "Message, %s -> %s", src_addr->str, dst_addr->str); } + col_set_writable(pinfo->cinfo, FALSE); + while( tree && (complete_messages > 0) ) { proto_item *jxta_msg_tree_item = NULL; proto_tree *jxta_msg_tree = NULL; |