1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last batch of col_ API changes

Browse Source
This commit is contained in:
Martin Mathieson 2024-07-31 17:37:58 +01:00
parent 8420e64fde
commit ccaa67c1ea
47 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lcsap/lcsap.cnf
View File

@ -108,7 +108,7 @@ ProtocolIE-Field/value ie_field_value
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%sResp", col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%sResp",
val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message")); val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message"));
else else
col_add_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message")); val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message"));
} }

10
epan/dissectors/asn1/mms/mms.cnf
View File

@ -174,16 +174,16 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment-
proto_item_append_text(mms_priv->pdu_item, " [GetDataDirectoryResponse ]"); proto_item_append_text(mms_priv->pdu_item, " [GetDataDirectoryResponse ]");
}else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_READ){ }else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_READ){
if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){ if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "GetRCBValuesResponse"); col_append_str(actx->pinfo->cinfo, COL_INFO, "GetRCBValuesResponse");
proto_item_append_text(mms_priv->pdu_item, " [GetRCBValuesResponse]"); proto_item_append_text(mms_priv->pdu_item, " [GetRCBValuesResponse]");
}else{ }else{
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "GetDataValueResponse"); col_append_str(actx->pinfo->cinfo, COL_INFO, "GetDataValueResponse");
proto_item_append_text(mms_priv->pdu_item, " [GetDataValueResponse ]"); proto_item_append_text(mms_priv->pdu_item, " [GetDataValueResponse ]");
} }
if(mms_priv->success == 1){ if(mms_priv->success == 1){
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " success"); col_append_str(actx->pinfo->cinfo, COL_INFO, " success");
}else{ }else{
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " failure"); col_append_str(actx->pinfo->cinfo, COL_INFO, " failure");
} }
} else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_WRITE){ } else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_WRITE){
if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){ if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){
@ -211,7 +211,7 @@ AlterEventEnrollment-Response/currentState/state ABBREV=alterEventEnrollment-
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s%%s%%s", col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s%%s%%s",
private_data_get_preCinfo(actx), mms_MMSpdu_vals[branch_taken].strptr, private_data_get_moreCinfo(actx)); private_data_get_preCinfo(actx), mms_MMSpdu_vals[branch_taken].strptr, private_data_get_moreCinfo(actx));
}else{ }else{
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%s", col_append_str(actx->pinfo->cinfo, COL_INFO,
mms_MMSpdu_vals[branch_taken].strptr); mms_MMSpdu_vals[branch_taken].strptr);
} }
} }

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

@ -299,7 +299,7 @@ static int dissect_lbmpdm_tcp(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
{ {
char * tag_name = NULL; char * tag_name = NULL;
col_add_str(pinfo->cinfo, COL_PROTOCOL, "LBMPDM-TCP"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "LBMPDM-TCP");
col_clear(pinfo->cinfo, COL_INFO); col_clear(pinfo->cinfo, COL_INFO);
if (lbmpdm_tcp_use_tag) if (lbmpdm_tcp_use_tag)
{ {

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

@ -1120,7 +1120,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
lbm_lbtrm_tap_info_t * tapinfo = NULL; lbm_lbtrm_tap_info_t * tapinfo = NULL;
proto_item * header_type_item = NULL; proto_item * header_type_item = NULL;
col_add_str(pinfo->cinfo, COL_PROTOCOL, "LBT-RM"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "LBT-RM");
col_clear(pinfo->cinfo, COL_INFO); col_clear(pinfo->cinfo, COL_INFO);
if (lbtrm_use_tag) if (lbtrm_use_tag)
{ {

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

@ -1140,7 +1140,7 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
proto_item * next_hdr_item = NULL; proto_item * next_hdr_item = NULL;
lbm_lbtru_tap_info_t * tapinfo = NULL; lbm_lbtru_tap_info_t * tapinfo = NULL;
col_add_str(pinfo->cinfo, COL_PROTOCOL, "LBT-RU"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "LBT-RU");
if (lbtru_use_tag) if (lbtru_use_tag)
{ {
tag_name = lbtru_tag_find(pinfo); tag_name = lbtru_tag_find(pinfo);

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

@ -616,7 +616,7 @@ static int dissect_lbttcp_real(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
{ {
char * tag_name = NULL; char * tag_name = NULL;
col_add_str(pinfo->cinfo, COL_PROTOCOL, "LBT-TCP"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "LBT-TCP");
col_clear(pinfo->cinfo, COL_INFO); col_clear(pinfo->cinfo, COL_INFO);
if (lbttcp_use_tag) if (lbttcp_use_tag)
{ {

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

@ -500,7 +500,7 @@ dissect_lcsap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%sResp", col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%sResp",
val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message")); val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message"));
else else
col_add_str(actx->pinfo->cinfo, COL_INFO, col_set_str(actx->pinfo->cinfo, COL_INFO,
val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message")); val_to_str_const(ProcedureCode, lcsap_ProcedureCode_vals, "unknown message"));
} }

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

@ -504,7 +504,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
NULL NULL
}; };
col_add_str(pinfo->cinfo, COL_INFO, "Master -> RTU"); col_set_str(pinfo->cinfo, COL_INFO, "Master -> RTU");
/* Add Flags to Protocol Tree */ /* Add Flags to Protocol Tree */
shr = tvb_get_uint8(tvb, offset) & 0x80; shr = tvb_get_uint8(tvb, offset) & 0x80;
@ -748,7 +748,7 @@ dissect_lg8979(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
NULL NULL
}; };
col_add_str(pinfo->cinfo, COL_INFO, "RTU -> Master"); col_set_str(pinfo->cinfo, COL_INFO, "RTU -> Master");
/* Retrieve and add Flags to Protocol Tree */ /* Retrieve and add Flags to Protocol Tree */
shr = tvb_get_uint8(tvb, offset) & 0x80; shr = tvb_get_uint8(tvb, offset) & 0x80;

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

@ -458,7 +458,7 @@ dissect_lin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
col_add_fstr(pinfo->cinfo, COL_INFO, "LIN %s", val_to_str(msg_type, lin_msg_type_names, "(0x%02x)")); col_add_fstr(pinfo->cinfo, COL_INFO, "LIN %s", val_to_str(msg_type, lin_msg_type_names, "(0x%02x)"));
if (errors != 0) { if (errors != 0) {
col_append_fstr(pinfo->cinfo, COL_INFO, " - ERR"); col_append_str(pinfo->cinfo, COL_INFO, " - ERR");
proto_item_set_end(ti_root, tvb, 8); proto_item_set_end(ti_root, tvb, 8);
return 8; return 8;
} }

2
epan/dissectors/packet-lisp-tcp.c
View File

@ -303,7 +303,7 @@ dissect_lisp_tcp_reliable_transport_message(tvbuff_t *tvb, packet_info *pinfo, p
proto_tree_add_item(message_tree, hf_lisp_tcp_message_registration_refresh_flags_rejected, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(message_tree, hf_lisp_tcp_message_registration_refresh_flags_rejected, tvb, offset, 2, ENC_BIG_ENDIAN);
if (refresh_flags & REFRESH_FLAG_R) { if (refresh_flags & REFRESH_FLAG_R) {
proto_item_append_text(tim, " (rejected only)"); proto_item_append_text(tim, " (rejected only)");
col_append_fstr(pinfo->cinfo, COL_INFO, " (rejected only)"); col_append_str(pinfo->cinfo, COL_INFO, " (rejected only)");
} }
/* Reserved (15 bits) */ /* Reserved (15 bits) */

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

@ -485,7 +485,7 @@ static int dissect_lwm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
call_data_dissector(decrypted_tvb, pinfo, lwm_tree); call_data_dissector(decrypted_tvb, pinfo, lwm_tree);
/* XXX - needed? /* XXX - needed?
add_new_data_source(pinfo, decrypted_tvb, "Decrypted LWmesh Payload"); */ add_new_data_source(pinfo, decrypted_tvb, "Decrypted LWmesh Payload"); */
col_append_fstr(pinfo->cinfo, COL_INFO, ", MIC SUCCESS"); col_append_str(pinfo->cinfo, COL_INFO, ", MIC SUCCESS");
} }
else else

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

@ -144,7 +144,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
proto_tree_add_item(macctrl_tree, hf_macctrl_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN); proto_tree_add_item(macctrl_tree, hf_macctrl_timestamp, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4; offset += 4;
} }
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, opcode_vals, "Unknown")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, opcode_vals, "Unknown"));
switch (opcode) { switch (opcode) {

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

@ -1574,7 +1574,7 @@ dissect_mausb_pkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
mausb_num_pdus++; mausb_num_pdus++;
col_add_str(pinfo->cinfo, COL_INFO, "["); col_set_str(pinfo->cinfo, COL_INFO, "[");
col_set_fence(pinfo->cinfo, COL_INFO); col_set_fence(pinfo->cinfo, COL_INFO);
/*** PROTOCOL TREE ***/ /*** PROTOCOL TREE ***/

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

@ -476,7 +476,7 @@ dissect_mcpe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
int packet_size; int packet_size;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MCPE"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MCPE");
col_add_str(pinfo->cinfo, COL_INFO, "Encrypted packet"); col_set_str(pinfo->cinfo, COL_INFO, "Encrypted packet");
packet_size = tvb_reported_length(tvb); packet_size = tvb_reported_length(tvb);
ti = proto_tree_add_item(tree, proto_mcpe, tvb, 0, packet_size, ENC_NA); ti = proto_tree_add_item(tree, proto_mcpe, tvb, 0, packet_size, ENC_NA);

4
epan/dissectors/packet-miwi-p2pstar.c
View File

@ -557,7 +557,7 @@ dissect_miwi_connect_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, mi
proto_item_append_text(ti, "%s", val_to_str_const(status, miwi_p2pstar_conn_status, " (Reserved)")); proto_item_append_text(ti, "%s", val_to_str_const(status, miwi_p2pstar_conn_status, " (Reserved)"));
} }
*offset += 1; *offset += 1;
col_append_fstr(pinfo->cinfo, COL_INFO, " Connection Response"); col_append_str(pinfo->cinfo, COL_INFO, " Connection Response");
/* Update the info column. */ /* Update the info column. */
if(status == IEEE802154_CMD_ASRSP_AS_SUCCESS){ if(status == IEEE802154_CMD_ASRSP_AS_SUCCESS){
@ -799,7 +799,7 @@ dissect_miwi_connect_tbl_bcast_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree
static void static void
dissect_miwi_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, miwi_packet *packet, unsigned *offset) dissect_miwi_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, miwi_packet *packet, unsigned *offset)
{ {
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const((const uint32_t)packet->command_id, miwi_p2pstar_cmd_names, "Unknown Command")); col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const((const uint32_t)packet->command_id, miwi_p2pstar_cmd_names, "Unknown Command"));
switch (packet->command_id){ switch (packet->command_id){
case MIWI_P2P_CMD_CONN_REQ: case MIWI_P2P_CMD_CONN_REQ:

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

@ -8406,16 +8406,16 @@ dissect_mms_MMSpdu(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn
proto_item_append_text(mms_priv->pdu_item, " [GetDataDirectoryResponse ]"); proto_item_append_text(mms_priv->pdu_item, " [GetDataDirectoryResponse ]");
}else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_READ){ }else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_READ){
if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){ if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "GetRCBValuesResponse"); col_append_str(actx->pinfo->cinfo, COL_INFO, "GetRCBValuesResponse");
proto_item_append_text(mms_priv->pdu_item, " [GetRCBValuesResponse]"); proto_item_append_text(mms_priv->pdu_item, " [GetRCBValuesResponse]");
}else{ }else{
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "GetDataValueResponse"); col_append_str(actx->pinfo->cinfo, COL_INFO, "GetDataValueResponse");
proto_item_append_text(mms_priv->pdu_item, " [GetDataValueResponse ]"); proto_item_append_text(mms_priv->pdu_item, " [GetDataValueResponse ]");
} }
if(mms_priv->success == 1){ if(mms_priv->success == 1){
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " success"); col_append_str(actx->pinfo->cinfo, COL_INFO, " success");
}else{ }else{
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " failure"); col_append_str(actx->pinfo->cinfo, COL_INFO, " failure");
} }
} else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_WRITE){ } else if (mms_priv->mms_trans_p->conf_serv_pdu_type_req == MMS_IEC_61850_CONF_SERV_PDU_WRITE){
if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){ if(mms_priv->mms_trans_p->itemid == IEC61850_ITEM_ID_$BR$_OR_$RP$){
@ -8443,7 +8443,7 @@ dissect_mms_MMSpdu(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s%s%s", col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s%s%s",
private_data_get_preCinfo(actx), mms_MMSpdu_vals[branch_taken].strptr, private_data_get_moreCinfo(actx)); private_data_get_preCinfo(actx), mms_MMSpdu_vals[branch_taken].strptr, private_data_get_moreCinfo(actx));
}else{ }else{
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%s", col_append_str(actx->pinfo->cinfo, COL_INFO,
mms_MMSpdu_vals[branch_taken].strptr); mms_MMSpdu_vals[branch_taken].strptr);
} }
} }

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

@ -288,7 +288,7 @@ dissect_mojito_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset += 4; offset += 4;
header_data->opcode = tvb_get_uint8(tvb, offset); header_data->opcode = tvb_get_uint8(tvb, offset);
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(header_data->opcode, opcodeflags, "Unknown")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(header_data->opcode, opcodeflags, "Unknown"));
proto_tree_add_item(header_tree, hf_mojito_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(header_tree, hf_mojito_opcode, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1; offset += 1;

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

@ -1004,7 +1004,7 @@ dissect_mongo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_const(effective_opcode, opcode_vals, "Unknown")); col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_const(effective_opcode, opcode_vals, "Unknown"));
if(opcode != effective_opcode) { if(opcode != effective_opcode) {
col_append_fstr(pinfo->cinfo, COL_INFO, " (Compressed)"); col_append_str(pinfo->cinfo, COL_INFO, " (Compressed)");
} }
if(offset < tvb_reported_length(tvb)) if(offset < tvb_reported_length(tvb))

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

@ -1104,7 +1104,7 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* append the reassembled packet to the head of the packet list */ /* append the reassembled packet to the head of the packet list */
wmem_list_prepend(result->found_packets, prepare_data_for_found_packet(new_tvb,result->mtp2_remain_data.before_fh_unalignment_offset)); wmem_list_prepend(result->found_packets, prepare_data_for_found_packet(new_tvb,result->mtp2_remain_data.before_fh_unalignment_offset));
/* set the protocol name */ /* set the protocol name */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2");
} }
} }
} }
@ -1117,8 +1117,8 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
wmem_list_frame_t *recognized_packet = wmem_list_head(result->found_packets); wmem_list_frame_t *recognized_packet = wmem_list_head(result->found_packets);
/* info field pre-set, we can see the MTP2 strings even if there is an error in the dissection */ /* info field pre-set, we can see the MTP2 strings even if there is an error in the dissection */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2");
col_add_str(pinfo->cinfo, COL_INFO, "MTP2"); col_set_str(pinfo->cinfo, COL_INFO, "MTP2");
/* while there are available packets */ /* while there are available packets */
while (recognized_packet != NULL) { while (recognized_packet != NULL) {
mtp2_recognized_packet_t *recognized_packet_data = (mtp2_recognized_packet_t *) wmem_list_frame_data(recognized_packet); mtp2_recognized_packet_t *recognized_packet_data = (mtp2_recognized_packet_t *) wmem_list_frame_data(recognized_packet);
@ -1162,14 +1162,14 @@ dissect_mtp2_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
&& result->mtp2_remain_data.after_last_flag != NULL && result->mtp2_remain_data.after_last_flag != NULL
&& frag_msg_before_fh) && frag_msg_before_fh)
{ {
col_add_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2");
col_info_str = ws_strdup_printf("[MTP2 Reassembled in: %u]", frag_msg_before_fh->reassembled_in); col_info_str = ws_strdup_printf("[MTP2 Reassembled in: %u]", frag_msg_before_fh->reassembled_in);
col_add_str(pinfo->cinfo, COL_INFO, col_info_str); col_add_str(pinfo->cinfo, COL_INFO, col_info_str);
g_free(col_info_str); g_free(col_info_str);
} else { } else {
col_add_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2");
col_info_str = "[MTP2 No Packets]"; col_info_str = "[MTP2 No Packets]";
col_add_str(pinfo->cinfo, COL_INFO, col_info_str); col_set_str(pinfo->cinfo, COL_INFO, col_info_str);
} }
} }
/* this adds the "Reassembled in" text to the proto tree to the packet where there is leftover data at the end */ /* this adds the "Reassembled in" text to the proto tree to the packet where there is leftover data at the end */

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

@ -215,7 +215,7 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
op_code = tvb_get_uint8( tvb, offset ) & 0x0f; op_code = tvb_get_uint8( tvb, offset ) & 0x0f;
/*offset += 1;*/ /* step over op_code */ /*offset += 1;*/ /* step over op_code */
col_add_str( pinfo->cinfo, COL_INFO, val_to_str_const( op_code, op_code_vals_text, "Unknown" )); col_set_str( pinfo->cinfo, COL_INFO, val_to_str_const( op_code, op_code_vals_text, "Unknown" ));
/* if ( tree ) */ /* if ( tree ) */
{ {

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

@ -8275,7 +8275,7 @@ static int dissect_nfapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
// Flag if this is a vendor extension message, could do it for P4, 5, 7 // Flag if this is a vendor extension message, could do it for P4, 5, 7
if (msg_id >= 0x0300 && msg_id <= 0x03FF) if (msg_id >= 0x0300 && msg_id <= 0x03FF)
{ {
col_append_fstr(pinfo->cinfo, COL_INFO, "Vendor Extension"); col_append_str(pinfo->cinfo, COL_INFO, "Vendor Extension");
proto_item_append_text(nfapi_item, ", Vendor Extension"); proto_item_append_text(nfapi_item, ", Vendor Extension");
} }
else else

8
epan/dissectors/packet-obd-ii.c
View File

@ -1219,12 +1219,12 @@ dissect_obdii_mode_01(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree
if (!handled) if (!handled)
{ {
/* display raw */ /* display raw */
col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": <"); col_append_str(oinfo->pinfo->cinfo, COL_INFO, ": <");
if (oinfo->value_bytes >= 1) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueA); if (oinfo->value_bytes >= 1) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueA);
if (oinfo->value_bytes >= 2) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueB); if (oinfo->value_bytes >= 2) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueB);
if (oinfo->value_bytes >= 3) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueC); if (oinfo->value_bytes >= 3) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueC);
if (oinfo->value_bytes >= 4) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueD); if (oinfo->value_bytes >= 4) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueD);
col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " >"); col_append_str(oinfo->pinfo->cinfo, COL_INFO, " >");
} }
} }
@ -1234,13 +1234,13 @@ dissect_obdii_mode_07(tvbuff_t *tvb, struct obdii_packet_info *oinfo, proto_tree
proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_MODE07_DATA_OFF, oinfo->value_bytes, ENC_NA); proto_tree_add_item(tree, hf_obdii_raw_value, tvb, OBDII_MODE07_DATA_OFF, oinfo->value_bytes, ENC_NA);
/* display raw */ /* display raw */
col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, ": <"); col_append_str(oinfo->pinfo->cinfo, COL_INFO, ": <");
if (oinfo->value_bytes >= 1) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueA); if (oinfo->value_bytes >= 1) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueA);
if (oinfo->value_bytes >= 2) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueB); if (oinfo->value_bytes >= 2) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueB);
if (oinfo->value_bytes >= 3) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueC); if (oinfo->value_bytes >= 3) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueC);
if (oinfo->value_bytes >= 4) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueD); if (oinfo->value_bytes >= 4) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueD);
if (oinfo->value_bytes >= 5) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueE); if (oinfo->value_bytes >= 5) col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " %.2X", oinfo->valueE);
col_append_fstr(oinfo->pinfo->cinfo, COL_INFO, " >"); col_append_str(oinfo->pinfo->cinfo, COL_INFO, " >");
} }
static void static void

28
epan/dissectors/packet-pldm.c
View File

@ -628,7 +628,7 @@ int dissect_base(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_tree, const pl
if (pldmT == 63) if (pldmT == 63)
pldmT = 7; // for oem-specific inorder to avoid array of size 64 pldmT = 7; // for oem-specific inorder to avoid array of size 64
if (instID > 31 || pldmT > 7) { if (instID > 31 || pldmT > 7) {
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid PLDM Inst ID or Type"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid PLDM Inst ID or Type");
break; break;
} else { } else {
pldmTypeMap = wmem_map_new(addr_resolv_scope, g_direct_hash, g_direct_equal); pldmTypeMap = wmem_map_new(addr_resolv_scope, g_direct_hash, g_direct_equal);
@ -702,12 +702,12 @@ int dissect_base(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_tree, const pl
} }
break; break;
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid PLDM Command Request"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid PLDM Command Request");
} }
} }
break; break;
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid PLDM command"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid PLDM command");
break; break;
} }
return tvb_captured_length(tvb); return tvb_captured_length(tvb);
@ -806,11 +806,11 @@ int dissect_platform(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p_tree,
proto_tree_add_item(p_tree, hf_sensor_value_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(p_tree, hf_sensor_value_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN);
break; break;
default: // Invalid default: // Invalid
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid byte"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid byte");
} }
break; break;
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid sensor event class"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid sensor event class");
break; break;
} }
break; break;
@ -849,7 +849,7 @@ int dissect_platform(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p_tree,
} }
break; break;
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid platform message type"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid platform message type");
} }
} }
else { else {
@ -929,7 +929,7 @@ int dissect_platform(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p_tree,
proto_tree_add_item(p_tree, hf_sensor_value_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(p_tree, hf_sensor_value_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN);
break; break;
default: // Invalid default: // Invalid
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid byte"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid byte");
} }
} }
break; break;
@ -960,7 +960,7 @@ int dissect_platform(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p_tree,
proto_tree_add_item(p_tree, hf_effecter_value_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(p_tree, hf_effecter_value_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN);
break; break;
default: // Invalid default: // Invalid
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid byte"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid byte");
} }
} }
break; break;
@ -1005,7 +1005,7 @@ int dissect_platform(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p_tree,
proto_tree_add_item(p_tree, hf_effecter_value_pres_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(p_tree, hf_effecter_value_pres_s32, tvb, offset, 4, ENC_LITTLE_ENDIAN);
break; break;
default: // Invalid default: // Invalid
col_append_fstr(pinfo->cinfo, COL_INFO, "Invalid byte"); col_append_str(pinfo->cinfo, COL_INFO, "Invalid byte");
} }
} }
@ -1050,7 +1050,7 @@ int dissect_platform(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *p_tree,
uint16_t pdr_length = tvb_reported_length_remaining(tvb, offset); uint16_t pdr_length = tvb_reported_length_remaining(tvb, offset);
if (response_cnt) { if (response_cnt) {
if (pdr_length != response_cnt) { if (pdr_length != response_cnt) {
col_append_fstr(pinfo->cinfo, COL_INFO, "Corrupt PDR Record data"); col_append_str(pinfo->cinfo, COL_INFO, "Corrupt PDR Record data");
break; break;
} }
while (response_cnt > 0) { while (response_cnt > 0) {
@ -1114,12 +1114,12 @@ uint16_t parse_fru_record_table(tvbuff_t *tvb, const packet_info *pinfo,
offset, field_len, ENC_UTF_16 | ENC_BIG_ENDIAN); offset, field_len, ENC_UTF_16 | ENC_BIG_ENDIAN);
break; break;
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "Unsupported or invalid FRU record encoding"); col_append_str(pinfo->cinfo, COL_INFO, "Unsupported or invalid FRU record encoding");
break; break;
} }
offset += field_len; offset += field_len;
} else { } else {
col_append_fstr(pinfo->cinfo, COL_INFO, "Unsupported or OEM FRU record type"); col_append_str(pinfo->cinfo, COL_INFO, "Unsupported or OEM FRU record type");
} }
} }
bytes_left = tvb_reported_length(tvb) - offset; bytes_left = tvb_reported_length(tvb) - offset;
@ -1185,7 +1185,7 @@ int dissect_FRU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_tree, const pld
offset += 1; offset += 1;
offset = parse_fru_record_table(tvb, pinfo, p_tree, offset);//check offset = parse_fru_record_table(tvb, pinfo, p_tree, offset);//check
if (tvb_captured_length(tvb) != offset) if (tvb_captured_length(tvb) != offset)
col_append_fstr(pinfo->cinfo, COL_INFO, "Unexpected bytes at end of FRU table"); col_append_str(pinfo->cinfo, COL_INFO, "Unexpected bytes at end of FRU table");
} }
break; break;
case 0x03: // Set Fru record table case 0x03: // Set Fru record table
@ -1231,7 +1231,7 @@ int dissect_FRU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p_tree, const pld
} }
break; break;
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "Unsupported or Invalid PLDM command"); col_append_str(pinfo->cinfo, COL_INFO, "Unsupported or Invalid PLDM command");
break; break;
} }

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

@ -787,7 +787,7 @@ static int dissect_pnrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
offset = 0; offset = 0;
} else { } else {
proto_tree_add_item(pnrp_message_tree, hf_pnrp_fragmented_payload, tvb, offset, -1, ENC_NA); proto_tree_add_item(pnrp_message_tree, hf_pnrp_fragmented_payload, tvb, offset, -1, ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, " [Fragmented message]"); col_append_str(pinfo->cinfo, COL_INFO, " [Fragmented message]");
return tvb_captured_length(tvb); return tvb_captured_length(tvb);
} }
break; break;

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

@ -1242,7 +1242,7 @@ raknet_dissect_connected_message(tvbuff_t *tvb, packet_info *pinfo,
* RakNet uses ChaCha stream cipher to encrypt messages, which * RakNet uses ChaCha stream cipher to encrypt messages, which
* is currently not supported by this dissector. * is currently not supported by this dissector.
*/ */
col_add_str(pinfo->cinfo, COL_INFO, "Encrypted message"); col_set_str(pinfo->cinfo, COL_INFO, "Encrypted message");
item_size = tvb_reported_length_remaining(tvb, offset); item_size = tvb_reported_length_remaining(tvb, offset);
ti = proto_tree_add_expert(root_tree, pinfo, &ei_raknet_encrypted_message, tvb, ti = proto_tree_add_expert(root_tree, pinfo, &ei_raknet_encrypted_message, tvb,
@ -1372,7 +1372,7 @@ raknet_dissect_connected_message(tvbuff_t *tvb, packet_info *pinfo,
/* /*
* More messages are in the packet. * More messages are in the packet.
*/ */
col_append_fstr(pinfo->cinfo, COL_INFO, ", "); col_append_str(pinfo->cinfo, COL_INFO, ", ");
col_set_fence(pinfo->cinfo, COL_INFO); col_set_fence(pinfo->cinfo, COL_INFO);
continue; continue;
} }

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

@ -108,7 +108,7 @@ dissect_rdp_cliprdr(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *parent_tr
proto_tree_add_item(tree, hf_cliprdr_dataLen, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_cliprdr_dataLen, tvb, offset, 4, ENC_LITTLE_ENDIAN);
//offset += 4; //offset += 4;
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmdId, rdp_cliprdr_order_vals, "Unknown clipboard command")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmdId, rdp_cliprdr_order_vals, "Unknown clipboard command"));
switch (cmdId) { switch (cmdId) {
case CB_MONITOR_READY: case CB_MONITOR_READY:

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

@ -103,7 +103,7 @@ dissect_rdp_snd(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *parent_tree _
proto_tree_add_item(tree, hf_snd_bodySize, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(tree, hf_snd_bodySize, tvb, offset, 2, ENC_LITTLE_ENDIAN);
//offset += 2; //offset += 2;
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmdId, rdp_snd_order_vals, "Unknown rdpsnd command")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmdId, rdp_snd_order_vals, "Unknown rdpsnd command"));
switch (cmdId) { switch (cmdId) {
case SNDC_CLOSE: case SNDC_CLOSE:

2
epan/dissectors/packet-reload-framing.c
View File

@ -276,7 +276,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
reload_framing_tree = proto_item_add_subtree(ti, ett_reload_framing); reload_framing_tree = proto_item_add_subtree(ti, ett_reload_framing);
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, types, "Unknown")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(type, types, "Unknown"));
proto_item_append_text(ti, ": %s", val_to_str_const(type, types, "Unknown")); proto_item_append_text(ti, ": %s", val_to_str_const(type, types, "Unknown"));
/* Retransmission control */ /* Retransmission control */

2
epan/dissectors/packet-rtp-ed137.c
View File

@ -871,7 +871,7 @@ static ed137rmm_transaction_t *transaction_start(packet_info * pinfo,
ENC_NA); ENC_NA);
proto_item_set_generated(it); proto_item_set_generated(it);
col_append_fstr(pinfo->cinfo, COL_INFO, ", RMM (no response found!)"); col_append_str(pinfo->cinfo, COL_INFO, ", RMM (no response found!)");
/* Expert info. */ /* Expert info. */
expert_add_info_format(pinfo, it, &ei_rtp_hdr_ed137_ft_climax_ddc_rmm_resp_not_found, expert_add_info_format(pinfo, it, &ei_rtp_hdr_ed137_ft_climax_ddc_rmm_resp_not_found,

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

@ -464,7 +464,7 @@ dissect_S101(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
fi->offset, datalen, fi->offset, datalen,
true); true);
fi->offset += datalen; fi->offset += datalen;
col_append_fstr(pinfo->cinfo, COL_INFO, col_append_str(pinfo->cinfo, COL_INFO,
" (Message fragment)"); " (Message fragment)");
} }
} }

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

@ -2829,7 +2829,7 @@ dissect_sapdiag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
proto_tree *sapdiag_tree = NULL, *header_tree = NULL, *com_flag_tree = NULL, *payload_tree = NULL; proto_tree *sapdiag_tree = NULL, *header_tree = NULL, *com_flag_tree = NULL, *payload_tree = NULL;
/* Add the protocol to the column */ /* Add the protocol to the column */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "SAPDIAG"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAPDIAG");
/* Clear out stuff in the info column */ /* Clear out stuff in the info column */
col_clear(pinfo->cinfo,COL_INFO); col_clear(pinfo->cinfo,COL_INFO);

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

@ -408,7 +408,7 @@ dissect_sapenqueue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
} }
/* Add the protocol to the column */ /* Add the protocol to the column */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "SAPENQUEUE"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAPENQUEUE");
/* Clear out stuff in the info column */ /* Clear out stuff in the info column */
col_clear(pinfo->cinfo,COL_INFO); col_clear(pinfo->cinfo,COL_INFO);

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

@ -134,7 +134,7 @@ dissect_sapigs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
proto_tree *sapigs_tree = NULL, *sapigs_tables_tree = NULL; proto_tree *sapigs_tree = NULL, *sapigs_tables_tree = NULL;
/* Add the protocol to the column */ /* Add the protocol to the column */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "SAPIGS"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAPIGS");
/* Add function name in the info column */ /* Add function name in the info column */
col_add_fstr(pinfo->cinfo, COL_INFO, " function: %s", tvb_get_string_enc(pinfo->pool, tvb, 0, 32, ENC_ASCII)); col_add_fstr(pinfo->cinfo, COL_INFO, " function: %s", tvb_get_string_enc(pinfo->pool, tvb, 0, 32, ENC_ASCII));

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

@ -1285,7 +1285,7 @@ dissect_sapms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U
proto_tree *sapms_tree = NULL, *sapms_opcode_tree = NULL, *msg_types_tree = NULL; proto_tree *sapms_tree = NULL, *sapms_opcode_tree = NULL, *msg_types_tree = NULL;
/* Add the protocol to the column */ /* Add the protocol to the column */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "SAPMS"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAPMS");
/* Clear out stuff in the info column */ /* Clear out stuff in the info column */
col_clear(pinfo->cinfo,COL_INFO); col_clear(pinfo->cinfo,COL_INFO);

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

@ -940,7 +940,7 @@ dissect_saprfc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
proto_tree *saprfc_tree = NULL, *accept_info_tree = NULL; proto_tree *saprfc_tree = NULL, *accept_info_tree = NULL;
/* Add the protocol to the column */ /* Add the protocol to the column */
col_add_str(pinfo->cinfo, COL_PROTOCOL, "SAPRFC"); col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAPRFC");
/* Clear out stuff in the info column */ /* Clear out stuff in the info column */
col_clear(pinfo->cinfo, COL_INFO); col_clear(pinfo->cinfo, COL_INFO);

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

@ -225,8 +225,8 @@ dissect_sapsnc_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32
static int static int
dissect_sapsnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) dissect_sapsnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{ {
/* Add the protocol to the column */ /* Add the protocol to the column. TODO: append instead? */
col_add_str(pinfo->cinfo, COL_PROTOCOL, ", SAPSNC"); col_set_str(pinfo->cinfo, COL_PROTOCOL, ", SAPSNC");
/* Clear out stuff in the info column */ /* Clear out stuff in the info column */
col_clear(pinfo->cinfo,COL_INFO); col_clear(pinfo->cinfo,COL_INFO);
/* Call the SNC frame dissection function */ /* Call the SNC frame dissection function */

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

@ -1148,8 +1148,8 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
case SBUS_ACKNAK: case SBUS_ACKNAK:
sbus_ack_code = tvb_get_ntohs(tvb,9); sbus_ack_code = tvb_get_ntohs(tvb,9);
col_add_fstr(pinfo->cinfo, COL_INFO, col_set_str(pinfo->cinfo, COL_INFO,
"%s", val_to_str_const(sbus_ack_code, val_to_str_const(sbus_ack_code,
sbus_ack_nak_vals, sbus_ack_nak_vals,
"Unknown NAK response code!")); "Unknown NAK response code!"));
break; break;

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

@ -2557,7 +2557,7 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree, void* d
selfm_tree = proto_item_add_subtree(selfm_item, ett_selfm); selfm_tree = proto_item_add_subtree(selfm_item, ett_selfm);
/* Set INFO column with SEL Protocol Message Type */ /* Set INFO column with SEL Protocol Message Type */
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(msg_type, &selfm_msgtype_vals_ext, "Unknown Message Type")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(msg_type, &selfm_msgtype_vals_ext, "Unknown Message Type"));
/* Add Message Type to Protocol Tree */ /* Add Message Type to Protocol Tree */
proto_tree_add_item(selfm_tree, hf_selfm_msgtype, selfm_tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(selfm_tree, hf_selfm_msgtype, selfm_tvb, offset, 2, ENC_BIG_ENDIAN);

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

@ -92,16 +92,16 @@ dissect_ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree _U_, void *data _
switch (comcls) { switch (comcls) {
case 0x0: { case 0x0: {
// ack without data // ack without data
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "ACK without data"); col_append_str(pinfo->cinfo, COL_INFO, "ACK without data");
break; break;
} }
case 0x4: { case 0x4: {
// serial transfer // serial transfer
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "Serial transfer"); col_append_str(pinfo->cinfo, COL_INFO, "Serial transfer");
break; break;
} }
default: default:
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", "UNKNOWN command class"); col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN command class");
} }
proto_item *ap_item = proto_tree_add_item(tree, proto_ap, tvb, 0, -1, ENC_NA); proto_item *ap_item = proto_tree_add_item(tree, proto_ap, tvb, 0, -1, ENC_NA);

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

@ -862,10 +862,10 @@ dissect_smtp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *smtp_tree,
if ((multiline_state != SMTP_MULTILINE_CONTINUE) && if ((multiline_state != SMTP_MULTILINE_CONTINUE) &&
(multiline_state != SMTP_MULTILINE_END)) { (multiline_state != SMTP_MULTILINE_END)) {
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", col_append_str(pinfo->cinfo, COL_INFO,
tvb_format_text(pinfo->pool, tvb, offset, linelen)); tvb_format_text(pinfo->pool, tvb, offset, linelen));
} else { } else {
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", col_append_str(pinfo->cinfo, COL_INFO,
tvb_format_text(pinfo->pool, tvb, offset+4, linelen-4)); tvb_format_text(pinfo->pool, tvb, offset+4, linelen-4));
} }
} }

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

@ -1854,7 +1854,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
frame_type = tvb_get_uint8(tvb, 1) >> 4; frame_type = tvb_get_uint8(tvb, 1) >> 4;
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(frame_type, typenames, "invalid packet type")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(frame_type, typenames, "invalid packet type"));
/* CFG-2, CFG3, and DATA frames need special treatment during the first run: /* CFG-2, CFG3, and DATA frames need special treatment during the first run:
* For CFG-2 & CFG-3 frames, a 'config_frame' struct is created to hold the * For CFG-2 & CFG-3 frames, a 'config_frame' struct is created to hold the

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

@ -1422,7 +1422,7 @@ dissect_v3_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
refuse_bundle_hdr = tvb_get_uint8(tvb, offset); refuse_bundle_hdr = tvb_get_uint8(tvb, offset);
proto_tree_add_item(conv_tree, hf_tcpclv3_refuse_reason_code, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(conv_tree, hf_tcpclv3_refuse_reason_code, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1; offset += 1;
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const((refuse_bundle_hdr>>4)&0xF, v3_refuse_reason_code, "Unknown")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const((refuse_bundle_hdr>>4)&0xF, v3_refuse_reason_code, "Unknown"));
// implied transfer ID // implied transfer ID
xfer_id = wmem_map_lookup(ctx->rx_peer->frame_loc_to_transfer, ctx->cur_loc); xfer_id = wmem_map_lookup(ctx->rx_peer->frame_loc_to_transfer, ctx->cur_loc);

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

@ -340,7 +340,7 @@ dissect_twamp_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
it = proto_tree_add_item(tree, proto_twamp_control, tvb, 0, -1, ENC_NA); it = proto_tree_add_item(tree, proto_twamp_control, tvb, 0, -1, ENC_NA);
twamp_tree = proto_item_add_subtree(it, ett_twamp_control); twamp_tree = proto_item_add_subtree(it, ett_twamp_control);
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(cp->state, twamp_control_state_vals, "Unknown")); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(cp->state, twamp_control_state_vals, "Unknown"));
switch (cp->state) { switch (cp->state) {
case CONTROL_STATE_GREETING: case CONTROL_STATE_GREETING:

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

@ -258,12 +258,12 @@ static void _dissect_uasip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} }
else else
{ {
col_add_str(pinfo->cinfo, COL_INFO, "DATA - Couldn't resolve direction."); col_set_str(pinfo->cinfo, COL_INFO, "DATA - Couldn't resolve direction.");
} }
} }
else else
{ {
col_add_str(pinfo->cinfo, COL_INFO, "ACK"); col_set_str(pinfo->cinfo, COL_INFO, "ACK");
} }
} }
else else

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

@ -1395,11 +1395,11 @@ dissect_ubertooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
switch (pinfo->p2p_dir) { switch (pinfo->p2p_dir) {
case P2P_DIR_SENT: case P2P_DIR_SENT:
col_add_str(pinfo->cinfo, COL_INFO, "Sent "); col_set_str(pinfo->cinfo, COL_INFO, "Sent ");
break; break;
case P2P_DIR_RECV: case P2P_DIR_RECV:
col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); col_set_str(pinfo->cinfo, COL_INFO, "Rcvd ");
break; break;
default: default:

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

@ -1622,7 +1622,7 @@ static uint32_t vsip_dissect_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo,
type = tvb_get_uint8(tvb, offset); type = tvb_get_uint8(tvb, offset);
proto_tree_add_uint(tree, hf_vsip_Type, tvb, offset, 1, type); proto_tree_add_uint(tree, hf_vsip_Type, tvb, offset, 1, type);
col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(type, &EVsipMessageType_vals_ext, "Unknown") ); col_set_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(type, &EVsipMessageType_vals_ext, "Unknown") );
offset++; offset++;
proto_tree_add_item(tree, hf_vsip_TransacId, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_vsip_TransacId, tvb, offset, 2, ENC_BIG_ENDIAN);

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

@ -1298,7 +1298,7 @@ dissect_zbncp_high_level_hdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *
offset += 2; offset += 2;
/* Update col */ /* Update col */
col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(*ptype, zbncp_hl_type, "Unknown Type")); col_append_str(pinfo->cinfo, COL_INFO, val_to_str_const(*ptype, zbncp_hl_type, "Unknown Type"));
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str_const(*call_id, zbncp_hl_call_id, "Unknown Call ID")); col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str_const(*call_id, zbncp_hl_call_id, "Unknown Call ID"));
/* Dissect additional values */ /* Dissect additional values */