osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Bill Meier 2013-10-29 14:09:20 +00:00
parent 86c145ecb3
commit 0ad98563a2
163 changed files with 341 additions and 424 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asn1/acse/acse.cnf
View File

@ -91,17 +91,17 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree);
#.FN_BODY AARQ-apdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request");
col_append_str(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request");
%(DEFAULT_BODY)s
#.FN_BODY AARE-apdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response");
col_append_str(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response");
%(DEFAULT_BODY)s
#.FN_BODY RLRQ-apdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request");
col_append_str(actx->pinfo->cinfo, COL_INFO, "Release-Request");
%(DEFAULT_BODY)s
@ -117,7 +117,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%%d)"));
#.FN_BODY RLRE-apdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response");
col_append_str(actx->pinfo->cinfo, COL_INFO, "Release-Response");
%(DEFAULT_BODY)s
@ -133,7 +133,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_response_reason_vals, "reason(%%d)"));
#.FN_BODY ABRT-apdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort");
col_append_str(actx->pinfo->cinfo, COL_INFO, "Abort");
%(DEFAULT_BODY)s

2
asn1/gsm_map/gsm_map.cnf
View File

@ -189,7 +189,7 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS"
%(DEFAULT_BODY)s
col_append_str(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode));
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ");
col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
#.FN_PARS GSMMAPLocalErrorcode

4
asn1/gsm_map/packet-gsm_map-template.c
View File

@ -1871,8 +1871,8 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
/* Get the length and add 2 */
gsm_map_pdu_size = tvb_get_guint8(tvb, offset+1)+2;
col_add_str(actx->pinfo->cinfo, COL_INFO, val_to_str_const(gsmmap_pdu_type, gsm_old_Component_vals, "Unknown GSM-MAP Component"));
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ");
col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str_const(gsmmap_pdu_type, gsm_old_Component_vals, "Unknown GSM-MAP Component"));
col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
offset = dissect_gsm_old_Component(FALSE, tvb, 0, actx, tree, hf_gsm_map_old_Component_PDU);
/*
offset = dissect_ber_choice(pinfo, tree, tvb, offset,

6
asn1/rtse/rtse.cnf
View File

@ -129,7 +129,7 @@ RTABapdu
#.FN_BODY RTTPapdu VAL_PTR=&priority
int priority = -1;
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Turn-Please");
col_append_str(actx->pinfo->cinfo, COL_INFO, "Turn-Please");
%(DEFAULT_BODY)s
@ -137,7 +137,7 @@ RTABapdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%d)", priority);
#.FN_BODY RTORJapdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Refuse");
col_append_str(actx->pinfo->cinfo, COL_INFO, "Refuse");
%(DEFAULT_BODY)s
@ -153,7 +153,7 @@ RTABapdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, rtse_RefuseReason_vals, "reason(%%d)"));
#.FN_BODY RTABapdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort");
col_append_str(actx->pinfo->cinfo, COL_INFO, "Abort");
%(DEFAULT_BODY)s

3
epan/dissectors/packet-applemidi.c
View File

@ -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 ) {

2
epan/dissectors/packet-aprs.c
View File

@ -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 )

4
epan/dissectors/packet-atmtcp.c
View File

@ -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;

1
epan/dissectors/packet-ax25-nol3.c
View File

@ -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 ) );

5
epan/dissectors/packet-bt3ds.c
View File

@ -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 ",

4
epan/dissectors/packet-btamp.c
View File

@ -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 ",

6
epan/dissectors/packet-btatt.c
View File

@ -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 */

4
epan/dissectors/packet-btavctp.c
View File

@ -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 ",

13
epan/dissectors/packet-btavdtp.c
View File

@ -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:

21
epan/dissectors/packet-btavrcp.c
View File

@ -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 ",

8
epan/dissectors/packet-btbnep.c
View File

@ -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);

4
epan/dissectors/packet-bthci_acl.c
View File

@ -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 ",

4
epan/dissectors/packet-bthci_cmd.c
View File

@ -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 ",

6
epan/dissectors/packet-bthci_evt.c
View File

@ -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) {

4
epan/dissectors/packet-bthci_sco.c
View File

@ -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 ",

17
epan/dissectors/packet-bthcrp.c
View File

@ -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 ",

5
epan/dissectors/packet-bthfp.c
View File

@ -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);

118
epan/dissectors/packet-bthid.c
View File

@ -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 */

6
epan/dissectors/packet-btl2cap.c
View File

@ -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 */

17
epan/dissectors/packet-btmcap.c
View File

@ -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)) {

6
epan/dissectors/packet-btobex.c
View File

@ -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) {

4
epan/dissectors/packet-btrfcomm.c
View File

@ -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 ",

7
epan/dissectors/packet-btsap.c
View File

@ -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);

8
epan/dissectors/packet-btsdp.c
View File

@ -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 ",

20
epan/dissectors/packet-btsmp.c
View File

@ -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;

1
epan/dissectors/packet-coap.c
View File

@ -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"));

2
epan/dissectors/packet-componentstatus.c
View File

@ -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);

2
epan/dissectors/packet-cops.c
View File

@ -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);
}

2
epan/dissectors/packet-dbus.c
View File

@ -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;

3
epan/dissectors/packet-dcm.c
View File

@ -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);

3
epan/dissectors/packet-dect.c
View File

@ -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");

2
epan/dissectors/packet-dhcp-failover.c
View File

@ -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;

1
epan/dissectors/packet-dvb-ait.c
View File

@ -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) {

16
epan/dissectors/packet-dvbci.c
View File

@ -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);
}

2
epan/dissectors/packet-enip.c
View File

@ -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 ) );

2
epan/dissectors/packet-epl.c
View File

@ -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 )
{

8
epan/dissectors/packet-erldp.c
View File

@ -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;
}
}

2
epan/dissectors/packet-esio.c
View File

@ -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;

1
epan/dissectors/packet-ged125.c
View File

@ -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);

2
epan/dissectors/packet-gopher.c
View File

@ -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);

4
epan/dissectors/packet-gsm_a_rr.c
View File

@ -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) ");
}
/*

12
epan/dissectors/packet-gsm_rlcmac.c
View File

@ -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");

6
epan/dissectors/packet-gsm_sim.c
View File

@ -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);

2
epan/dissectors/packet-gtp.c
View File

@ -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, &gtp_message_type_ext, "Unknown"));
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(gtp_hdr->message, &gtp_message_type_ext, "Unknown"));
if (tree) {
proto_tree_add_uint(gtp_tree, hf_gtp_message_type, tvb, offset, 1, gtp_hdr->message);
}

2
epan/dissectors/packet-gtpv2.c
View File

@ -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, &gtpv2_message_type_vals_ext, "Unknown"));
col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(message_type, &gtpv2_message_type_vals_ext, "Unknown"));
p_flag = (tvb_get_guint8(tvb, offset) & 0x10) >> 4;

1
epan/dissectors/packet-hazelcast.c
View File

@ -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;

7
epan/dissectors/packet-hci_usb.c
View File

@ -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);

1
epan/dissectors/packet-hpfeeds.c
View File

@ -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)"));

2
epan/dissectors/packet-hsrp.c
View File

@ -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) {

4
epan/dissectors/packet-ieee80211.c
View File

@ -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);

4
epan/dissectors/packet-ieee802154.c
View File

@ -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. */

6
epan/dissectors/packet-igmp.c
View File

@ -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,

4
epan/dissectors/packet-infiniband.c
View File

@ -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);

4
epan/dissectors/packet-ismacryp.c
View File

@ -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 */

2
epan/dissectors/packet-kink.c
View File

@ -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);

4
epan/dissectors/packet-knet.c
View File

@ -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));

2
epan/dissectors/packet-kpasswd.c
View File

@ -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;

2
epan/dissectors/packet-lapd.c
View File

@ -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)) {

2
epan/dissectors/packet-ltp.c
View File

@ -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");

2
epan/dissectors/packet-lwres.c
View File

@ -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,

4
epan/dissectors/packet-mbim.c
View File

@ -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);

1
epan/dissectors/packet-mmse.c
View File

@ -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);

8
epan/dissectors/packet-mrcpv2.c
View File

@ -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;
}

2
epan/dissectors/packet-msdp.c
View File

@ -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>"));

12
epan/dissectors/packet-mux27010.c
View File

@ -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;
}

1
epan/dissectors/packet-nasdaq-itch.c
View File

@ -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) {

6
epan/dissectors/packet-nbipx.c
View File

@ -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"));
/*

3
epan/dissectors/packet-ndmp.c
View File

@ -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

6
epan/dissectors/packet-nfs.c
View File

@ -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",

2
epan/dissectors/packet-nsip.c
View File

@ -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",

2
epan/dissectors/packet-openflow.c
View File

@ -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:

2
epan/dissectors/packet-opensafety.c
View File

@ -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;
}

2
epan/dissectors/packet-openvpn.c
View File

@ -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 */

1
epan/dissectors/packet-ouch.c
View File

@ -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) {

4
epan/dissectors/packet-pcp.c
View File

@ -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 */

10
epan/dissectors/packet-ppp.c
View File

@ -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) {

2
epan/dissectors/packet-pppoe.c
View File

@ -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);

12
epan/dissectors/packet-ptpip.c
View File

@ -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 ");

2
epan/dissectors/packet-pw-cesopsn.c
View File

@ -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)
{

2
epan/dissectors/packet-pw-fr.c
View File

@ -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);

2
epan/dissectors/packet-pw-satop.c
View File

@ -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)

1
epan/dissectors/packet-retix-bpdu.c
View File

@ -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;

2
epan/dissectors/packet-rip.c
View File

@ -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)"));

1
epan/dissectors/packet-ripng.c
View File

@ -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));

2
epan/dissectors/packet-rmp.c
View File

@ -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) {

6
epan/dissectors/packet-rohc.c
View File

@ -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, " ");
}

3
epan/dissectors/packet-rpc.c
View File

@ -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);

2
epan/dissectors/packet-rsip.c
View File

@ -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)"));

1
epan/dissectors/packet-rtacser.c
View File

@ -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 */

1
epan/dissectors/packet-rtnet.c
View File

@ -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) {

8
epan/dissectors/packet-rtp.c
View File

@ -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 */

2
epan/dissectors/packet-rtps.c
View File

@ -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;
}

2
epan/dissectors/packet-scop.c
View File

@ -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) {

2
epan/dissectors/packet-sctp.c
View File

@ -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 {

1
epan/dissectors/packet-selfm.c
View File

@ -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 */

3
epan/dissectors/packet-slowprotocols.c
View File

@ -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)
{

Some files were not shown because too many files have changed in this diff Show More