diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-10-29 14:09:20 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-10-29 14:09:20 +0000 |
| commit | 0ad98563a24b8685545825aac889ef43bfc58809 (patch) | |
| tree | d44e5d34582bc2a05ba6be6bd8d818e9a813147f /epan/dissectors | |
| parent | 86c145ecb33495023a7966030faab5a69a3067eb (diff) | |
From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
+ before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344
svn path=/trunk/; revision=52948
Diffstat (limited to 'epan/dissectors')
130 files changed, 320 insertions, 376 deletions
diff --git a/epan/dissectors/packet-applemidi.c b/epan/dissectors/packet-applemidi.c index 15abcec58c..d00f02fec6 100644 --- a/epan/dissectors/packet-applemidi.c +++ b/epan/dissectors/packet-applemidi.c @@ -132,9 +132,6 @@ dissect_applemidi_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g col_set_str( pinfo->cinfo, COL_PROTOCOL, APPLEMIDI_DISSECTOR_SHORTNAME ); - /* Clear out stuff in the info column */ - col_clear( pinfo->cinfo, COL_INFO ); - col_add_fstr( pinfo->cinfo, COL_INFO, "%s", val_to_str( command, applemidi_commands, applemidi_unknown_command ) ); if ( tree ) { diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index 1b26a15296..c052b56cbc 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -776,7 +776,7 @@ dissect_mic_e( tvbuff_t *tvb, mic_e_msg_table[ (msg_a << 2) + (msg_b << 1) + msg_c ].std ); - col_add_str( pinfo->cinfo, COL_INFO, "MIC-E " ); + col_set_str( pinfo->cinfo, COL_INFO, "MIC-E " ); col_append_str( pinfo->cinfo, COL_INFO, info_buffer ); if ( parent_tree ) diff --git a/epan/dissectors/packet-atmtcp.c b/epan/dissectors/packet-atmtcp.c index 38ddf04610..23af488242 100644 --- a/epan/dissectors/packet-atmtcp.c +++ b/epan/dissectors/packet-atmtcp.c @@ -92,11 +92,11 @@ dissect_atmtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ length = tvb_get_ntohl(tvb, offset); if(length == ATMTCP_HDR_MAGIC) { - col_append_fstr(pinfo->cinfo, COL_INFO, " Command"); + col_append_str(pinfo->cinfo, COL_INFO, " Command"); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, " Data"); + col_append_str(pinfo->cinfo, COL_INFO, " Data"); } offset += 4; diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c index 0eeb3703b7..c67c4169f3 100644 --- a/epan/dissectors/packet-ax25-nol3.c +++ b/epan/dissectors/packet-ax25-nol3.c @@ -96,7 +96,6 @@ dissect_dx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) data_len = tvb_length_remaining( tvb, offset ); col_set_str( pinfo->cinfo, COL_PROTOCOL, "DX" ); - col_clear( pinfo->cinfo, COL_INFO ); col_add_fstr( pinfo->cinfo, COL_INFO, "%s", tvb_format_text( tvb, offset, 15 ) ); diff --git a/epan/dissectors/packet-bt3ds.c b/epan/dissectors/packet-bt3ds.c index 38662bf2bb..cef430c482 100644 --- a/epan/dissectors/packet-bt3ds.c +++ b/epan/dissectors/packet-bt3ds.c @@ -66,14 +66,13 @@ dissect_bt3ds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U guint8 value; col_set_str(pinfo->cinfo, COL_PROTOCOL, "3DS"); - col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 282dc2c36f..6615d95c05 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -392,10 +392,10 @@ dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index f05e42dd6a..4adfb52875 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -269,10 +269,10 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -290,7 +290,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U opcode = tvb_get_guint8(tvb, 0); offset++; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(opcode, opcode_vals, "<unknown>")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, opcode_vals, "<unknown>")); switch (opcode) { case 0x01: /* Error Response */ diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index fffde45c05..b93260188d 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -126,10 +126,10 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index 424e383f61..191b6d5324 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -953,17 +953,16 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint codec; col_set_str(pinfo->cinfo, COL_PROTOCOL, "AVDTP"); - col_clear(pinfo->cinfo, COL_INFO); l2cap_data = (btl2cap_data_t *) pinfo->private_data; switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -2026,11 +2025,11 @@ dissect_bta2dp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; case P2P_DIR_UNKNOWN: @@ -2143,11 +2142,11 @@ dissect_btvdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; case P2P_DIR_UNKNOWN: diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 2436d4b5e1..640ff38818 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -1121,7 +1121,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, wmem_tree_insert32_array(reassembling, key, fragment); } - col_append_fstr(pinfo->cinfo, COL_INFO, " [start]"); + col_append_str(pinfo->cinfo, COL_INFO, " [start]"); return offset; } else if (packet_type == PACKET_TYPE_CONTINUE) { if (pinfo->fd->flags.visited == 0) { @@ -1165,13 +1165,13 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } - col_append_fstr(pinfo->cinfo, COL_INFO, " [continue]"); + col_append_str(pinfo->cinfo, COL_INFO, " [continue]"); return offset; } else if (packet_type == PACKET_TYPE_END) { guint i_frame; tvbuff_t *next_tvb; - col_append_fstr(pinfo->cinfo, COL_INFO, " [end]"); + col_append_str(pinfo->cinfo, COL_INFO, " [end]"); k_interface_id = interface_id; k_adapter_id = adapter_id; @@ -1493,7 +1493,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 8; col_append_fstr(pinfo->cinfo, COL_INFO, " - 0x%08X%08X", (guint) (identifier >> 32), (guint) (identifier & 0xFFFFFFFF)); - if (identifier == 0x00) col_append_fstr(pinfo->cinfo, COL_INFO, " (PLAYING)"); + if (identifier == 0x00) col_append_str(pinfo->cinfo, COL_INFO, " (PLAYING)"); pitem = proto_tree_add_item(tree, hf_btavrcp_number_of_attributes, tvb, offset, 1, ENC_BIG_ENDIAN); number_of_attributes = tvb_get_guint8(tvb, offset); @@ -1570,10 +1570,10 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, " - 0x%08X%08X", (guint) (identifier >> 32), (guint) (identifier & 0xFFFFFFFF)); if (identifier == G_GINT64_CONSTANT(0x0000000000000000)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " (SELECTED)"); + col_append_str(pinfo->cinfo, COL_INFO, " (SELECTED)"); proto_item_append_text(pitem, " (SELECTED)"); } else if (identifier == G_GINT64_CONSTANT(0xFFFFFFFFFFFFFFFF)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " (NOT SELECTED)"); + col_append_str(pinfo->cinfo, COL_INFO, " (NOT SELECTED)"); proto_item_append_text(pitem, " (NOT SELECTED)"); } @@ -1591,7 +1591,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, col_append_fstr(pinfo->cinfo, COL_INFO, " - SongPosition: %ums", song_position); if (song_position == 0xFFFFFFFF) { proto_item_append_text(pitem, " (NOT SELECTED)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (NOT SELECTED)"); + col_append_str(pinfo->cinfo, COL_INFO, " (NOT SELECTED)"); } break; case EVENT_BATTERY_STATUS_CHANGED: @@ -1904,7 +1904,7 @@ dissect_browsing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; pitem = proto_tree_add_none_format(tree, hf_btavrcp_currect_path, tvb, offset, -1, "Current Path: /"); - col_append_fstr(pinfo->cinfo, COL_INFO, "Current Path: /"); + col_append_str(pinfo->cinfo, COL_INFO, "Current Path: /"); ptree = proto_item_add_subtree(pitem, ett_btavrcp_path); for (i_folder = 0; i_folder < folder_depth; ++i_folder) { @@ -2101,14 +2101,13 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) avctp_data = (btavctp_data_t *) pinfo->private_data; col_set_str(pinfo->cinfo, COL_PROTOCOL, "AVRCP"); - col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 214f4b9f89..3a55c3a30c 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -292,10 +292,10 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -313,8 +313,8 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bnep_type = bnep_type & 0x7F; offset += 1; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(bnep_type, bnep_type_vals, "Unknown type")); - if (extension_flag) col_append_fstr(pinfo->cinfo, COL_INFO, "+E"); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(bnep_type, bnep_type_vals, "Unknown type")); + if (extension_flag) col_append_str(pinfo->cinfo, COL_INFO, "+E"); if (bnep_type == BNEP_TYPE_GENERAL_ETHERNET || bnep_type == BNEP_TYPE_COMPRESSED_ETHERNET_DESTINATION_ONLY) { dst_addr = tvb_get_ptr(tvb, offset, 6); diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 39121b990a..1364dedc1e 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -121,10 +121,10 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 4561f3410a..36dc31981d 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -3217,10 +3217,10 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 49f3afee83..3e27a2ff00 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -3645,10 +3645,10 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -3675,7 +3675,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_EVT"); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(evt_code, evt_code_vals, "Unknown 0x%08x")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(evt_code, evt_code_vals, "Unknown 0x%08x")); if (param_length > 0) { switch(evt_code) { diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 9cb7c78e7c..906ec53ba0 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -54,10 +54,10 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c index 45c64cc90f..c73415f98d 100644 --- a/epan/dissectors/packet-bthcrp.c +++ b/epan/dissectors/packet-bthcrp.c @@ -133,10 +133,10 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (control_pdu_id >= 0x8000) { proto_item_append_text(pitem, " (Vendor Specific)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Vendor Specific)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Vendor Specific)"); } else if (control_pdu_id == 0x0000 || control_pdu_id >= 0x000B ) { proto_item_append_text(pitem, " (Reserved)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Reserved)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Reserved)"); } proto_tree_add_item(tree, hf_bthcrp_control_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -293,7 +293,7 @@ dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) /* flow: server <-> client */ tvbuff_t *next_tvb; - col_append_fstr(pinfo->cinfo, COL_INFO, "HCRP data stream"); + col_append_str(pinfo->cinfo, COL_INFO, "HCRP data stream"); next_tvb = tvb_new_subset_remaining(tvb, offset); call_dissector(data_handle, next_tvb, pinfo, tree); @@ -313,7 +313,7 @@ dissect_notification(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *pitem; if (is_client_message) { - col_append_fstr(pinfo->cinfo, COL_INFO, "Notification: unexpected notification stream"); + col_append_str(pinfo->cinfo, COL_INFO, "Notification: unexpected notification stream"); return offset; } @@ -325,14 +325,14 @@ dissect_notification(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (notification_pdu_id >= 0x8000) { proto_item_append_text(pitem, " (Vendor Specific)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Vendor Specific)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Vendor Specific)"); if (tvb_length_remaining(tvb, offset)) { proto_tree_add_item(tree, hf_bthcrp_data, tvb, offset, -1, ENC_NA); offset += tvb_length_remaining(tvb, offset); } } else if (notification_pdu_id != 0x001) { proto_item_append_text(pitem, " (Reserved)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Reserved)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Reserved)"); } switch(notification_pdu_id) { @@ -357,14 +357,13 @@ dissect_bthcrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) l2cap_data = (btl2cap_data_t *) pinfo->private_data; col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCRP"); - col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 23231d6444..e73b3fe027 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -1171,14 +1171,13 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dlci = rfcomm_data->dlci; col_set_str(pinfo->cinfo, COL_PROTOCOL, "HFP"); - col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", pinfo->p2p_dir); diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index 4c20891b45..f94f41df7c 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -431,48 +431,48 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_bthid_data_keyboard_leds_num_lock, tvb, offset, 1, ENC_BIG_ENDIAN); leds = tvb_get_guint8(tvb, offset); - col_append_fstr(pinfo->cinfo, COL_INFO, " - LEDs: "); + col_append_str(pinfo->cinfo, COL_INFO, " - LEDs: "); if (leds & 0x01) { - col_append_fstr(pinfo->cinfo, COL_INFO, "NumLock"); + col_append_str(pinfo->cinfo, COL_INFO, "NumLock"); shortcut_helper = TRUE; } if (leds & 0x02) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "CapsLock"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "CapsLock"); shortcut_helper = TRUE; } if (leds & 0x04) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "ScrollLock"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "ScrollLock"); shortcut_helper = TRUE; } if (leds & 0x08) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "Compose"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "Compose"); shortcut_helper = TRUE; } if (leds & 0x10) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "Kana"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "Kana"); shortcut_helper = TRUE; } if (leds & 0x20) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "Constant1"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "Constant1"); shortcut_helper = TRUE; } if (leds & 0x40) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "Constant2"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "Constant2"); shortcut_helper = TRUE; } if (leds & 0x80) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, ", "); - col_append_fstr(pinfo->cinfo, COL_INFO, "Constant3"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, "Constant3"); /*shortcut_helper = TRUE;*/ } if (!leds) { - col_append_fstr(pinfo->cinfo, COL_INFO, "none"); + col_append_str(pinfo->cinfo, COL_INFO, "none"); } offset += 1; @@ -491,44 +491,44 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_bthid_data_keyboard_modifier_left_ctrl, tvb, offset, 1, ENC_BIG_ENDIAN); modifier = tvb_get_guint8(tvb, offset); - col_append_fstr(pinfo->cinfo, COL_INFO, " - "); + col_append_str(pinfo->cinfo, COL_INFO, " - "); if (modifier & 0x80) { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "RIGHT GUI"); + col_append_str(pinfo->cinfo, COL_INFO, "RIGHT GUI"); shortcut_helper = TRUE; } if (modifier & 0x40) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "RIGHT ALT"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "RIGHT ALT"); shortcut_helper = TRUE; } if (modifier & 0x20) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "RIGHT SHIFT"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "RIGHT SHIFT"); shortcut_helper = TRUE; } if (modifier & 0x10) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "RIGHT CTRL"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "RIGHT CTRL"); shortcut_helper = TRUE; } if (modifier & 0x08) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "LEFT GUI"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "LEFT GUI"); shortcut_helper = TRUE; } if (modifier & 0x04) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "LEFT ALT"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "LEFT ALT"); shortcut_helper = TRUE; } if (modifier & 0x02) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "LEFT SHIFT"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "LEFT SHIFT"); shortcut_helper = TRUE; } if (modifier & 0x01) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "LEFT CTRL"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "LEFT CTRL"); shortcut_helper = TRUE; } offset += 1; @@ -541,7 +541,7 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (keycode) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -551,7 +551,7 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (keycode) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -561,7 +561,7 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (keycode) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -571,7 +571,7 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (keycode) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -581,7 +581,7 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (keycode) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } @@ -591,13 +591,13 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 1; if (keycode) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(keycode, &keycode_vals_ext, "Unknown")); shortcut_helper = TRUE; } if (shortcut_helper == FALSE) { - col_append_fstr(pinfo->cinfo, COL_INFO, "<action key up>"); + col_append_str(pinfo->cinfo, COL_INFO, "<action key up>"); } break; @@ -613,43 +613,43 @@ dissect_hid_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, buttons = tvb_get_guint8(tvb, offset); offset += 1; - if (buttons) col_append_fstr(pinfo->cinfo, COL_INFO, " - "); + if (buttons) col_append_str(pinfo->cinfo, COL_INFO, " - "); if (buttons & 0x01) { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button LEFT"); + col_append_str(pinfo->cinfo, COL_INFO, "Button LEFT"); shortcut_helper = TRUE; } if (buttons & 0x02) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button RIGHT"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button RIGHT"); shortcut_helper = TRUE; } if (buttons & 0x04) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button MIDDLE"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button MIDDLE"); } if (buttons & 0x08) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button 4"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button 4"); shortcut_helper = TRUE; } if (buttons & 0x10) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button 5"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button 5"); shortcut_helper = TRUE; } if (buttons & 0x20) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button 6"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button 6"); shortcut_helper = TRUE; } if (buttons & 0x40) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button 7"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button 7"); shortcut_helper = TRUE; } if (buttons & 0x80) { - if (shortcut_helper) col_append_fstr(pinfo->cinfo, COL_INFO, " + "); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Button 8"); + if (shortcut_helper) col_append_str(pinfo->cinfo, COL_INFO, " + "); + col_append_str(pinfo->cinfo, COL_INFO, "Button 8"); /* Not necessary, this is the last case where it is used * shortcut_helper = TRUE; */ @@ -701,10 +701,10 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -720,7 +720,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U parameter = transaction_type & 0x0F; transaction_type = transaction_type >> 4; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(transaction_type, transaction_type_vals, "Unknown TransactionType")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(transaction_type, transaction_type_vals, "Unknown TransactionType")); switch(transaction_type) { case 0x00: /* HANDSHAKE */ diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 037951dc9a..3037697026 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1574,10 +1574,10 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -1643,7 +1643,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cmd_str = val_to_str_const(cmd_code, command_code_vals, "Unknown cmd"); proto_item_append_text(ti_command, "%s", cmd_str); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", cmd_str); + col_append_str(pinfo->cinfo, COL_INFO, cmd_str); switch (cmd_code) { case 0x01: /* Command Reject */ diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c index 75755f736a..041d571bdc 100644 --- a/epan/dissectors/packet-btmcap.c +++ b/epan/dissectors/packet-btmcap.c @@ -113,14 +113,13 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint64 timestamp_sync_time; col_set_str(pinfo->cinfo, COL_PROTOCOL, "MCAP"); - col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -138,10 +137,10 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(op_code, op_code_vals, "Unknown Op Code")); if (op_code >= 0x11 && op_code <= 0x20) { proto_item_append_text(pitem, " (Clock Sync)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Clock Sync)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Clock Sync)"); } else { proto_item_append_text(pitem, " (Standard)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Standard)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Standard)"); } if (op_code & 0x01) { @@ -164,7 +163,7 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); } else if (mdl_id == 0x0000) { proto_item_append_text(pitem, " (Reserved)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Reserved)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Reserved)"); } if (op_code != 0x07 && mdl_id == 0xFFFF) { @@ -286,13 +285,13 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, " - %u", mdl_id); if (mdl_id == 0xFFFF) { proto_item_append_text(pitem, " (Indicates all MDLs)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Indicates all MDLs)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Indicates all MDLs)"); } else if (mdl_id >= 0x0001 && mdl_id <= 0xFEFF) { proto_item_append_text(pitem, " (Dynamic Range)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Dynamic Range)"); } else if (mdl_id == 0x0000) { proto_item_append_text(pitem, " (Reserved)"); - col_append_fstr(pinfo->cinfo, COL_INFO, " (Reserved)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Reserved)"); } if ((op_code == 0x03 || op_code == 0x05 || op_code == 0x07) && tvb_length_remaining(tvb, offset)) { diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 6bc4bc450f..ba1c400de1 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -1397,10 +1397,10 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -1408,7 +1408,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(code, &code_vals_ext, "Unknown")); if (code < BTOBEX_CODE_VALS_CONTINUE || code == BTOBEX_CODE_VALS_ABORT) { diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 6d70cd2cbd..a32b0d0701 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -567,10 +567,10 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c index a3e45fc7e8..5f554427ea 100644 --- a/epan/dissectors/packet-btsap.c +++ b/epan/dissectors/packet-btsap.c @@ -399,14 +399,13 @@ dissect_btsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAP"); - col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -419,7 +418,7 @@ dissect_btsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(btsap_tree, hf_btsap_header_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN); msg_id = tvb_get_guint8(tvb, offset); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(msg_id, msg_id_vals, "Unknown MsgID")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(msg_id, msg_id_vals, "Unknown MsgID")); offset += 1; proto_tree_add_item(btsap_tree, hf_btsap_header_number_of_parameters, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 0f5b05d3df..9b24f82ef0 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -3718,7 +3718,7 @@ dissect_sdp_service_search_attribute_response(proto_tree *tree, tvbuff_t *tvb, } if (is_continued) { - col_append_fstr(pinfo->cinfo, COL_INFO, "(fragment)"); + col_append_str(pinfo->cinfo, COL_INFO, "(fragment)"); } offset = dissect_continuation_state(tvb, tree, pinfo, offset + attribute_list_byte_count); @@ -3819,7 +3819,7 @@ dissect_sdp_service_attribute_response(proto_tree *tree, tvbuff_t *tvb, } if (is_continued) { - col_append_fstr(pinfo->cinfo, COL_INFO, "(fragment)"); + col_append_str(pinfo->cinfo, COL_INFO, "(fragment)"); } offset = dissect_continuation_state(tvb, tree, pinfo, offset + attribute_list_byte_count); @@ -3995,10 +3995,10 @@ dissect_btsdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c index 8f6de831a0..584f8d46b7 100644 --- a/epan/dissectors/packet-btsmp.c +++ b/epan/dissectors/packet-btsmp.c @@ -148,11 +148,11 @@ dissect_btsmp_key_dist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree param = tvb_get_guint8(tvb, offset); if (initiator) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Initiator Key(s): "); + col_append_str(pinfo->cinfo, COL_INFO, ", Initiator Key(s): "); ti_param = proto_tree_add_item(tree, hf_btsmp_initiator_key_distribution, tvb, offset, 1, ENC_NA); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, ", Responder Key(s): "); + col_append_str(pinfo->cinfo, COL_INFO, ", Responder Key(s): "); ti_param = proto_tree_add_item(tree, hf_btsmp_responder_key_distribution, tvb, offset, 1, ENC_NA); } @@ -162,15 +162,15 @@ dissect_btsmp_key_dist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree proto_tree_add_item(st_param, hf_btsmp_key_dist_sign, tvb, offset, 1, ENC_LITTLE_ENDIAN); if (param & 0x01) { proto_item_append_text(ti_param, "LTK "); - col_append_fstr(pinfo->cinfo, COL_INFO, "LTK "); + col_append_str(pinfo->cinfo, COL_INFO, "LTK "); } if (param & 0x02) { proto_item_append_text(ti_param, "IRK "); - col_append_fstr(pinfo->cinfo, COL_INFO, "IRK "); + col_append_str(pinfo->cinfo, COL_INFO, "IRK "); } if (param & 0x04) { proto_item_append_text(ti_param, "CSRK "); - col_append_fstr(pinfo->cinfo, COL_INFO, "CSRK "); + col_append_str(pinfo->cinfo, COL_INFO, "CSRK "); } return offset + 1; @@ -188,10 +188,10 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + col_set_str(pinfo->cinfo, COL_INFO, "Sent "); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", @@ -209,13 +209,13 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U opcode = tvb_get_guint8(tvb, 0); offset++; - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(opcode, opcode_vals, "<unknown>")); + col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, opcode_vals, "<unknown>")); switch (opcode) { case 0x01: /* Pairing Request */ case 0x02: /* Pairing Response */ { - col_append_fstr(pinfo->cinfo, COL_INFO, ": "); + col_append_str(pinfo->cinfo, COL_INFO, ": "); proto_tree_add_item(st, hf_btsmp_io_capabilities, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; @@ -271,7 +271,7 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U break; case 0x0b: /* Security Request */ - col_append_fstr(pinfo->cinfo, COL_INFO, ": "); + col_append_str(pinfo->cinfo, COL_INFO, ": "); offset = dissect_btsmp_auth_req(tvb, offset, pinfo, st); break; diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index 1e59bab532..cec80b49ed 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -838,7 +838,6 @@ dissect_coap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* add informations to the packet list */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "CoAP"); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(ttype, vals_ttype_short, "Unknown %d")); col_append_fstr(pinfo->cinfo, COL_INFO, ", MID:%u", mid); col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(code, vals_code, "Unknown %d")); diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c index 04378f5115..5d7ff7f1f1 100644 --- a/epan/dissectors/packet-componentstatus.c +++ b/epan/dissectors/packet-componentstatus.c @@ -194,7 +194,7 @@ dissect_componentstatusprotocol_message(tvbuff_t *message_tvb, packet_info *pinf guint8 type; type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, message_type_values, "Unknown ComponentStatusProtocol type")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, message_type_values, "Unknown ComponentStatusProtocol type")); proto_tree_add_item(componentstatusprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN); flags_item = proto_tree_add_item(componentstatusprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_message_flags); diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 7d0db56da1..b14cc535c6 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -3024,7 +3024,6 @@ cops_transaction_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *st, guint8 op g_snprintf(info,sizeof(info),"COPS %-20s - %s",val_to_str_const(op_code,cops_op_code_vals, "Unknown"), val_to_str_const(code16,table_cops_dqos_transaction_id, "Unknown")); - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO,info); } @@ -3417,7 +3416,6 @@ cops_mm_transaction_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *st, guint8 g_snprintf(info,sizeof(info),"COPS %-20s - %s",val_to_str_const(op_code,cops_op_code_vals, "Unknown"), val_to_str_const(code16,table_cops_mm_transaction_id, "Unknown")); - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO,info); } diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index cfc3b0e3b6..6cbb27015b 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -481,7 +481,7 @@ dissect_dbus_hdr(tvbuff_t *tvb, dbus_info_t *dinfo, proto_tree *tree, int offset offset += 1; type = tvb_get_guint8(tvb, offset); - col_add_str(dinfo->pinfo->cinfo, COL_INFO, val_to_str_const(type, message_type_vals, "")); + col_set_str(dinfo->pinfo->cinfo, COL_INFO, val_to_str_const(type, message_type_vals, "")); proto_tree_add_item(hdr_tree, &hfi_dbus_hdr_type, tvb, offset, 1, dinfo->enc); offset += 1; diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 5c8e217e0e..ef9124268c 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -4874,7 +4874,6 @@ dissect_dcm_assoc_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu proto_item_set_text(assoc_header_pitem, "%s", buf_desc); col_append_str(pinfo->cinfo, COL_INFO, buf_desc); - col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_INFO, wmem_strdup(wmem_file_scope(), buf_desc)); /* requires SE not EP memory */ /* proto_item and proto_tree are one and the same */ @@ -7045,7 +7044,7 @@ dissect_dcm_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 off } if (pdu_type == 4) { - col_add_str(pinfo->cinfo, COL_INFO, "P-DATA"); + col_set_str(pinfo->cinfo, COL_INFO, "P-DATA"); offset = dissect_dcm_pdu_data(tvb, pinfo, dcm_ptree, assoc, offset, pdu_len, &pdu_data_description); diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index a064c3193a..63ffa3ed5f 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1951,8 +1951,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *columnstreeti; proto_tree *ColumnsTree; - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "Use Custom Columns for Infos"); + col_set_str(pinfo->cinfo, COL_INFO, "Use Custom Columns for Infos"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT"); diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 47fad19997..e1b10e28f3 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -414,7 +414,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint(dhcpfo_tree, hf_dhcpfo_type, tvb, offset, 1, type); } - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, failover_vals, "Unknown Packet")); offset += 1; diff --git a/epan/dissectors/packet-dvb-ait.c b/epan/dissectors/packet-dvb-ait.c index 44dbebe4ee..86a0247bab 100644 --- a/epan/dissectors/packet-dvb-ait.c +++ b/epan/dissectors/packet-dvb-ait.c @@ -365,7 +365,6 @@ dissect_dvb_ait(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data guint32 org_id; guint16 app_id; - col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_INFO, "Application Information Table (AIT)"); if (tree) { diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index f8abcf4005..d2d737d71b 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -2715,7 +2715,7 @@ dissect_dvbci_payload_hc(guint32 tag, gint len_field _U_, if (pmt_flag) { pmt_tvb = tvb_new_subset_remaining(tvb, offset); if (mpeg_pmt_handle) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); /* prevent mpeg_pmt dissector from clearing col_info */ col_set_fence(pinfo->cinfo, COL_INFO); call_dissector(mpeg_pmt_handle, pmt_tvb, pinfo, tree); @@ -3604,9 +3604,9 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field, break; if (dvbci_dissect_lsc_msg && circuit && circuit->dissector_handle) { msg_handle = circuit->dissector_handle; - col_append_fstr(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); col_set_fence(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_PROTOCOL, ", "); + col_append_str(pinfo->cinfo, COL_PROTOCOL, ", "); col_set_fence(pinfo->cinfo, COL_PROTOCOL); } else { @@ -3656,7 +3656,7 @@ dissect_dvbci_payload_opp(guint32 tag, gint len_field _U_, break; } /* prevent dvb_nit dissector from clearing the dvb-ci infos */ - col_append_fstr(pinfo->cinfo, COL_INFO, ", "); + col_append_str(pinfo->cinfo, COL_INFO, ", "); col_set_fence(pinfo->cinfo, COL_INFO); do { table_id = tvb_get_guint8(nit_loop_tvb, nit_loop_offset); @@ -3982,7 +3982,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tag = tvb_get_guint8(tvb,0); tag_str = try_val_to_str(tag, dvbci_spdu_tag); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(tag, dvbci_spdu_tag, "Invalid SPDU")); pi = proto_tree_add_item(sess_tree, hf_dvbci_spdu_tag, tvb, 0, 1, ENC_BIG_ENDIAN); if (tag_str == NULL) { @@ -4309,7 +4309,7 @@ dissect_dvbci_tpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!payload_tvb) { if (hdr_tag == T_DATA_MORE) { pinfo->fragmented = TRUE; - col_append_fstr(pinfo->cinfo, COL_INFO, " (Message fragment)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Message fragment)"); } else { payload_tvb = body_tvb; } @@ -4350,7 +4350,7 @@ dissect_dvbci_lpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, payload_len = tvb_reported_length(tvb); - col_add_str(pinfo->cinfo, COL_INFO, "LPDU"); + col_set_str(pinfo->cinfo, COL_INFO, "LPDU"); ti = proto_tree_add_text(tree, tvb, 0, 2, "Link Layer"); link_tree = proto_item_add_subtree(ti, ett_dvbci_link); @@ -4382,7 +4382,7 @@ dissect_dvbci_lpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!payload_tvb) { if (more_last == ML_MORE) { pinfo->fragmented = TRUE; - col_append_fstr(pinfo->cinfo, COL_INFO, " (Message fragment)"); + col_append_str(pinfo->cinfo, COL_INFO, " (Message fragment)"); } else payload_tvb = tvb_new_subset_remaining(tvb, 2); } diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 9ba50e2fc6..420c23c2da 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1930,8 +1930,6 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, proto_tree_add_item(item_tree, hf_enip_cpf_sai_seqnum, tvb, offset+10, 4, ENC_LITTLE_ENDIAN ); /* Add info to column */ - col_clear(pinfo->cinfo, COL_INFO); - col_add_fstr(pinfo->cinfo, COL_INFO, "Connection: ID=0x%08X, SEQ=%010d", tvb_get_letohl( tvb, offset+6 ), tvb_get_letohl( tvb, offset+10 ) ); diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 5b165fe2cc..7ec75f560d 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -1634,7 +1634,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t * if (!response) { /* request */ - col_append_fstr(pinfo->cinfo, COL_INFO, "Write Multiple Parameter by Index" ); + col_append_str(pinfo->cinfo, COL_INFO, "Write Multiple Parameter by Index" ); while ( !lastentry && tvb_reported_length_remaining(tvb, offset) > 0 ) { diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 3db1c210d8..735507e263 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -455,13 +455,13 @@ static void dissect_erldp_handshake(tvbuff_t *tvb, packet_info *pinfo, proto_tre offset += 4; proto_tree_add_item(tree, hf_erldp_digest, tvb, offset, 16, ENC_NA); /*offset += 16;*/ - col_add_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_REPLY"); + col_set_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_REPLY"); break; case 'a' : proto_tree_add_item(tree, hf_erldp_digest, tvb, offset, 16, ENC_NA); /*offset += 16;*/ - col_add_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "SEND_CHALLENGE_ACK"); break; case 's' : @@ -499,7 +499,7 @@ static void dissect_erldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre offset += 4; if (msg_len == 0) { - col_add_str(pinfo->cinfo, COL_INFO, "KEEP_ALIVE"); + col_set_str(pinfo->cinfo, COL_INFO, "KEEP_ALIVE"); return; } @@ -525,7 +525,7 @@ static void dissect_erldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre default: proto_tree_add_item(erldp_tree, hf_erldp_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - col_add_str(pinfo->cinfo, COL_INFO, "unknown header format"); + col_set_str(pinfo->cinfo, COL_INFO, "unknown header format"); return; } } diff --git a/epan/dissectors/packet-esio.c b/epan/dissectors/packet-esio.c index da3301e16a..48a448e60c 100644 --- a/epan/dissectors/packet-esio.c +++ b/epan/dissectors/packet-esio.c @@ -155,7 +155,7 @@ dissect_esio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ "Data transfer: Src ID: %d, Dst ID(s): %d", esio_src_id, esio_dst_id); if (esio_nbr_data_transfers > 1) { - col_append_fstr( pinfo->cinfo, COL_INFO, + col_append_str( pinfo->cinfo, COL_INFO, " ..."); } break; diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c index f55d35e84b..dfd695d7e9 100644 --- a/epan/dissectors/packet-ged125.c +++ b/epan/dissectors/packet-ged125.c @@ -998,7 +998,6 @@ dissect_ged125_base_messages(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree message_type = tvb_get_ntohl(tvb, 4); col_set_str(pinfo->cinfo, COL_PROTOCOL, "GED125"); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "%s %u bytes", val_to_str(message_type, base_message_values, "Unknown %d"), size); diff --git a/epan/dissectors/packet-gopher.c b/epan/dissectors/packet-gopher.c index 3b99e12df3..d40acd0eab 100644 --- a/epan/dissectors/packet-gopher.c +++ b/epan/dissectors/packet-gopher.c @@ -169,7 +169,7 @@ dissect_gopher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ while (find_dir_tokens(tvb, offset + 1, &sel_start, &host_start, &port_start, &line_len, &next_offset)) { if (!is_dir) { /* First time */ proto_item_append_text(ti, "[Directory list]"); - col_append_fstr(pinfo->cinfo, COL_INFO, ": [Directory list]"); + col_append_str(pinfo->cinfo, COL_INFO, ": [Directory list]"); } name = tvb_get_string(wmem_packet_scope(), tvb, offset + 1, sel_start - offset - 2); diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 14b2960823..774d02d316 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -10743,12 +10743,12 @@ dissect_sacch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (short_pd == 0) { - col_append_fstr(pinfo->cinfo, COL_INFO, "(RR) "); + col_append_str(pinfo->cinfo, COL_INFO, "(RR) "); get_rr_short_pd_msg_params(mess_type, &msg_str, &ett_tree, &hf_idx, &msg_fcn_p); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, "(Unknown) "); + col_append_str(pinfo->cinfo, COL_INFO, "(Unknown) "); } /* diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index da6415e726..7d15fb0c08 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -7254,7 +7254,7 @@ dissect_dl_gprs_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, RlcMa { guint64 e; - col_add_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); ti = proto_tree_add_protocol_format(tree, proto_gsm_rlcmac, tvb, bit_offset >> 3, -1, "GPRS DL DATA (CS%d)", data->block_format & 0x0F); @@ -7317,7 +7317,7 @@ dissect_dl_gprs_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, RlcMa } } data->u.MESSAGE_TYPE = tvb_get_bits8(tvb, message_type_offset, 6); - col_add_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_fstr(pinfo->cinfo, COL_INFO, ":", "GPRS DL:%s", val_to_str_ext(data->u.MESSAGE_TYPE, &dl_rlc_message_type_vals_ext, "Unknown Messsage Type")); ti = proto_tree_add_protocol_format(tree, proto_gsm_rlcmac, tvb, message_type_offset >> 3, -1, "GSM RLC/MAC: %s (%d) (Downlink)", @@ -7383,7 +7383,7 @@ dissect_egprs_dl_header_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre guint16 bit_length = tvb_length(tvb) * 8; - col_add_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "EGPRS DL:HEADER"); /* Dissect the MAC header */ ti = proto_tree_add_protocol_format(tree, proto_gsm_rlcmac, tvb, 0, -1, @@ -7428,7 +7428,7 @@ dissect_ul_pacch_access_burst(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre csnStream_t ar; guint16 bit_length = tvb_length(tvb) * 8; - col_add_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "PACCH ACCESS BURST"); ti = proto_tree_add_protocol_format(tree, proto_gsm_rlcmac, tvb, 0, -1, "GPRS UL PACCH ACCESS BURST"); @@ -7474,7 +7474,7 @@ dissect_ul_gprs_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, RlcMa length_indicator_t li_array[10]; guint8 li_count = array_length(li_array); - col_add_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "GPRS UL"); if(payload_type == PAYLOAD_TYPE_DATA) { @@ -7557,7 +7557,7 @@ dissect_egprs_ul_header_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre guint16 bit_offset = 0; guint16 bit_length = tvb_length(tvb) * 8; - col_add_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM RLC/MAC"); col_append_sep_str(pinfo->cinfo, COL_INFO, ":", "EGPRS UL:HEADER"); ti = proto_tree_add_protocol_format(tree, proto_gsm_rlcmac, tvb, bit_offset >> 3, -1, "GSM RLC/MAC: EGPRS UL HEADER"); diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c index f85e3c409c..ed1a58aa72 100644 --- a/epan/dissectors/packet-gsm_sim.c +++ b/epan/dissectors/packet-gsm_sim.c @@ -1170,7 +1170,7 @@ dissect_gsm_apdu(guint8 ins, guint8 p1, guint8 p2, guint8 p3, tvbuff_t *tvb, break; switch (p1) { case 0x03: /* parent DF */ - col_append_fstr(pinfo->cinfo, COL_INFO, "Parent DF "); + col_append_str(pinfo->cinfo, COL_INFO, "Parent DF "); break; case 0x04: /* select by AID */ col_append_fstr(pinfo->cinfo, COL_INFO, "Application %s ", @@ -1179,7 +1179,7 @@ dissect_gsm_apdu(guint8 ins, guint8 p1, guint8 p2, guint8 p3, tvbuff_t *tvb, break; case 0x09: /* select by relative path */ - col_append_fstr(pinfo->cinfo, COL_INFO, "."); + col_append_str(pinfo->cinfo, COL_INFO, "."); /* fallthrough */ case 0x08: /* select by absolute path */ for (i = 0; i < p3; i += 2) { @@ -1188,7 +1188,7 @@ dissect_gsm_apdu(guint8 ins, guint8 p1, guint8 p2, guint8 p3, tvbuff_t *tvb, val_to_str(g16, mf_dfs, "%04x")); proto_tree_add_item(tree, hf_file_id, tvb, offset+DATA_OFFS+i, 2, ENC_BIG_ENDIAN); } - col_append_fstr(pinfo->cinfo, COL_INFO, " "); + col_append_str(pinfo->cinfo, COL_INFO, " "); break; default: g16 = tvb_get_ntohs(tvb, offset+DATA_OFFS); diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 244e6893aa..2255efbe7f 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -7966,7 +7966,7 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) default: break; } - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(gtp_hdr->message, >p_message_type_ext, "Unknown")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(gtp_hdr->message, >p_message_type_ext, "Unknown")); if (tree) { proto_tree_add_uint(gtp_tree, hf_gtp_message_type, tvb, offset, 1, gtp_hdr->message); } diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 16478bb198..7c9da445da 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -5225,7 +5225,7 @@ dissect_gtpv2(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* message type is in octet 2 */ message_type = tvb_get_guint8(tvb, 1); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(message_type, >pv2_message_type_vals_ext, "Unknown")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(message_type, >pv2_message_type_vals_ext, "Unknown")); p_flag = (tvb_get_guint8(tvb, offset) & 0x10) >> 4; diff --git a/epan/dissectors/packet-hazelcast.c b/epan/dissectors/packet-hazelcast.c index 4ea106e45a..8fb7ac98b4 100644 --- a/epan/dissectors/packet-hazelcast.c +++ b/epan/dissectors/packet-hazelcast.c @@ -333,7 +333,6 @@ static void dissect_hazelcast_message(tvbuff_t *tvb, packet_info *pinfo _U_, pro proto_tree_add_item(hcast_tree, hf_hazelcast_operation, tvb, offset, 1, ENC_BIG_ENDIAN); operation = tvb_get_guint8(tvb, offset); - col_clear(pinfo->cinfo,COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(operation, operationTypes, "Unknown (0x%02x)")); offset += 1; diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 8141b4f23b..3f04ec0f98 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -114,7 +114,6 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_USB"); - col_clear(pinfo->cinfo, COL_INFO); usb_data = (usb_data_t *)data; @@ -124,11 +123,11 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) switch (pinfo->p2p_dir) { case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent"); + col_set_str(pinfo->cinfo, COL_INFO, "Sent"); break; case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd"); + col_set_str(pinfo->cinfo, COL_INFO, "Rcvd"); break; default: @@ -192,7 +191,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_fragment, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_GENERATED(pitem); - col_append_fstr(pinfo->cinfo, COL_INFO, " Fragment"); + col_append_str(pinfo->cinfo, COL_INFO, " Fragment"); } else if (reassembled && pinfo->fd->num == reassembled->reassembled_in) { pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_complete, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_GENERATED(pitem); diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index be22bfee25..2ad91b2a36 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -263,7 +263,6 @@ dissect_hpfeeds_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HPFEEDS"); /* Clear out stuff in the info column */ - col_clear(pinfo->cinfo,COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s", val_to_str(opcode, opcode_vals, "Unknown (0x%02x)")); diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 08953f464e..c8a9748567 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -347,7 +347,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRP"); opcode = tvb_get_guint8(tvb, 1); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, hsrp_opcode_vals, "Unknown")); if (opcode < 3) { diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index af7d9bd895..a4de6d4c4e 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -5727,7 +5727,7 @@ static void dissect_hs20_anqp(proto_tree *tree, tvbuff_t *tvb, packet_info *pinf val_to_str(subtype, hs20_anqp_subtype_vals, "Unknown (%u)")); } else if (idx == 1) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", .."); + col_append_str(pinfo->cinfo, COL_INFO, ", .."); } proto_tree_add_item(tree, hf_hs20_anqp_subtype, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -5787,7 +5787,7 @@ dissect_anqp_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, int offse val_to_str_ext(id, &anqp_info_id_vals_ext, "Unknown (%u)")); } else if (idx == 1) { proto_item_append_text(tree, ", .."); - col_append_fstr(pinfo->cinfo, COL_INFO, ", .."); + col_append_str(pinfo->cinfo, COL_INFO, ", .."); } } tree = proto_item_add_subtree(item, ett_gas_anqp); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 86e42a4bc1..033990ccf8 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -479,7 +479,6 @@ dissect_ieee802154_nonask_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* Add the protocol name. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4 non-ASK PHY"); /* Add the packet length. */ - col_clear(pinfo->cinfo, COL_PACKET_LENGTH); col_add_fstr(pinfo->cinfo, COL_PACKET_LENGTH, "%i", tvb_length(tvb)); preamble=tvb_get_letohl(tvb,offset); @@ -646,7 +645,6 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g /* Add the protocol name. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4"); /* Add the packet length. */ - col_clear(pinfo->cinfo, COL_PACKET_LENGTH); col_add_fstr(pinfo->cinfo, COL_PACKET_LENGTH, "%i", tvb_length(tvb)); /* Add the packet length to the filter field */ @@ -1533,7 +1531,7 @@ dissect_ieee802154_assoc_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } else { /* Association was unsuccessful. */ - col_append_fstr(pinfo->cinfo, COL_INFO, ", Unsuccessful"); + col_append_str(pinfo->cinfo, COL_INFO, ", Unsuccessful"); } /* Update the address table. */ diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index ff1b230e23..c354e538ba 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -589,7 +589,7 @@ dissect_igmp_v3_report(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int /* number of group records */ num = tvb_get_ntohs(tvb, offset); if (!num) - col_append_fstr(pinfo->cinfo, COL_INFO, " - General query"); + col_append_str(pinfo->cinfo, COL_INFO, " - General query"); proto_tree_add_uint(tree, hf_num_grp_recs, tvb, offset, 2, num); offset += 2; @@ -621,7 +621,7 @@ dissect_igmp_v3_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int t maddr = tvb_get_ipv4(tvb, offset); if (! maddr) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", general"); + col_append_str(pinfo->cinfo, COL_INFO, ", general"); } else { col_append_fstr(pinfo->cinfo, COL_INFO, ", specific for group %s", ip_to_str((guint8*)&maddr)); @@ -675,7 +675,7 @@ dissect_igmp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int type, i maddr = tvb_get_ipv4(tvb, offset); if (! maddr) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", general"); + col_append_str(pinfo->cinfo, COL_INFO, ", general"); } else { if (type == IGMP_V2_LEAVE_GROUP) { col_append_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 1035fc5525..68ea68c952 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -2065,7 +2065,6 @@ dissect_infiniband_link(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Mark the Packet type as Infiniband in the wireshark UI */ /* Clear other columns */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand Link"); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(operand, Operand_Description, "Unknown (0x%1x)")); @@ -2987,8 +2986,7 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * label = val_to_str_const(MadData.attributeID, CM_Attributes, "(Unknown CM Attribute)"); proto_item_set_text(CM_header_item, "CM %s", label); - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "CM: %s", label); + col_add_fstr(pinfo->cinfo, COL_INFO, "CM: %s", label); CM_header_tree = proto_item_add_subtree(CM_header_item, ett_cm); diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c index 502d11a159..157273faf1 100644 --- a/epan/dissectors/packet-ismacryp.c +++ b/epan/dissectors/packet-ismacryp.c @@ -263,7 +263,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (pref_user_mode == FALSE){ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",val_to_str_const(mode, modetypenames, "user mode")); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s","user mode"); + col_append_str(pinfo->cinfo, COL_INFO, ", user mode"); } user_mode = pref_user_mode; } @@ -271,7 +271,7 @@ static void dissect_ismacryp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tre col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_20); user_mode = TRUE; /* display mode */ - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s","user mode"); + col_append_str(pinfo->cinfo, COL_INFO, ", user mode"); } /* select correct AU values depending on version & selected mode in preferences menu if not in user_mode */ if (user_mode == TRUE){ /* use values set in preference menu */ diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 5e2772981d..d95fd4d5be 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -211,7 +211,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ col_set_str(pinfo->cinfo, COL_PROTOCOL, "KINK"); /* It shows kink type by the type value. */ - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, kink_type_vals, "unknown")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, kink_type_vals, "unknown")); /* Make the kink tree */ ti = proto_tree_add_item(tree, proto_kink, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index 259ea160ea..523d7b932a 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.c @@ -551,7 +551,7 @@ dissect_knet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) bytes_left = TRUE; col_clear(pinfo->cinfo, COL_INFO); - col_add_str(pinfo->cinfo, COL_PROTOCOL, "KNET"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KNET"); if((current_protocol == KNET_SCTP_PACKET) || (current_protocol == KNET_TCP_PACKET)) { @@ -643,7 +643,7 @@ dissect_knet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if(current_protocol == KNET_TCP_PACKET && ((struct tcpinfo*)(pinfo->private_data))->is_reassembled) - col_add_str(pinfo->cinfo, COL_INFO, "REASSEMBLED PACKET"); + col_set_str(pinfo->cinfo, COL_INFO, "REASSEMBLED PACKET"); else col_add_fstr(pinfo->cinfo, COL_INFO, "Messages: %d %s", messageindex + 1, wmem_strbuf_get_str(info_field)); diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index ac6ec418b4..65f93a390f 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -232,7 +232,7 @@ dissect_kpasswd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboo proto_tree_add_uint(kpasswd_tree, hf_kpasswd_message_len, tvb, offset, 2, message_len); proto_tree_add_uint(kpasswd_tree, hf_kpasswd_version, tvb, offset+2, 2, version); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(version, vers_vals, "Unknown command")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(version, vers_vals, "Unknown command")); proto_tree_add_uint(kpasswd_tree, hf_kpasswd_ap_req_len, tvb, offset+4, 2, ap_req_len); offset+=6; diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 81d44128c8..9d6a400b63 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -565,7 +565,7 @@ dissect_lapd_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean next_tvb = tvb_new_subset_remaining(tvb, lapd_header_len); /* Dissection done, append " | " to COL_INFO */ - col_append_fstr(pinfo->cinfo, COL_INFO, " | "); + col_append_str(pinfo->cinfo, COL_INFO, " | "); col_set_fence(pinfo->cinfo, COL_INFO); if (XDLC_IS_INFORMATION(control)) { diff --git a/epan/dissectors/packet-ltp.c b/epan/dissectors/packet-ltp.c index 2416589ffb..624c9745c8 100644 --- a/epan/dissectors/packet-ltp.c +++ b/epan/dissectors/packet-ltp.c @@ -714,7 +714,7 @@ dissect_ltp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_uint(ltp_header_tree,hf_ltp_trl_extn_cnt,tvb,frame_offset,1,trl_extn_cnt); frame_offset++; - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(ltp_type,ltp_type_col_info,"Protocol Error")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(ltp_type,ltp_type_col_info,"Protocol Error")); if((unsigned)frame_offset >= tvb_length(tvb)){ col_set_str(pinfo->cinfo, COL_INFO, "Protocol Error"); diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index a622c3585d..ac1903c4c2 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -907,8 +907,6 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_type = (flags & LWRES_LWPACKETFLAG_RESPONSE) ? 2 : 1; - col_clear(pinfo->cinfo, COL_INFO); - if(flags & LWRES_LWPACKETFLAG_RESPONSE) { col_add_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index caba640aff..fef58c25b1 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -4570,9 +4570,9 @@ dissect_mbim_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat datagram_index, datagram_length, ENC_NA); datagram_tvb = tvb_new_subset_length(tvb, datagram_index, datagram_length); if (total) { - col_add_str(pinfo->cinfo, COL_PROTOCOL, "|"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "|"); col_set_fence(pinfo->cinfo, COL_PROTOCOL); - col_add_str(pinfo->cinfo, COL_INFO, " | "); + col_set_str(pinfo->cinfo, COL_INFO, " | "); col_set_fence(pinfo->cinfo, COL_INFO); } call_dissector(dissector, datagram_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 8bcc968e2e..c87c750f97 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -667,7 +667,6 @@ dissect_mmse_standalone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMSE"); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "MMS %s", message_type); dissect_mmse(tvb, pinfo, tree, pdut, message_type); diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 17a326b885..46147f2b4a 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -509,7 +509,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(line_type){ case REQUEST_LINE: { - col_add_str(pinfo->cinfo, COL_INFO, "Request: "); + col_set_str(pinfo->cinfo, COL_INFO, "Request: "); line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Request_Line, tvb, offset, linelen, ENC_UTF_8); request_line_item = proto_item_add_subtree(line_item, ett_Request_Line); /* version */ @@ -533,7 +533,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case RESPONSE_LINE: { - col_add_str(pinfo->cinfo, COL_INFO, "Response: "); + col_set_str(pinfo->cinfo, COL_INFO, "Response: "); line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Response_Line, tvb, offset, linelen, ENC_UTF_8); response_line_item = proto_item_add_subtree(line_item, ett_Response_Line); /* version */ @@ -563,7 +563,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case EVENT_LINE: { - col_add_str(pinfo->cinfo, COL_INFO, "Event: "); + col_set_str(pinfo->cinfo, COL_INFO, "Event: "); line_item = proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Event_Line, tvb, offset, linelen, ENC_UTF_8); event_line_item = proto_item_add_subtree(line_item, ett_Event_Line); /* version */ @@ -592,7 +592,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) default: { /* mark whole packet as unknown and return */ - col_add_str(pinfo->cinfo, COL_INFO, "UNKNOWN message"); + col_set_str(pinfo->cinfo, COL_INFO, "UNKNOWN message"); proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Message, tvb, offset, tvb_len, ENC_UTF_8); return tvb_len; } diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 7a41efaf56..854458209e 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -183,7 +183,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSDP"); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(tvb_get_guint8(tvb, 0), + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(tvb_get_guint8(tvb, 0), msdp_types, "<Unknown MSDP message type>")); diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index bc98ed3e7e..f1a80766eb 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -421,16 +421,16 @@ getFrameDirection(tvbuff_t *tvb, packet_info *pinfo, proto_tree *field_tree, int proto_tree_add_uint(field_tree, hf_mux27010_direction, tvb, offset, 1, direction_in_out & 3); switch (direction_in_out & 3) { case (0):/*Application >> Module*/ - col_add_str(pinfo->cinfo, COL_DEF_SRC, "Application DLCI "); - col_add_str(pinfo->cinfo, COL_DEF_DST, "Module"); + col_set_str(pinfo->cinfo, COL_DEF_SRC, "Application DLCI "); + col_set_str(pinfo->cinfo, COL_DEF_DST, "Module"); break; case (1):/*Module >> Application*/ - col_add_str(pinfo->cinfo, COL_DEF_SRC, "Module DLCI "); - col_add_str(pinfo->cinfo, COL_DEF_DST, "Application"); + col_set_str(pinfo->cinfo, COL_DEF_SRC, "Module DLCI "); + col_set_str(pinfo->cinfo, COL_DEF_DST, "Application"); break; default:/*?? >> ??*/ - col_add_str(pinfo->cinfo, COL_DEF_SRC, "Direction not valid "); - col_add_str(pinfo->cinfo, COL_DEF_DST, "Direction not valid "); + col_set_str(pinfo->cinfo, COL_DEF_SRC, "Direction not valid "); + col_set_str(pinfo->cinfo, COL_DEF_DST, "Direction not valid "); break; } diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index 2ce2a2e8e4..7df432d685 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -290,7 +290,6 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } rep = val_to_str(nasdaq_itch_type, message_types_val, "Unknown packet type (0x%02x) "); - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO, rep); if (tree) { diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 3d351613ac..80990c29dd 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -333,7 +333,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) case NBIPX_SESSION_DATA: case NBIPX_SESSION_END: case NBIPX_SESSION_END_ACK: - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet_type, nbipx_data_stream_type_vals, "Unknown")); dissect_conn_control(tvb, offset, nbipx_tree); @@ -373,7 +373,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) break; case NBIPX_DIRECTED_DATAGRAM: - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet_type, nbipx_data_stream_type_vals, "Unknown")); dissect_conn_control(tvb, offset, nbipx_tree); @@ -399,7 +399,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) break; default: - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet_type, nbipx_data_stream_type_vals, "Unknown")); /* diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 85c4da73e7..d0bf54509f 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3256,8 +3256,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "[NDMP fragment] "); + col_set_str(pinfo->cinfo, COL_INFO, "[NDMP fragment] "); /* * Add the record marker information to the tree diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index a11f788c1b..6f7e1fe541 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -4899,7 +4899,7 @@ display_access_items(tvbuff_t* tvb, int offset, packet_info* pinfo, proto_tree* } if (mtype!='S' && mtype!='R') { if (nfsv3) { - col_append_fstr(pinfo->cinfo, COL_INFO,"]"); + col_append_str(pinfo->cinfo, COL_INFO,"]"); } else { g_string_append_printf (optext, "]"); } @@ -9388,7 +9388,7 @@ dissect_nfs4_request_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre if (first_operation==0) /* Seperator between operation text */ - col_append_fstr(pinfo->cinfo, COL_INFO, " |"); + col_append_str(pinfo->cinfo, COL_INFO, " |"); if (op_summary[summary_counter].optext->len > 0) col_append_fstr(pinfo->cinfo, COL_INFO, " %s", @@ -9828,7 +9828,7 @@ dissect_nfs4_response_op(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr if (first_operation==0) /* Seperator between operation text */ - col_append_fstr(pinfo->cinfo, COL_INFO, " |"); + col_append_str(pinfo->cinfo, COL_INFO, " |"); if (op_summary[summary_counter].optext->len > 0) col_append_fstr(pinfo->cinfo, COL_INFO, " %s", diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index 386fd2168d..22b475bb82 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -986,7 +986,7 @@ dissect_nsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } if (!nsip_is_recursive) { - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(pdu_type, tab_nsip_pdu_types, "Unknown PDU type")); } else { col_append_sep_fstr(pinfo->cinfo, COL_INFO, NSIP_SEP, "%s", diff --git a/epan/dissectors/packet-openflow.c b/epan/dissectors/packet-openflow.c index 991f451876..df850a3bd7 100644 --- a/epan/dissectors/packet-openflow.c +++ b/epan/dissectors/packet-openflow.c @@ -885,12 +885,12 @@ dissect_openflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data col_clear(pinfo->cinfo,COL_INFO); if((version&0x80)==0x80){ + /* XXX COL_INFO ? */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "OpenFlow experimental version"); proto_tree_add_text(tree, tvb, offset, -1, "Experimental versions not dissected"); return 0; } version = version & 0x7f; - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OpenFlow"); switch(version){ case OFP_VERSION_1_0: diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 10b7a3a875..f12a0dfb96 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1289,7 +1289,7 @@ dissect_opensafety_ssdo_message(tvbuff_t *message_tvb , packet_info *pinfo, prot col_append_fstr(pinfo->cinfo, COL_INFO, " - %s", val_to_str_const(((guint32) (ssdoIndex << 16) + ssdoSubIndex), sod_idx_names, "Unknown")); } - col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "]" ); + col_append_str(pinfo->cinfo, COL_INFO, "]" ); payloadOffset += 3; } diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c index 6e317d1a7f..dc0aaf412d 100644 --- a/epan/dissectors/packet-openvpn.c +++ b/epan/dissectors/packet-openvpn.c @@ -374,7 +374,7 @@ dissect_openvpn_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) new_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled Message", frag_msg, &openvpn_frag_items, NULL, openvpn_tree); if (frag_msg->next != NULL) { /* multiple frags ? */ - col_append_fstr(pinfo->cinfo, COL_INFO, " (Message Reassembled "); /* overwritten by next dissector */ + col_append_str(pinfo->cinfo, COL_INFO, " (Message Reassembled "); /* overwritten by next dissector */ } } else { /* Not last packet of reassembled Short Message */ diff --git a/epan/dissectors/packet-ouch.c b/epan/dissectors/packet-ouch.c index 3148772c70..0d857a80ee 100644 --- a/epan/dissectors/packet-ouch.c +++ b/epan/dissectors/packet-ouch.c @@ -642,7 +642,6 @@ dissect_ouch( col_set_str(pinfo->cinfo, COL_PROTOCOL, "OUCH"); /* Set the packet name in the info column */ - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO, pkt_name); if (tree) { diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index 722d9abf70..0686b6fe50 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.c @@ -1393,9 +1393,9 @@ static void dissect_pcp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t /* check if we are the client requesting or the server */ if (pinfo->srcport == PCP_PORT) { - col_add_str(pinfo->cinfo, COL_INFO, "Server > Client "); + col_set_str(pinfo->cinfo, COL_INFO, "Server > Client "); } else { - col_add_str(pinfo->cinfo, COL_INFO, "Client > Server "); + col_set_str(pinfo->cinfo, COL_INFO, "Client > Server "); } /* PCP packet length */ diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index d1a9b6c215..4ca257f34e 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3801,7 +3801,7 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index, col_set_str(pinfo->cinfo, COL_PROTOCOL, proto_get_protocol_short_name(find_protocol_by_id(proto_id))); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(code, proto_vals, "Unknown")); if (tree) { @@ -4054,7 +4054,7 @@ dissect_vsncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_ntohs(tvb, 2); col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSNCP"); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(code, cp_vals, "Unknown")); if (tree) { @@ -4316,7 +4316,7 @@ dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_ntohs(tvb, 2); col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BAP"); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, bap_vals, "Unknown")); if (tree) { @@ -5215,7 +5215,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) code = tvb_get_guint8(tvb, 0); col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP PAP"); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(code, pap_vals, "Unknown")); ti = proto_tree_add_item(tree, proto_pap, tvb, 0, -1, ENC_NA); @@ -5301,7 +5301,7 @@ dissect_chap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) code = tvb_get_guint8(tvb, 0); col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP CHAP"); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(code, chap_vals, "Unknown")); if (tree) { diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index e24d8ec628..ce277ba05f 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -1062,7 +1062,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Start Decoding Here. */ pppoe_code = tvb_get_guint8(tvb, 1); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(pppoe_code, code_vals, "Unknown")); reported_payload_length = tvb_get_ntohs(tvb, 4); diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c index c1106ef897..4a6b6488f7 100644 --- a/epan/dissectors/packet-ptpip.c +++ b/epan/dissectors/packet-ptpip.c @@ -321,7 +321,7 @@ void dissect_ptpIP_operation_request(tvbuff_t *tvb, packet_info *pinfo, proto_tr guint16 opcode=0; guint16 transactionID_offset = *offset; /*need to save this to output transaction id in pinfo*/ - col_add_str( + col_set_str( pinfo->cinfo, COL_INFO, "Operation Request Packet "); @@ -380,7 +380,7 @@ void dissect_ptpIP_operation_request(tvbuff_t *tvb, packet_info *pinfo, proto_tr */ void dissect_ptpIP_operation_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 *offset) { - col_add_str( + col_set_str( pinfo->cinfo, COL_INFO, "Operation Response Packet "); @@ -400,7 +400,7 @@ void dissect_ptpIP_operation_response(tvbuff_t *tvb, packet_info *pinfo, proto_t */ void dissect_ptpIP_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 *offset) { - col_add_str( + col_set_str( pinfo->cinfo, COL_INFO, "Event Packet "); @@ -421,7 +421,7 @@ void dissect_ptpIP_start_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre { guint64 dataLen=0; - col_add_str( + col_set_str( pinfo->cinfo, COL_INFO, "Start Data Packet "); @@ -444,7 +444,7 @@ void dissect_ptpIP_start_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre void dissect_ptpIP_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 *offset) { - col_add_str( + col_set_str( pinfo->cinfo, COL_INFO, "Data Packet "); @@ -462,7 +462,7 @@ void dissect_ptpIP_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gui void dissect_ptpIP_end_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 *offset) { - col_add_str( + col_set_str( pinfo->cinfo, COL_INFO, "End Data Packet "); diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index 442c850fbd..49a5d3a4c2 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -232,7 +232,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original col_clear(pinfo->cinfo, COL_INFO); if (properties & PWC_ANYOF_CW_BAD) { - col_append_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); + col_set_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); } else if (properties & PWC_ANYOF_CW_SUSPECT) { diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 84f8a2a6c7..bfcf013a9c 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -170,7 +170,7 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) col_clear(pinfo->cinfo, COL_INFO); if (packet_quality & PQ_CW_BAD) { - col_append_str(pinfo->cinfo, COL_INFO, "CW:Malformed, "); + col_set_str(pinfo->cinfo, COL_INFO, "CW:Malformed, "); } col_append_fstr(pinfo->cinfo, COL_INFO, "%d payload octets", (int)payload_size); diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 22509e4d06..1c9367b6c7 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -230,7 +230,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original col_clear(pinfo->cinfo, COL_INFO); if (properties & PWC_ANYOF_CW_BAD) { - col_append_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); + col_set_str(pinfo->cinfo, COL_INFO, "CW:Bad, "); } if (properties & PWC_PAY_SIZE_BAD) diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 6b8a7d7cf5..ad6e44a0c7 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -61,7 +61,6 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti; col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP"); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", tvb_ether_to_str(tvb, 10)); retix_bpdu_tree = NULL; diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 3ddaab1ba5..2ab94ceef7 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -124,7 +124,7 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) command = tvb_get_guint8(tvb, 0); version = tvb_get_guint8(tvb, 1); - col_add_str(pinfo->cinfo, COL_PROTOCOL, + col_set_str(pinfo->cinfo, COL_PROTOCOL, val_to_str_const(version, version_vals, "RIP")); col_add_str(pinfo->cinfo, COL_INFO, val_to_str(command, command_vals, "Unknown command (%u)")); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index c6c1b4170f..3fb57155bd 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -66,7 +66,6 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti, *rte_ti; col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng"); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO," Command %s, Version %u", val_to_str(tvb_get_guint8(tvb, offset), cmdvals, "Unknown (%u)"), tvb_get_guint8(tvb, offset +1)); diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 82daf8b5dd..11237b4c78 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -110,7 +110,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) type = tvb_get_guint8(tvb, 0); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, rmp_type_vals, "Unknown Type")); if (tree) { diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index 301dc41c1b..038c1a8bfe 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -948,11 +948,11 @@ dissect_rohc_feedback_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, break; case 2: /* REJECT */ - col_append_fstr(pinfo->cinfo, COL_INFO, "Reject "); + col_append_str(pinfo->cinfo, COL_INFO, "Reject "); break; case 3: /* SN-Not-Valid */ - col_append_fstr(pinfo->cinfo, COL_INFO, "SN-Not-Valid "); + col_append_str(pinfo->cinfo, COL_INFO, "SN-Not-Valid "); break; case 4: /* SN */ @@ -2077,7 +2077,7 @@ dissect_rohc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "ROHC"); col_clear(pinfo->cinfo, COL_INFO); }else{ - col_append_fstr(pinfo->cinfo, COL_PROTOCOL, "|ROHC"); + col_append_str(pinfo->cinfo, COL_PROTOCOL, "|ROHC"); /* Append a space if we add stuff to existing col info */ col_append_str(pinfo->cinfo, COL_INFO, " "); } diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index c40731a57a..fd23103670 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -2820,8 +2820,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * an RPC auth level message, then process the args. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC"); - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, + col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s XID 0x%x", val_to_str(gss_proc, rpc_authgssapi_proc, "Unknown (%d)"), msg_type_name, xid); diff --git a/epan/dissectors/packet-rsip.c b/epan/dissectors/packet-rsip.c index 919027db7e..d63044ad96 100644 --- a/epan/dissectors/packet-rsip.c +++ b/epan/dissectors/packet-rsip.c @@ -988,8 +988,6 @@ dissect_rsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSIP"); - col_clear(pinfo->cinfo, COL_INFO); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str(msgtype, msg_type_vals, "Unknown Message Type (0x%0x)")); diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index cf0a834e48..f2d75a6d92 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -172,7 +172,6 @@ dissect_rtacser_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set INFO column with RTAC Serial Event Type */ event_type = tvb_get_guint8(tvb, offset); - col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "%-21s", val_to_str_const(event_type, rtacser_eventtype_vals, "Unknown Type")); /* Add event type to tree */ diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 81abc149f8..34089d8dfd 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -586,7 +586,6 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTmac"); /* set the info column */ - col_clear(pinfo->cinfo,COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown (0x%04x)",type); if (rtmac_tree) { diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index f641cfe98e..ca82502280 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1904,10 +1904,10 @@ dissect_rtp_hdr_ext_ed137(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) ext_value=tvb_get_ntohl( tvb, hdrext_offset ); if (RTP_ED137_ptt_mask(ext_value)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", PTT"); + col_append_str(pinfo->cinfo, COL_INFO, ", PTT"); } if (RTP_ED137_squ_mask(ext_value)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", SQU"); + col_append_str(pinfo->cinfo, COL_INFO, ", SQU"); } /* Following bits are used from ED137 RTPRx/RTPTx Information field */ @@ -1991,10 +1991,10 @@ dissect_rtp_hdr_ext_ed137a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) ext_value=tvb_get_ntohl( tvb, hdrext_offset ); if (RTP_ED137A_ptt_mask(ext_value)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", PTT"); + col_append_str(pinfo->cinfo, COL_INFO, ", PTT"); } if (RTP_ED137A_squ_mask(ext_value)) { - col_append_fstr(pinfo->cinfo, COL_INFO, ", SQU"); + col_append_str(pinfo->cinfo, COL_INFO, ", SQU"); } /* Following bits are used from ED137A/B RTPRx Information field */ diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 2d0baa6b15..9d5f80834e 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -3986,7 +3986,7 @@ gboolean rtps_is_ping(tvbuff_t *tvb, packet_info *pinfo, gint offset) is_ping = TRUE; if (is_ping) - col_add_str(pinfo->cinfo, COL_INFO, "PING"); + col_set_str(pinfo->cinfo, COL_INFO, "PING"); return is_ping; } diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c index 06de234059..9554cca785 100644 --- a/epan/dissectors/packet-scop.c +++ b/epan/dissectors/packet-scop.c @@ -274,7 +274,7 @@ dissect_scop_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Display the Packet type*/ proto_tree_add_uint(tree, hf_scop_type, tvb, offset, 1, type); proto_item_append_text(tree, ", %s", val_to_str_const(type, scop_types, "Reserved Type")); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, scop_types, "Reserved Type")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, scop_types, "Reserved Type")); offset += 2; if (type == SCOP_CMD_HELLO_RESP) { diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 97331ce69a..accee12851 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -2905,7 +2905,7 @@ dissect_data_chunk(tvbuff_t *chunk_tvb, return retval; } else if (is_retransmission) { - col_append_fstr(pinfo->cinfo, COL_INFO, "(retransmission) "); + col_append_str(pinfo->cinfo, COL_INFO, "(retransmission) "); return FALSE; } else { diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index ce18419043..441df61e5a 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -2389,7 +2389,6 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree) selfm_tree = proto_item_add_subtree(selfm_item, ett_selfm); /* Set INFO column with SEL Protocol Message Type */ - col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(msg_type, selfm_msgtype_vals, "Unknown Message Type")); /* Add Message Type to Protocol Tree */ diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 731fa49f67..dd1b11e2af 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1860,9 +1860,8 @@ dissect_esmc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *treex) } } - col_clear(pinfo->cinfo, COL_INFO); /* append summary info */ - col_append_fstr(pinfo->cinfo, COL_INFO, "Event:%s", event_flag ? + col_add_fstr(pinfo->cinfo, COL_INFO, "Event:%s", event_flag ? "Time-critical" : "Information"); if (ql >= 0) { diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 95bfda45a1..b78515ff7c 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -7051,10 +7051,10 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea enc_item = proto_tree_add_text(tree, enc_tvb, 0, sti->size, "Encrypted SMB3 data"); enc_tree = proto_item_add_subtree(enc_item, ett_smb2_encrypted); if (plain_tvb != NULL) { - col_append_fstr(pinfo->cinfo, COL_INFO, "Decrypted SMB3"); + col_append_str(pinfo->cinfo, COL_INFO, "Decrypted SMB3"); dissect_smb2(plain_tvb, pinfo, enc_tree, FALSE); } else { - col_append_fstr(pinfo->cinfo, COL_INFO, "Encrypted SMB3"); + col_append_str(pinfo->cinfo, COL_INFO, "Encrypted SMB3"); proto_tree_add_item(enc_tree, hf_smb2_transform_encrypted_data, enc_tvb, 0, sti->size, ENC_NA); } diff --git a/epan/dissectors/packet-sml.c b/epan/dissectors/packet-sml.c index 13fa0406a9..7d747ae21d 100644 --- a/epan/dissectors/packet-sml.c +++ b/epan/dissectors/packet-sml.c @@ -2610,7 +2610,7 @@ static void dissect_sml (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return; } - col_add_str(pinfo->cinfo, COL_PROTOCOL, "SML"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SML"); col_clear(pinfo->cinfo,COL_INFO); /* create display subtree for the protocol */ diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index ad0563ad99..193e1b4bfb 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -2500,7 +2500,6 @@ dissect_smpp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * First PDU - We already computed the fixed header */ - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "SMPP %s", command_str); first = FALSE; } else { diff --git a/epan/dissectors/packet-soupbintcp.c b/epan/dissectors/packet-soupbintcp.c index ebc31f867f..1e6bf7268c 100644 --- a/epan/dissectors/packet-soupbintcp.c +++ b/epan/dissectors/packet-soupbintcp.c @@ -203,7 +203,6 @@ dissect_soupbintcp_common( col_set_str(pinfo->cinfo, COL_PROTOCOL, "SoupBinTCP"); /* Set the packet name in the info column */ - col_clear(pinfo->cinfo, COL_INFO); col_add_str(pinfo->cinfo, COL_INFO, pkt_name); /* Sequence number tracking diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 8f0083dd55..b47ff436c7 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -1337,7 +1337,7 @@ dissect_sprt_data(tvbuff_t *tvb, } } else { proto_tree_add_item(sprt_tree, hf_sprt_payload_no_data, tvb, offset, 0, ENC_NA); - col_append_fstr(pinfo->cinfo, COL_INFO, ", No Payload"); + col_append_str(pinfo->cinfo, COL_INFO, ", No Payload"); } return offset; @@ -1472,7 +1472,7 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ dissect_sprt_data(tvb, pinfo, p_conv_data, sprt_tree, offset, payload_length); if (noa) - col_append_fstr(pinfo->cinfo, COL_INFO, " (ACK fields present)"); + col_append_str(pinfo->cinfo, COL_INFO, " (ACK fields present)"); return tvb_length(tvb); } diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 1825e0cbee..2e40ebffc0 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -828,7 +828,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole case NONCE: proto_tree_add_item(att_tree, stun_att_nonce, tvb, offset, att_length, ENC_ASCII|ENC_NA); proto_item_append_text(att_tree, ": %s", tvb_get_string(wmem_packet_scope(), tvb, offset, att_length)); - col_append_fstr( + col_append_str( pinfo->cinfo, COL_INFO, " with nonce" ); diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index 88a9d37aa2..6fcee1a495 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -518,7 +518,6 @@ static void dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) frame_type = tvb_get_guint8(tvb, 1) >> 4; - col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(frame_type, typenames, "invalid packet type")); /* CFG-2 and DATA frames need special treatment during the first run: diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 4cd1dbee6e..024dc5f890 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2291,12 +2291,12 @@ dissect_tcpopt_exp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, /* Fast Open Cookie Request */ proto_tree_add_item(exp_tree, hf_tcp_option_fast_open_cookie_request, tvb, offset + 2, 2, ENC_BIG_ENDIAN); - col_append_fstr(pinfo->cinfo, COL_INFO, " TFO=R"); + col_append_str(pinfo->cinfo, COL_INFO, " TFO=R"); } else if ((optlen - 2) > 2) { /* Fast Open Cookie */ proto_tree_add_item(exp_tree, hf_tcp_option_fast_open_cookie, tvb, offset + 4, optlen - 4, ENC_NA); - col_append_fstr(pinfo->cinfo, COL_INFO, " TFO=C"); + col_append_str(pinfo->cinfo, COL_INFO, " TFO=C"); } break; default: @@ -4048,7 +4048,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tcph->th_sport = tvb_get_ntohs(tvb, offset); tcph->th_dport = tvb_get_ntohs(tvb, offset + 2); - col_append_fstr(pinfo->cinfo, COL_INFO, "%s > %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s > %s", get_tcp_port(tcph->th_sport), get_tcp_port(tcph->th_dport)); if (tree) { if (tcp_summary_in_tree) { diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index 35f3a18250..48d5e3af39 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -5117,7 +5117,6 @@ dissect_tn5250(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_tn5250, tvb, offset, -1, ENC_NA); tn5250_tree = proto_item_add_subtree(ti, ett_tn5250); - col_clear(pinfo->cinfo, COL_INFO); if (pinfo->srcport == tn5250_info->outbound_port) { col_set_str(pinfo->cinfo, COL_INFO, "TN5250 Data from Mainframe"); } else { diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index b9dd8866be..42c4b727b7 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -231,7 +231,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * anyway. */ if (tpkt_desegment) - col_add_str(pinfo->cinfo, COL_INFO, ""); + col_set_str(pinfo->cinfo, COL_INFO, ""); while (tvb_reported_length_remaining(tvb, offset) != 0) { /* diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index d5e985dab3..1eefac4987 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -149,7 +149,7 @@ static void uadecode(e_ua_direction direction, default: { /* add text to the frame "INFO" column */ - col_append_fstr(pinfo->cinfo, COL_INFO, " - UA3G Message ERR: Opcode Unknown"); + col_append_str(pinfo->cinfo, COL_INFO, " - UA3G Message ERR: Opcode Unknown"); proto_tree_add_text(tree, tvb, diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 8a32565dd4..346bd7952d 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -2203,7 +2203,7 @@ decode_beep(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, } } else { /* Classical Beep */ /* add text to the frame "INFO" column */ - col_append_fstr(pinfo->cinfo, COL_INFO, ": Classical Beep"); + col_append_str(pinfo->cinfo, COL_INFO, ": Classical Beep"); } } @@ -3706,7 +3706,7 @@ dissect_ua3g(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) length = tvb_get_letohs(tvb, offset); /* add text to the frame "INFO" column */ - col_append_fstr(pinfo->cinfo, COL_INFO, " - UA3G Message:"); + col_append_str(pinfo->cinfo, COL_INFO, " - UA3G Message:"); proto_tree_add_uint(ua3g_tree, hf_ua3g_length, tvb, offset, 2, length); offset += 2; diff --git a/epan/dissectors/packet-uaudp.c b/epan/dissectors/packet-uaudp.c index 2a27561601..2bbbb99b3d 100644 --- a/epan/dissectors/packet-uaudp.c +++ b/epan/dissectors/packet-uaudp.c @@ -306,7 +306,7 @@ static void _dissect_uaudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tree); else { /* XXX: expert ?? */ - col_add_str(pinfo->cinfo, + col_set_str(pinfo->cinfo, COL_INFO, "Data - Couldn't resolve direction. Check UAUDP Preferences."); } @@ -314,7 +314,7 @@ static void _dissect_uaudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { /* print in "INFO" column */ - col_add_str(pinfo->cinfo, + col_set_str(pinfo->cinfo, COL_INFO, "Data ACK"); } diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 021bb13851..1ca8ddc9ba 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -534,7 +534,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) item = proto_tree_add_uint_format_value(udp_tree, hfi_udp_checksum.id, tvb, offset + 6, 2, 0, "0x%04x (Illegal)", 0); expert_add_info(pinfo, item, &ei_udp_checksum_zero); - col_append_fstr(pinfo->cinfo, COL_INFO, " [ILLEGAL CHECKSUM (0)]"); + col_append_str(pinfo->cinfo, COL_INFO, " [ILLEGAL CHECKSUM (0)]"); checksum_tree = proto_item_add_subtree(item, ett_udp_checksum); item = proto_tree_add_boolean(checksum_tree, &hfi_udp_checksum_good, tvb, @@ -613,7 +613,7 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) PROTO_ITEM_SET_GENERATED(item); expert_add_info(pinfo, item, &ei_udp_checksum_bad); - col_append_fstr(pinfo->cinfo, COL_INFO, " [UDP CHECKSUM INCORRECT]"); + col_append_str(pinfo->cinfo, COL_INFO, " [UDP CHECKSUM INCORRECT]"); } } else { item = proto_tree_add_uint_format_value(udp_tree, hfi_udp_checksum.id, tvb, diff --git a/epan/dissectors/packet-uhd.c b/epan/dissectors/packet-uhd.c index 813ab519e9..19ce30d7cf 100644 --- a/epan/dissectors/packet-uhd.c +++ b/epan/dissectors/packet-uhd.c @@ -167,7 +167,6 @@ dissect_uhd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) id = tvb_get_ntohl(tvb, 4); - col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_PROTOCOL, "UHD"); col_add_str(pinfo->cinfo, COL_INFO, val_to_str(id, uhd_ids, "Unknown UHD message type '%c'")); diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 6ba3e1b453..314741db3a 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -4262,7 +4262,7 @@ dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Show channel type in info column, tree */ - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(p_fp_info->channel, channel_type_vals, "Unknown channel type")); diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index db066acd36..1f666ce03a 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -290,7 +290,7 @@ static void dissect_mac_fdd_rach(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC"); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(tctf, rach_fdd_tctf_vals, "Unknown TCTF")); ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); @@ -380,7 +380,7 @@ static void dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree * col_set_str(pinfo->cinfo, COL_PROTOCOL, "MAC"); - col_add_str(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(tctf, fach_fdd_tctf_vals, "Unknown TCTF")); ti = proto_tree_add_item(tree, proto_umts_mac, tvb, 0, -1, ENC_NA); diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c index 2424963b74..033c861394 100644 --- a/epan/dissectors/packet-usb-hub.c +++ b/epan/dissectors/packet-usb-hub.c @@ -280,7 +280,7 @@ dissect_usb_hub_get_hub_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *t proto_item *item = NULL; proto_tree *subtree = NULL; - col_append_fstr(pinfo->cinfo, COL_INFO, " [Hub]"); + col_append_str(pinfo->cinfo, COL_INFO, " [Hub]"); if (is_request) { item = proto_tree_add_item(tree, hf_usb_hub_value, tvb, offset, 2, ENC_LITTLE_ENDIAN); diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index e433f58ed8..6061a01031 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -130,7 +130,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) testchar(tvb, pinfo, 1, MATCH, EOT, NULL) && testchar(tvb, pinfo, 2, MATCH, ETX, NULL)) { msg_type = NOTRAFFIC; - col_add_str(pinfo->cinfo, COL_INFO, "No Traffic"); + col_set_str(pinfo->cinfo, COL_INFO, "No Traffic"); } else { if (testchar(tvb, pinfo, 0, MATCH, SOH, NULL) && testchar(tvb, pinfo, 1, FETCH, 0, (gchar *)&rid) && @@ -138,23 +138,23 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) testchar(tvb, pinfo, 3, FETCH, 0, (gchar *)&did)) { offset = 4; if (testchar(tvb, pinfo, offset, MATCH, ETX, NULL)) { - col_add_str(pinfo->cinfo, COL_INFO, "General Poll"); + col_set_str(pinfo->cinfo, COL_INFO, "General Poll"); set_addr(pinfo, DST, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, DLE, NULL) && testchar(tvb, pinfo, offset+1, MATCH, '1', NULL) && testchar(tvb, pinfo, offset+2, MATCH, ETX, NULL)) { ack_start = offset; if (sid == GSID && did == GDID) { - col_add_str(pinfo->cinfo, COL_INFO, "General Poll + ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "General Poll + ACK"); set_addr(pinfo, DST, rid, sid, did); } else if (sid != GSID && did == GDID) { - col_add_str(pinfo->cinfo, COL_INFO, "Specific Poll + ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "Specific Poll + ACK"); set_addr(pinfo, DST, rid, sid, did); } else if (sid != GSID && did != GDID) { - col_add_str(pinfo->cinfo, COL_INFO, "No Traffic + ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "No Traffic + ACK"); set_addr(pinfo, SRC, rid, sid, did); } else { - col_add_str(pinfo->cinfo, COL_INFO, "Unknown Message Format"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown Message Format"); if ((pinfo->pseudo_header->sita.sita_flags & SITA_FRAME_DIR) == SITA_FRAME_DIR_TXED) { set_addr(pinfo, DST, rid, sid, did); /* if the ACN sent it, the address is of the destination... the terminal */ } else { @@ -166,14 +166,14 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) testchar(tvb, pinfo, offset+2, MATCH, ETX, NULL) && sid != GSID && did == GDID) { nak_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Retransmit Request"); + col_set_str(pinfo->cinfo, COL_INFO, "Retransmit Request"); set_addr(pinfo, DST, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, BEL, NULL) && testchar(tvb, pinfo, offset+1, MATCH, STX, NULL) && testchar(tvb, pinfo, offset+2, MATCH, ETX, NULL)) { header_length = offset+2; msgwaiting_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Message Waiting"); + col_set_str(pinfo->cinfo, COL_INFO, "Message Waiting"); set_addr(pinfo, DST, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, DLE, NULL) && testchar(tvb, pinfo, offset+1, MATCH, '1', NULL) && @@ -181,12 +181,12 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) ack_start = offset; header_length = offset+3; stx_start = offset+2; - col_add_str(pinfo->cinfo, COL_INFO, "Text + ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "Text + ACK"); set_addr(pinfo, SRC, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, STX, NULL)) { header_length = offset+1; stx_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Text"); + col_set_str(pinfo->cinfo, COL_INFO, "Text"); if ((pinfo->pseudo_header->sita.sita_flags & SITA_FRAME_DIR) == SITA_FRAME_DIR_TXED) { set_addr(pinfo, DST, rid, sid, did); /* if the ACN sent it, the address is of the destination... the terminal */ } else { @@ -196,19 +196,19 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) testchar(tvb, pinfo, offset+1, MATCH, ENQ, NULL) && testchar(tvb, pinfo, offset+2, MATCH, ETX, NULL)) { replyrequest_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Reply Request"); + col_set_str(pinfo->cinfo, COL_INFO, "Reply Request"); set_addr(pinfo, SRC, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, DLE, NULL) && testchar(tvb, pinfo, offset+1, MATCH, '?', NULL) && testchar(tvb, pinfo, offset+2, MATCH, ETX, NULL)) { busy_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Busy"); + col_set_str(pinfo->cinfo, COL_INFO, "Busy"); set_addr(pinfo, SRC, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, DLE, NULL) && testchar(tvb, pinfo, offset+1, MATCH, ';', NULL) && testchar(tvb, pinfo, offset+2, MATCH, ETX, NULL)) { notbusy_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Not Busy"); + col_set_str(pinfo->cinfo, COL_INFO, "Not Busy"); set_addr(pinfo, SRC, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, DLE, NULL) && testchar(tvb, pinfo, offset+1, MATCH, '1', NULL) && @@ -217,7 +217,7 @@ dissect_uts(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) testchar(tvb, pinfo, offset+4, MATCH, ETX, NULL)) { notbusy_start = offset+2; ack_start = offset; - col_add_str(pinfo->cinfo, COL_INFO, "Not Busy + ACK"); + col_set_str(pinfo->cinfo, COL_INFO, "Not Busy + ACK"); set_addr(pinfo, SRC, rid, sid, did); } else if (testchar(tvb, pinfo, offset, MATCH, DLE, NULL) && testchar(tvb, pinfo, offset+1, MATCH, '1', NULL) && diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 52ff154919..f55004bc7b 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -1311,7 +1311,7 @@ dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tre message_type = tvb_get_guint8(common_header_tvb, COMMON_HEADER_MSG_TYPE_OFFSET); /* Add message type into info column */ - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_class * 256 + message_type, msg_class_type_values_short, "UNKNOWN")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_class * 256 + message_type, msg_class_type_values_short, "UNKNOWN")); if (v5ua_tree) { diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index f9446f10ba..2ab32c1856 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -910,7 +910,7 @@ Figure 18 from [ref:1] NULL, wai_tree); if (new_tvb) { - col_add_str(pinfo->cinfo, COL_INFO, "Last fragment of message, data dissected"); + col_set_str(pinfo->cinfo, COL_INFO, "Last fragment of message, data dissected"); col_append_sep_str(pinfo->cinfo, COL_INFO, ": ", subtype_name); next_tvb=new_tvb; length = tvb_reported_length (next_tvb); diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 3a0e91dd11..4a3f8bc8d0 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -675,8 +675,6 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ return 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCCP"); - col_clear(pinfo->cinfo, COL_INFO); - col_add_str(pinfo->cinfo, COL_INFO, val_to_str(wccp_message_type, wccp_type_vals, "Unknown WCCP message (%u)")); diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index cd5538a993..0093f44a59 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -321,7 +321,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /*XXX should test seq to be sure it the last + 1 !! */ - col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmd, cmd_string, "Unknown")); + col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmd, cmd_string, "Unknown")); if ( cmd == 0xf) col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str_const(ext_cmd, ext_cmd_string, "Unknown")); diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 750d5508f1..3a904b2610 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -376,11 +376,11 @@ dissect_websocket(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_tree_add_item(ws_tree, hf_ws_opcode, tvb, 0, 1, ENC_NA); opcode = tvb_get_guint8(tvb, 0) & MASK_WS_OPCODE; col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_const(opcode, ws_opcode_vals, "Unknown Opcode")); - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", fin ? "[FIN]" : ""); + col_append_str(pinfo->cinfo, COL_INFO, fin ? " [FIN]" : " "); /* Add Mask bit to the tree */ proto_tree_add_item(ws_tree, hf_ws_mask, tvb, 1, 1, ENC_NA); - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", mask ? "[MASKED]" : ""); + col_append_str(pinfo->cinfo, COL_INFO, mask ? " [MASKED]" : " "); /* (Extended) Payload Length */ ti_len = proto_tree_add_item(ws_tree, hf_ws_payload_length, tvb, 1, 1, ENC_NA); diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c index 9d9b4974ec..9b8931f383 100644 --- a/epan/dissectors/packet-wps.c +++ b/epan/dissectors/packet-wps.c @@ -1675,7 +1675,7 @@ dissect_exteap_wps(proto_tree *eap_tree, tvbuff_t *tvb, int offset, if (pi != NULL) proto_item_append_text(pi, " (Wifi Alliance, WifiProtectedSetup)"); if (pinfo != NULL) - col_append_fstr(pinfo->cinfo, COL_INFO, ", WPS"); + col_append_str(pinfo->cinfo, COL_INFO, ", WPS"); /* Flag field, if msg-len flag set, add approriate field */ diff --git a/epan/dissectors/packet-xmpp-conference.c b/epan/dissectors/packet-xmpp-conference.c index a1d88b6635..666f2a548a 100644 --- a/epan/dissectors/packet-xmpp-conference.c +++ b/epan/dissectors/packet-xmpp-conference.c @@ -91,7 +91,7 @@ xmpp_conference_info(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e /*{NAME, "sidebars-by-val", xmpp_conf_sidebars_by_val, ONE},*/ }; - col_append_fstr(pinfo->cinfo, COL_INFO, "CONFERENC-INFO "); + col_append_str(pinfo->cinfo, COL_INFO, "CONFERENC-INFO "); cinfo_item = proto_tree_add_item(tree, hf_xmpp_conf_info, tvb, element->offset, element->length, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-xmpp-core.c b/epan/dissectors/packet-xmpp-core.c index 4aec4f64ef..13a43992ed 100644 --- a/epan/dissectors/packet-xmpp-core.c +++ b/epan/dissectors/packet-xmpp-core.c @@ -157,7 +157,6 @@ xmpp_iq(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *pac xmpp_display_attrs(xmpp_iq_tree, packet, pinfo, tvb, attrs_info, array_length(attrs_info)); - col_clear(pinfo->cinfo, COL_INFO); col_add_fstr(pinfo->cinfo, COL_INFO, "IQ(%s) ", attr_type?attr_type->value:""); xmpp_display_elems(xmpp_iq_tree, packet, pinfo, tvb, elems_info, array_length(elems_info)); @@ -308,8 +307,7 @@ xmpp_presence(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_ xmpp_element_t *show, *priority; - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "PRESENCE "); + col_set_str(pinfo->cinfo, COL_INFO, "PRESENCE "); presence_item = proto_tree_add_item(tree, hf_xmpp_presence, tvb, packet->offset, packet->length, ENC_BIG_ENDIAN); presence_tree = proto_item_add_subtree(presence_item, ett_xmpp_presence); @@ -397,8 +395,7 @@ xmpp_message(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t conversation_t *conversation; xmpp_conv_info_t *xmpp_info; - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "MESSAGE "); + col_set_str(pinfo->cinfo, COL_INFO, "MESSAGE "); id = xmpp_get_attr(packet, "id"); diff --git a/epan/dissectors/packet-xmpp-gtalk.c b/epan/dissectors/packet-xmpp-gtalk.c index a894c62a1c..e2b706ddb0 100644 --- a/epan/dissectors/packet-xmpp-gtalk.c +++ b/epan/dissectors/packet-xmpp-gtalk.c @@ -218,7 +218,7 @@ xmpp_gtalk_jingleinfo_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, {NAME, "relay", xmpp_gtalk_jingleinfo_relay, ONE} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:jingleinfo) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(google:jingleinfo) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -356,7 +356,7 @@ xmpp_gtalk_nosave_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp {NAME, "item", xmpp_gtalk_nosave_item, MANY}, }; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:nosave) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(google:nosave) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -418,7 +418,7 @@ xmpp_gtalk_mail_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_ {"q", -1, FALSE, TRUE, NULL, NULL} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:mail:notify) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(google:mail:notify) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); @@ -446,7 +446,7 @@ xmpp_gtalk_mail_mailbox(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp {NAME,"mail-thread-info", xmpp_gtalk_mail_mail_info, MANY} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "MAILBOX "); + col_append_str(pinfo->cinfo, COL_INFO, "MAILBOX "); mail_item = proto_tree_add_item(tree, hf_xmpp_gtalk_mail_mailbox, tvb, element->offset, element->length, ENC_BIG_ENDIAN); mail_tree = proto_item_add_subtree(mail_item, ett_xmpp_gtalk_mail_mailbox); @@ -544,7 +544,7 @@ xmpp_gtalk_mail_snippet(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp void xmpp_gtalk_mail_new_mail(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* element) { - col_append_fstr(pinfo->cinfo, COL_INFO, "NEW-MAIL "); + col_append_str(pinfo->cinfo, COL_INFO, "NEW-MAIL "); proto_tree_add_item(tree, hf_xmpp_gtalk_mail_new_mail, tvb, element->offset, element->length, ENC_BIG_ENDIAN); xmpp_unknown(tree, tvb, pinfo, element); @@ -575,7 +575,7 @@ xmpp_gtalk_status_query(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmp xmpp_element_t *status, *show, *invisible; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(google:shared-status) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(google:shared-status) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-xmpp-jingle.c b/epan/dissectors/packet-xmpp-jingle.c index 71e0df20f9..3d0c66298f 100644 --- a/epan/dissectors/packet-xmpp-jingle.c +++ b/epan/dissectors/packet-xmpp-jingle.c @@ -878,7 +878,7 @@ xmpp_jinglenodes_services(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, x {NAME, "stun", xmpp_jinglenodes_relay_stun_tracker, ONE}, }; - col_append_fstr(pinfo->cinfo, COL_INFO, "SERVICES "); + col_append_str(pinfo->cinfo, COL_INFO, "SERVICES "); services_item = proto_tree_add_item(tree, hf_xmpp_services, tvb, element->offset, element->length, ENC_BIG_ENDIAN); services_tree = proto_item_add_subtree(services_item, ett_xmpp_services); diff --git a/epan/dissectors/packet-xmpp-other.c b/epan/dissectors/packet-xmpp-other.c index 26927906bb..283fc2752c 100644 --- a/epan/dissectors/packet-xmpp-other.c +++ b/epan/dissectors/packet-xmpp-other.c @@ -81,7 +81,7 @@ xmpp_iq_bind(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t {"jid", hf_xmpp_iq_bind_jid, FALSE, TRUE, NULL, NULL} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "BIND "); + col_append_str(pinfo->cinfo, COL_INFO, "BIND "); bind_item = proto_tree_add_item(tree, hf_xmpp_iq_bind, tvb, element->offset, element->length, ENC_BIG_ENDIAN); bind_tree = proto_item_add_subtree(bind_item, ett_xmpp_iq_bind); @@ -107,7 +107,7 @@ xmpp_session(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t session_item = proto_tree_add_item(tree, hf_xmpp_iq_session, tvb, element->offset, element->length, ENC_BIG_ENDIAN); session_tree = proto_item_add_subtree(session_item, ett_xmpp_iq_session); - col_append_fstr(pinfo->cinfo, COL_INFO, "SESSION "); + col_append_str(pinfo->cinfo, COL_INFO, "SESSION "); xmpp_display_attrs(session_tree, element, pinfo, tvb, attrs_info, array_length(attrs_info)); xmpp_display_elems(session_tree, element, pinfo, tvb, NULL, 0); @@ -126,7 +126,7 @@ xmpp_vcard(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t * xmpp_element_t *cdata; - col_append_fstr(pinfo->cinfo, COL_INFO, "VCARD "); + col_append_str(pinfo->cinfo, COL_INFO, "VCARD "); vcard_item = proto_tree_add_item(tree, hf_xmpp_vcard, tvb, element->offset, element->length, ENC_BIG_ENDIAN); vcard_tree = proto_item_add_subtree(vcard_item, ett_xmpp_vcard); @@ -184,7 +184,7 @@ xmpp_disco_items_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp xmpp_element_t *item; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(disco#items) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(disco#items) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -234,7 +234,7 @@ xmpp_roster_query(proto_tree *tree, tvbuff_t *tvb, packet_info* pinfo, xmpp_elem {NAME, "item", xmpp_roster_item, MANY}, }; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:roster) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:roster) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -291,7 +291,7 @@ xmpp_disco_info_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp xmpp_element_t *identity, *feature, *x_data; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(disco#info) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(disco#info) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -368,7 +368,7 @@ xmpp_bytestreams_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmp xmpp_element_t *streamhost, *streamhost_used, *activate, *udpsuccess; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(bytestreams) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(bytestreams) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -480,7 +480,7 @@ xmpp_si(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, xmpp_element_t* ele xmpp_element_t *file, *feature_neg; - col_append_fstr(pinfo->cinfo, COL_INFO, "SI "); + col_append_str(pinfo->cinfo, COL_INFO, "SI "); si_item = proto_tree_add_item(tree, hf_xmpp_si, tvb, element->offset, element->length, ENC_BIG_ENDIAN); si_tree = proto_item_add_subtree(si_item, ett_xmpp_si); @@ -732,7 +732,7 @@ xmpp_ibb_open(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_ {"stanza", -1, FALSE, TRUE, xmpp_val_enum_list, stanza_array} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "IBB-OPEN "); + col_append_str(pinfo->cinfo, COL_INFO, "IBB-OPEN "); open_item = proto_tree_add_item(tree, hf_xmpp_ibb_open, tvb, element->offset, element->length, ENC_BIG_ENDIAN); open_tree = proto_item_add_subtree(open_item, ett_xmpp_ibb_open); @@ -752,7 +752,7 @@ xmpp_ibb_close(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element {"sid", -1, TRUE, TRUE, NULL, NULL} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "IBB-CLOSE "); + col_append_str(pinfo->cinfo, COL_INFO, "IBB-CLOSE "); close_item = proto_tree_add_item(tree, hf_xmpp_ibb_close, tvb, element->offset, element->length, ENC_BIG_ENDIAN); close_tree = proto_item_add_subtree(close_item, ett_xmpp_ibb_close); @@ -774,7 +774,7 @@ xmpp_ibb_data(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_ {"value", -1, FALSE, FALSE, NULL, NULL} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "IBB-DATA "); + col_append_str(pinfo->cinfo, COL_INFO, "IBB-DATA "); data_item = proto_tree_add_item(tree, hf_xmpp_ibb_data, tvb, element->offset, element->length, ENC_BIG_ENDIAN); data_tree = proto_item_add_subtree(data_item, ett_xmpp_ibb_data); @@ -1082,7 +1082,7 @@ xmpp_muc_owner_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e xmpp_element_t *x_data; /*TODO destroy*/ - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(muc#owner) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(muc#owner) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -1111,7 +1111,7 @@ xmpp_muc_admin_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_e xmpp_element_t *item; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(muc#admin) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(muc#admin) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -1140,7 +1140,7 @@ xmpp_last_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_elemen {"value", -1, FALSE, TRUE, NULL, NULL} }; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:last) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:last) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -1171,7 +1171,7 @@ xmpp_version_query(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_ele xmpp_element_t *name, *version, *os; - col_append_fstr(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:version) "); + col_append_str(pinfo->cinfo, COL_INFO, "QUERY(jabber:iq:version) "); query_item = proto_tree_add_item(tree, hf_xmpp_query, tvb, element->offset, element->length, ENC_BIG_ENDIAN); query_tree = proto_item_add_subtree(query_item, ett_xmpp_query); @@ -1208,7 +1208,7 @@ xmpp_ping(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, xmpp_element_t *e {"xmlns", hf_xmpp_xmlns, TRUE, TRUE, NULL, NULL}, }; - col_append_fstr(pinfo->cinfo, COL_INFO, "PING "); + col_append_str(pinfo->cinfo, COL_INFO, "PING "); ping_item = proto_tree_add_item(tree, hf_xmpp_ping, tvb, element->offset, element->length, ENC_BIG_ENDIAN); ping_tree = proto_item_add_subtree(ping_item, ett_xmpp_ping); diff --git a/epan/dissectors/packet-xmpp.c b/epan/dissectors/packet-xmpp.c index 4afaf84c00..fd01568ab1 100644 --- a/epan/dissectors/packet-xmpp.c +++ b/epan/dissectors/packet-xmpp.c @@ -544,8 +544,7 @@ dissect_xmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { }else { xmpp_proto_tree_show_first_child(xmpp_tree); expert_add_info_format(pinfo, xmpp_tree, &ei_xmpp_packet_unknown, "Unknown packet: %s", packet->name); - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "UNKNOWN PACKET "); + col_set_str(pinfo->cinfo, COL_INFO, "UNKNOWN PACKET "); } /*appends to COL_INFO information about src or dst*/ diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 75607011eb..28a6793665 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -636,8 +636,7 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if (tree) { proto_item_append_text(proto_root, " %s", val_to_str_const(packet.type, zbee_aps_frame_types, "Unknown Type")); } - col_clear(pinfo->cinfo, COL_INFO); - col_append_str(pinfo->cinfo, COL_INFO, "APS: "); + col_set_str(pinfo->cinfo, COL_INFO, "APS: "); col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(packet.type, zbee_aps_frame_types, "Unknown Frame Type")); /* Display the FCF */ diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 49b902f72e..ba10674f17 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -1410,8 +1410,7 @@ static int dissect_zbee_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } /* Update the info column. */ - col_clear(pinfo->cinfo, COL_INFO); - col_append_fstr(pinfo->cinfo, COL_INFO, "Beacon, Src: 0x%04x", packet->src16); + col_add_fstr(pinfo->cinfo, COL_INFO, "Beacon, Src: 0x%04x", packet->src16); /* Get and display the protocol id, must be 0 on all ZigBee beacons. */ proto_tree_add_item(beacon_tree, hf_zbee_beacon_protocol, tvb, offset, 1, ENC_NA); diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c index 4035b27e39..737dd98bc6 100644 --- a/epan/dissectors/packet-zep.c +++ b/epan/dissectors/packet-zep.c @@ -176,7 +176,6 @@ static void dissect_zep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, (zep_data.version==1)?"ZEP":"ZEPv2"); /* Enter name info protocol field */ - col_clear(pinfo->cinfo, COL_INFO); if (!((zep_data.version>=2) && (zep_data.type==ZEP_V2_TYPE_ACK))) col_add_fstr(pinfo->cinfo, COL_INFO, "Encapsulated ZigBee Packet [Channel]=%i [Length]=%i", zep_data.channel_id, ieee_packet_len); else |