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
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
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
%(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
/* 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,
#.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
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
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
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 ) {
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 )
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;
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 ) );
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 ",
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 ",
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 ",
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 */
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 ",
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 ",
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:
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:
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) {
}
}
- 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;
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);
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)");
}
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:
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) {
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 ",
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 ",
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);
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 ",
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 ",
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 ",
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) {
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 ",
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);
/* 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);
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;
}
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) {
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 ",
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);
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;
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;
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;
}
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;
}
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;
}
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;
}
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;
}
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;
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;
*/
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 ",
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 */
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 ",
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 */
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 ",
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) {
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) {
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)) {
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 ",
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) {
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 ",
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 ",
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);
}
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);
}
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);
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 ",
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);
}
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;
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 ",
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++;
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;
/* 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"));
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);
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);
}
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);
}
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;
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 */
}
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);
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");
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;
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) {
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);
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 {
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);
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) {
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;
}
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);
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);
}
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 ) );
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 )
{
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' :
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;
}
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;
}
}
"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;
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);
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);
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) ");
}
/*
{
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);
}
}
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)",
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,
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");
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)
{
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");
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 ",
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) {
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);
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);
}
/* 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;
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;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_USB");
- col_clear(pinfo->cinfo, COL_INFO);
usb_data = (usb_data_t *)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:
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);
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)"));
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) {
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);
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);
/* 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);
/* 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 */
}
else {
/* Association was unsuccessful. */
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Unsuccessful");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Unsuccessful");
}
/* Update the address table. */
/* 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;
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));
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,
/* 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)"));
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);
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;
}
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 */
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);
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))
{
}
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));
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;
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)) {
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");
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,
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);
/* 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);
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 */
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 */
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 */
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;
}
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>"));
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;
}
}
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) {
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);
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);
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"));
/*
*/
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
}
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, "]");
}
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",
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",
}
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",
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:
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;
}
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 */
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) {
/* 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 */
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) {
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) {
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) {
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);
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) {
/* 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);
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 ");
*/
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 ");
*/
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 ");
{
guint64 dataLen=0;
- col_add_str(
+ col_set_str(
pinfo->cinfo,
COL_INFO,
"Start Data Packet ");
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 ");
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 ");
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)
{
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);
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)
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;
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)"));
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));
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) {
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 */
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, " ");
}
* 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);
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)"));
/* 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 */
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) {
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 */
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 */
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;
}
/* 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) {
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 {
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 */
}
}
- 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)
{
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);
}
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 */
/*
* 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 {
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
}
} 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;
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);
}
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"
);
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:
/* 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:
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) {
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 {
* 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) {
/*
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,
}
} 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");
}
}
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;
tree);
else {
/* XXX: expert ?? */
- col_add_str(pinfo->cinfo,
+ col_set_str(pinfo->cinfo,
COL_INFO,
"Data - Couldn't resolve direction. Check UAUDP Preferences.");
}
}
else {
/* print in "INFO" column */
- col_add_str(pinfo->cinfo,
+ col_set_str(pinfo->cinfo,
COL_INFO,
"Data ACK");
}
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,
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,
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'"));
}
/* 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"));
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);
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);
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);
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) &&
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 {
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) &&
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 {
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) &&
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) &&
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) {
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);
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)"));
/*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"));
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);
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 */
/*{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);
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));
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);
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");
{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);
{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);
{"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);
{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);
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);
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);
{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);
{"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);
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);
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);
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);
{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);
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);
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);
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);
{"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);
{"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);
{"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);
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);
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);
{"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);
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);
{"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);
}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*/
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 */
}
/* 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);
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
md_ds_sg_id = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO, "Bonded Ranging Request: MD-DS-SG-ID = %u (0x%X)",
md_ds_sg_id, md_ds_sg_id );
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"CM Control Request: Transaction-Id = %u", transid);
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"CM Control Response: Transaction-Id = %u", transid);
transid = tvb_get_ntohs (tvb, 0);
event_type = tvb_get_guint8 (tvb, 2);
len = tvb_reported_length_remaining (tvb, 3);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO, "CM-STATUS Report: Transaction ID = %u", transid);
if (tree)
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Bonding Change Acknowledge: Tran-Id = %u", transid);
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Bonding Change Request: Tran-Id = %u", transid);
transid = tvb_get_ntohs (tvb, 0);
confcode = tvb_get_guint8 (tvb, 2);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Bonding Change Response: Tran-Id = %u (%s)", transid,
val_to_str (confcode, docsis_conf_code, "%d"));
/* Make entries in Protocol column and Info column on summary display */
col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS");
- col_clear (pinfo->cinfo, COL_INFO);
switch (fctype)
{
case FCTYPE_PACKET:
transid = tvb_get_ntohs (tvb, 0);
dschan = tvb_get_guint8 (tvb, 2);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"DOCSIS Path Verify Request: Transaction-Id = %u DS-Ch %d",
transid, dschan);
transid = tvb_get_ntohs (tvb, 0);
dschan = tvb_get_guint8 (tvb, 2);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"DOCSIS Path Verify Response: Transaction-Id = %u DS-Ch %d",
transid, dschan);
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Addition Request Tran-id = %u", transid);
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Change Request Tran-id = %u", transid);
transid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Delete Request Tran-id = %u", transid);
if (tree)
sid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO, "Ranging Request: SID = %u",sid);
if (tree)
upchid = tvb_get_guint8 (tvb, 0);
ucd_count = tvb_get_guint8 (tvb, 1);
- col_clear (pinfo->cinfo, COL_INFO);
if (upchid > 0)
col_add_fstr (pinfo->cinfo, COL_INFO,
"Map Message: Channel ID = %u (U%u), UCD Count = %u, # IE's = %u",
sid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO, "Registration Request SID = %u",
sid);
sid = tvb_get_ntohs (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
if (sid > 0)
col_add_fstr (pinfo->cinfo, COL_INFO, "Ranging Request: SID = %u",
sid);
sid = tvb_get_ntohs (tvb, 0);
upchid = tvb_get_guint8 (tvb, 2);
- col_clear (pinfo->cinfo, COL_INFO);
if (upchid > 0)
col_add_fstr (pinfo->cinfo, COL_INFO,
"Ranging Response: SID = %u, Upstream Channel = %u (U%u)",
upchid = tvb_get_guint8 (tvb, 0);
/* if the upstream Channel ID is 0 then this is for Telephony Return) */
- col_clear (pinfo->cinfo, COL_INFO);
if (upchid > 0)
col_add_fstr (pinfo->cinfo, COL_INFO,
"type29ucd Message: Channel ID = %u (U%u)", upchid,
chid = tvb_get_guint8 (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Upstream Channel Change request Channel ID = %u (U%u)",
chid, (chid > 0 ? chid - 1 : chid));
chid = tvb_get_guint8 (tvb, 0);
- col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Upstream Channel Change response Channel ID = %u (U%u)",
chid, (chid > 0 ? chid - 1 : chid));
upchid = tvb_get_guint8 (tvb, 0);
/* if the upstream Channel ID is 0 then this is for Telephony Return) */
- col_clear (pinfo->cinfo, COL_INFO);
if (upchid > 0)
col_add_fstr (pinfo->cinfo, COL_INFO,
"UCD Message: Channel ID = %u (U%u)", upchid,
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IO-RAW");
- col_clear(pinfo->cinfo, COL_INFO);
-
-
IoRawSummaryFormater(szText, nMax);
- col_append_str(pinfo->cinfo, COL_INFO, szText);
+ col_add_str(pinfo->cinfo, COL_INFO, szText);
if (tree)
{
}
}
- col_add_str(pinfo->cinfo, COL_INFO, "GetValueByClass: \"");
+ col_set_str(pinfo->cinfo, COL_INFO, "GetValueByClass: \"");
tvb_memcpy(tvb, buf, offset + 1 + 1, clen);
memcpy(&buf[clen], "\" \"", 3);
request_reference, val_to_str(request_id, pn_io_profidrive_request_id_vals, "Unknown"),
do_id, no_of_parameters);
- col_clear(pinfo->cinfo, COL_INFO);
- col_append_fstr(pinfo->cinfo, COL_INFO, "PROFIDrive Write Request, ReqRef:0x%02x, %s DO:%u",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "PROFIDrive Write Request, ReqRef:0x%02x, %s DO:%u",
request_reference,
request_id==0x01 ? "Read" :
request_id==0x02 ? "Change" :
request_reference, val_to_str(response_id, pn_io_profidrive_response_id_vals, "Unknown"),
do_id, no_of_parameters);
- col_clear(pinfo->cinfo, COL_INFO);
- col_append_fstr(pinfo->cinfo, COL_INFO, "PROFIDrive Read Response, ReqRef:0x%02x, RspId:%s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "PROFIDrive Read Response, ReqRef:0x%02x, RspId:%s",
request_reference,
val_to_str(response_id, pn_io_profidrive_response_id_vals, "Unknown response"));
} else if (u32Idx < 10) {
col_append_fstr(pinfo->cinfo, COL_INFO, ",0x%x", u32ProvID);
} else if (u32Idx == 10) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ",...");
+ col_append_str(pinfo->cinfo, COL_INFO, ",...");
}
u32Idx++;
} else if (u32Idx < 10) {
col_append_fstr(pinfo->cinfo, COL_INFO, ",0x%x", u32ConsID);
} else if (u32Idx == 10) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ",...");
+ col_append_str(pinfo->cinfo, COL_INFO, ",...");
}
u32Idx++;
} else if (u32Idx < 10) {
col_append_fstr(pinfo->cinfo, COL_INFO, ",0x%x", u32ConsID);
} else if (u32Idx == 10) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ",...");
+ col_append_str(pinfo->cinfo, COL_INFO, ",...");
}
u32Idx++;
} else {
proto_item_append_text(item, " ");
}
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(type, pn_mrp_block_type_vals, "Unknown TLVType 0x%x"));
+ col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, pn_mrp_block_type_vals, "Unknown TLVType 0x%x"));
proto_item_append_text(item, "%s", val_to_str_const(type, pn_mrp_block_type_vals, "Unknown TLVType 0x%x"));
switch(type) {
ClockVariance);
}
else {
- col_append_fstr(pinfo->cinfo, COL_INFO, " active");
+ col_append_str(pinfo->cinfo, COL_INFO, " active");
proto_item_append_text(item, ": Prio1=\"%s\" is active, Prio2=%s, Clock: Class=\"%s\", Accuracy=%s, Variance=%d",
val_to_str(MasterPriority1 & 0x7, pn_ptcp_master_prio1_vals, "(Reserved: 0x%x)"),
val_to_str(MasterPriority2, pn_ptcp_master_prio2_vals, "(Reserved: 0x%x)"),
#if 0
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(message_type, &wimaxmacphy_message_type_vals_ext, "Unknown"));
#endif
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_type, wimaxmacphy_message_type_vals, "Unknown"));
+ col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_type, wimaxmacphy_message_type_vals, "Unknown"));
offset += 1;
switch(message_type)
git.samba.org / metze / wireshark / wip.git / commitdiff