if (camel_opcode_type == CAMEL_OPCODE_RETURN_ERROR){
errorCode = opcode;
if (check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO,
+ col_append_str(actx->pinfo->cinfo, COL_INFO,
val_to_str(errorCode, camel_err_code_string_vals, "Unknown CAMEL error (%%u)"));
col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
col_set_fence(actx->pinfo->cinfo, COL_INFO);
}
}else{
if (check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO,
+ col_append_str(actx->pinfo->cinfo, COL_INFO,
val_to_str(opcode, camel_opr_code_strings, "Unknown CAMEL (%%u)"));
col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
col_set_fence(actx->pinfo->cinfo, COL_INFO);
if (check_col(actx->pinfo->cinfo, COL_INFO)){
/* Populate the info column with PDU type*/
col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str(camel_pdu_type, camel_Component_vals, "Unknown Camel (%u)"));
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
}
is_ExtensionField =FALSE;
expert_add_info_format (actx->pinfo, tf, PI_UNDECODED, PI_ERROR,
"Unable to get compressed content");
if (check_col (actx->pinfo->cinfo, COL_INFO))
- col_append_fstr (actx->pinfo->cinfo, COL_INFO,
+ col_append_str (actx->pinfo->cinfo, COL_INFO,
"[Error: Unable to get compressed content]");
return offset;
}
expert_add_info_format (actx->pinfo, tf, PI_UNDECODED, PI_ERROR,
"Unable to uncompress content");
if (check_col (actx->pinfo->cinfo, COL_INFO))
- col_append_fstr (actx->pinfo->cinfo, COL_INFO,
+ col_append_str (actx->pinfo->cinfo, COL_INFO,
"[Error: Unable to uncompress content]");
return offset;
}
#.FN_HDR CMIPAbortInfo
if(check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
}
#.END
#.FN_HDR CMIPUserInfo
if(check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
}
#.END
proto_tree_add_text(tree, tvb, offset, -1,"Anonymous");
if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, " anonymous");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous");
}
/* do the default thing */
if(dap_dissector) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, dap_op_name);
+ col_set_str(pinfo->cinfo, COL_INFO, dap_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
if(disp_dissector) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, disp_op_name);
+ col_set_str(pinfo->cinfo, COL_INFO, disp_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
if(dop_dissector) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, dop_op_name);
+ col_set_str(pinfo->cinfo, COL_INFO, dop_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
if(dsp_dissector) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, dsp_op_name);
+ col_set_str(pinfo->cinfo, COL_INFO, dsp_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
%(DEFAULT_BODY)s
if (check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode));
+ col_append_str(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode));
}
#.FN_PARS GSMMAPLocalErrorcode
* been decrypted; dissect the decrypted LDAP message.
*/
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
-
+ col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
}
if (sasl_tree) {
* dissect the plain LDAP message.
*/
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
+ col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
}
if (sasl_tree) {
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "Request");
+ col_set_str(pinfo->cinfo, COL_INFO, "Request");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "Response");
+ col_set_str(pinfo->cinfo, COL_INFO, "Response");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "PKIXCMP");
+ col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "PKIXCMP");
+ col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "Reply");
+ col_set_str(pinfo->cinfo, COL_INFO, "Reply");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "Query");
+ col_set_str(pinfo->cinfo, COL_INFO, "Query");
}
#.FN_BODY SessionConnectionIdentifier
if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Recover");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "Recover");
%(DEFAULT_BODY)s
#.END
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Military");
+ col_set_str(pinfo->cinfo, COL_INFO, "Military");
dissect_s4406_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
}
"Failed to decrypt encryptedPDU: %%s", error);
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Failed to decrypt");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Failed to decrypt");
return offset;
} else {
"Decrypted data not formated as expected");
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Decrypted data not formated as expected");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Decrypted data not formated as expected");
return offset;
}
}
} else {
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: privKey Unknown");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: privKey Unknown");
}
#.FN_BODY SNMPv3Message/msgSecurityParameters
}
if (check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket ");
+ col_append_str(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket ");
}
offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr);
"[MALFORMED PACKET or wrong preference settings]");
}
if (check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
}
}
}
}
if (check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, "TCP: IFPPacket");
+ col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket");
}
while(tvb_length_remaining(tvb,offset)>0)
"[MALFORMED PACKET or wrong preference settings]");
}
if (check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
}
break;
}
"[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]");
}
if (check_col(actx->pinfo->cinfo, COL_INFO)){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
}
actx->pinfo->fragmented = save_fragmented;
}
}
if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "otid(");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "otid(");
for(i=0;i<len;i++)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i));
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, ") ");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, ") ");
}
}
}
if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, "dtid(");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "dtid(");
for(i=0;i<len;i++)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i));
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, ") ");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, ") ");
}
}
#.FN_HDR Begin
* put that info there should call col_set_fence() to protect it.
*/
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
#.END
gp_tcapsrt_info->ope=TC_END;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "End ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
#.END
gp_tcapsrt_info->ope=TC_CONT;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
#.END
gp_tcapsrt_info->ope=TC_ABORT;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
#.END
gp_tcapsrt_info->ope=TC_ANSI_ABORT;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
#.END
#.FN_HDR TCMessage/ansiqueryWithPerm
gp_tcapsrt_info->ope=TC_ANSI_ALL;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
#.FN_HDR TCMessage/ansiqueryWithoutPerm
gp_tcapsrt_info->ope=TC_ANSI_ALL;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
#.FN_HDR TCMessage/ansiresponse
gp_tcapsrt_info->ope=TC_ANSI_ALL;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "Response ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "Response ");
#.FN_HDR TCMessage/ansiconversationWithPerm
gp_tcapsrt_info->ope=TC_ANSI_ALL;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
#.FN_HDR TCMessage/ansiconversationWithoutPerm
gp_tcapsrt_info->ope=TC_ANSI_ALL;
if (check_col(actx->pinfo->cinfo, COL_INFO))
- col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
+ col_set_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
#.END
}
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, x411_op_name);
+ col_set_str(pinfo->cinfo, COL_INFO, x411_op_name);
while (tvb_reported_length_remaining(tvb, offset) > 0){
old_offset=offset;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "InterPersonal");
+ col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal");
dissect_x420_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
}
#.FN_BODY IPM
if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Message");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, " Message");
%(DEFAULT_BODY)s
#.FN_BODY IPN
if(check_col(actx->pinfo->cinfo, COL_INFO))
- col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Notification");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification");
%(DEFAULT_BODY)s
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
+ col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
}
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet-APDU");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "BACnet APDU ");
+ col_set_str(pinfo->cinfo, COL_INFO, "BACnet APDU ");
tmp = (gint) tvb_get_guint8(tvb, 0);
bacapp_type = (tmp >> 4) & 0x0f;
/* if we got here we couldn't find anything better */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_append_fstr(pinfo->cinfo, COL_INFO, "Unknown BER");
+ col_append_str(pinfo->cinfo, COL_INFO, "Unknown BER");
}
(void) dissect_unknown_ber(pinfo, tvb, 0, tree);
if (check_col(pinfo->cinfo, COL_INFO)) {
if (first)
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", typ);
+ col_add_str(pinfo->cinfo, COL_INFO, typ);
else
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", typ);
}
break;
case BPDU_TYPE_TOPOLOGY_CHANGE:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Topology Change Notification");
+ col_set_str(pinfo->cinfo, COL_INFO, "Topology Change Notification");
break;
case BPDU_TYPE_RST:
tf = proto_item_add_subtree(ti, ett_bssgp_ran_information_container_unit);
proto_tree_add_item(tf, hf_bssgp_iei_nacc_cause, bi->tvb, bi->offset, 1, FALSE);
- proto_tree_add_text(tf, bi->tvb, bi->offset, tvb_length_remaining(bi->tvb, 0) - bi->offset , "Erroneous Application Container including IEI and LI");
+ proto_tree_add_text(tf, bi->tvb, bi->offset, tvb_length(bi->tvb) - bi->offset , "Erroneous Application Container including IEI and LI");
} else {
bi->offset += ie->value_length;
}
if(check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo, COL_INFO);
- col_add_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
+ col_set_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
}
if(tree){
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RFCOMM");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
+ col_set_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd ");
}
/* Protocol name */
if (check_col(pinfo->cinfo, COL_PROTOCOL))
{
- col_add_str(pinfo->cinfo, COL_PROTOCOL, "DCT2000");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCT2000");
}
/* Info column */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, info_str);
+ col_add_str(pinfo->cinfo, COL_INFO, info_str);
}
if (tree) {
{
col_set_str(pinfo->cinfo, COL_INFO, "");
if (checksumIsValid)
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", match_strval(OC, vals_hdr_OC));
+ col_append_str(pinfo->cinfo, COL_INFO, match_strval(OC, vals_hdr_OC));
else
col_append_fstr(pinfo->cinfo, COL_INFO, "%s - %s", match_strval(OC, vals_hdr_OC), "invalid checksum");
}
/* Add reply status to info column */
if(check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr( pinfo->cinfo, COL_INFO, "%s",
+ col_append_str( pinfo->cinfo, COL_INFO,
val_to_str( ( tvb_get_guint8( tvb, offset+2 ) ),
cip_gs_vals , "Unknown Response (%x)") );
}
*/
if(check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr( pinfo->cinfo, COL_INFO, ", ");
+ col_append_str( pinfo->cinfo, COL_INFO, ", ");
dissect_cip_data( temp_tree, tvb, offset+serv_offset+4, serv_length, pinfo );
}
/* Add service to info column */
if(check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr( pinfo->cinfo, COL_INFO, "%s",
+ col_append_str( pinfo->cinfo, COL_INFO,
val_to_str( ( tvb_get_guint8( tvb, offset ) & 0x7F ),
cip_sc_vals , "Unknown Service (%x)") );
}
*/
if(check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr( pinfo->cinfo, COL_INFO, ": ");
+ col_append_str( pinfo->cinfo, COL_INFO, ": ");
dissect_cip_data( temp_tree, tvb, offset+2+req_path_size+4, msg_req_siz, pinfo );
*/
if(check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr( pinfo->cinfo, COL_INFO, ", ");
+ col_append_str( pinfo->cinfo, COL_INFO, ", ");
dissect_cip_data( temp_tree, tvb, offset+serv_offset+6, serv_length, pinfo );
}
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Cwids: ");
+ col_set_str(pinfo->cinfo, COL_INFO, "Cwids: ");
}
/* FIXME: col_set_fence(pinfo->cinfo, all-cols, only addr-cols?); */
/* Initialize the COL_INFO field; each of the TPDUs will have its
information appended. */
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "");
+ col_set_str(pinfo->cinfo, COL_INFO, "");
while (tvb_offset_exists(tvb, offset)) {
if (!first_tpdu) {
}
if(flags&0x00000001){
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " IMMEDIATE");
+ col_append_str(pinfo->cinfo, COL_INFO, " IMMEDIATE");
}
}
offset+=4;
*/
if (check_col(pinfo->cinfo, COL_INFO)) {
if (is_request) {
- col_add_str(pinfo->cinfo, COL_INFO, "DAAP Request");
+ col_set_str(pinfo->cinfo, COL_INFO, "DAAP Request");
} else {
/* This is done in two functions on purpose. If the tvb_get_xxx()
* functions fail, at least something will be in the info column
*/
- col_add_str(pinfo->cinfo, COL_INFO, "DAAP Response");
+ col_set_str(pinfo->cinfo, COL_INFO, "DAAP Response");
col_append_fstr(pinfo->cinfo, COL_INFO, " [tag: %s, size: %d]",
tvb_format_text(tvb, offset, 4), tvb_get_ntohl(tvb, offset+4));
}
}
case DCERPC_REG_BINARY:
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(
+ col_append_str(
pinfo->cinfo, COL_INFO,
" = <binary data>");
break;
} else {
/* PDU is fragmented and this isn't the first fragment */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
" [DCE/RPC fragment]");
}
if (dcerpc_tree) {
TRUE);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
" [DCE/RPC fragment]");
}
} else if(hdr->flags&PFC_LAST_FRAG){ /* LAST fragment */
/* Reassembly not complete - some fragments
are missing */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
" [DCE/RPC fragment]");
}
}
TRUE);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
" [DCE/RPC fragment]");
}
}
} else {
/* PDU is fragmented and this isn't the first fragment */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]");
}
if (dcerpc_tree) {
if (length > 0) {
} else {
/* Reassembly isn't completed yet */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [DCE/RPC fragment]");
}
}
}
if (u32IntRefs) {
col_append_fstr(pinfo->cinfo, COL_INFO, " Cnt=%u Refs=", u32IntRefs);
} else {
- col_append_fstr(pinfo->cinfo, COL_INFO, " Cnt=0");
+ col_append_str(pinfo->cinfo, COL_INFO, " Cnt=0");
}
}
if (tree)
proto_tree_add_boolean_hidden(dcp_tree, hf_dcp_malformed, tvb, offset, 0, TRUE);
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Packet too short");
+ col_set_str(pinfo->cinfo, COL_INFO, "Packet too short");
THROW(ReportedBoundsError);
}
offset += 2;
if (nsp_msg_type == CONN_ACK_MSG) {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"NSP connect acknowledgement");
/* Done with this msg type */
return;
guint8 remainder_count;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, initialization message");
}
proto_tree_add_item(tree, hf_dec_rt_src_node, tvb,
guint8 remainder_count;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, verification message");
}
proto_tree_add_item(tree, hf_dec_rt_src_node, tvb,
guint remainder_count;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, hello/test message");
}
proto_tree_add_item(tree, hf_dec_rt_src_node, tvb,
rtginfo = tvb_get_letohs(tvb, my_offset + 4);
if (msg == 3) {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, Level 1 routing message");
}
proto_tree_add_none_format(tree, hf_dec_rt_segment, tvb,
count, startid, (rtginfo & 0x7c00) >> 10, rtginfo & 0x3ff);
} else {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, Level 2 routing message");
}
proto_tree_add_none_format(tree, hf_dec_rt_segment, tvb,
/* Ethernet router hello message
Has a 'priority' field in this position */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, Ethernet Router Hello message");
}
priority = tvb_get_guint8(tvb, my_offset);
guint8 seed;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"Routing control, Endnode Hello message");
}
seed = tvb_get_guint8(tvb, my_offset);
break;
case INTERRUPT_MSG: /* "Interrupt message" */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"NSP interrupt message");
}
ack_num = tvb_get_letohs(tvb, my_offset);
break;
case LINK_SERVICE_MSG: /* "Link service message" */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"NSP link control message");
}
ack_num = tvb_get_letohs(tvb, my_offset);
break;
case OTHER_DATA_ACK_MSG: /* "Other data acknowledgement message" */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"NSP other data ACK message");
}
ack_num = tvb_get_letohs(tvb, my_offset);
case CONN_CONFIRM_MSG: /* "Connect confirm" */
case CONN_INITIATE_MSG: /* "Connect initiate" */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"NSP connect confirm/initiate message");
}
services = tvb_get_guint8(tvb, my_offset);
case DISCONN_INITIATE_MSG: /* "Disconnect initiate" */
case DISCONN_CONFIRM_MSG: /* "Disconnect confirm" */
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"NSP disconnect initiate/confirm message");
}
reason = tvb_get_letohs(tvb, my_offset);
static const char* address_rfc_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) {
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
address_avp_t* t = a->type_data;
- proto_item* pi = proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
+ proto_item* pi = proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length(tvb),FALSE);
proto_tree* pt = proto_item_add_subtree(pi,t->ett);
guint32 addr_type = tvb_get_ntohs(tvb,0);
guint32 len = tvb_length_remaining(tvb,2);
}
static const char* time_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) {
- int len = tvb_length_remaining(tvb,0);
+ int len = tvb_length(tvb);
guint8 ntptime[8] = {0,0,0,0,0,0,0,0};
char* label;
proto_item* pi;
static const char* address_v16_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) {
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
address_avp_t* t = a->type_data;
- proto_item* pi = proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
+ proto_item* pi = proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length(tvb),FALSE);
proto_tree* pt = proto_item_add_subtree(pi,t->ett);
- guint32 len = tvb_length_remaining(tvb,0);
+ guint32 len = tvb_length(tvb);
switch (len) {
case 4:
static const char* simple_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) {
char* label = ep_alloc(ITEM_LABEL_LENGTH+1);
- proto_item* pi = proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length_remaining(tvb,0),FALSE);
+ proto_item* pi = proto_tree_add_item(c->tree,a->hf_value,tvb,0,tvb_length(tvb),FALSE);
proto_item_fill_label(pi->finfo, label);
label = strstr(label,": ")+2;
return label;
static const char* grouped_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) {
int offset = 0;
- int len = tvb_length_remaining(tvb,0);
+ int len = tvb_length(tvb);
proto_item* pi = proto_tree_add_item(c->tree, a->hf_value, tvb , 0 , -1, FALSE);
proto_tree* pt = c->tree;
if(parameter>tvb_length_remaining(tvb, offset) || parameter < 1){\
len=tvb_length_remaining(tvb, offset);\
if (check_col(pinfo->cinfo, COL_INFO)) {\
- col_append_fstr(pinfo->cinfo, COL_INFO, "[Short" x " PDU]");\
+ col_append_str(pinfo->cinfo, COL_INFO, "[Short" x " PDU]");\
}\
} \
tvb_ensure_bytes_exist(tvb, offset, len);
DESEGMENT_TCP("DOTI");
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "DOTI source ");
+ col_append_str(pinfo->cinfo, COL_INFO, "DOTI source ");
}
proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, FALSE);
DESEGMENT_TCP("DOTO");
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "DOTO object ");
+ col_append_str(pinfo->cinfo, COL_INFO, "DOTO object ");
}
proto_tree_add_item(tree, hf_distcc_doto_object, tvb, offset, len, FALSE);
if (dmp_align) {
col_append_fstr (pinfo->cinfo, COL_INFO, "%-30.30s", msg_type_to_str ());
} else {
- col_append_fstr (pinfo->cinfo, COL_INFO, "%s", msg_type_to_str ());
+ col_append_str (pinfo->cinfo, COL_INFO, msg_type_to_str ());
}
if ((dmp.msg_type == STANAG) || (dmp.msg_type == IPM) ||
(dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF))
} else if (dmp.msg_type == ACK) {
if (dmp_align) {
/* Append spaces to align subj_id */
- col_append_fstr (pinfo->cinfo, COL_INFO, " ");
+ col_append_str (pinfo->cinfo, COL_INFO, " ");
}
}
if ((dmp.msg_type == REPORT) || (dmp.msg_type == NOTIF) ||
}
}
if (dmp.checksum && (checksum1 != checksum2)) {
- col_append_fstr (pinfo->cinfo, COL_INFO, ", Checksum incorrect");
+ col_append_str (pinfo->cinfo, COL_INFO, ", Checksum incorrect");
}
}
static int
dissect_dnp3_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- gint length = tvb_length_remaining(tvb, 0);
+ gint length = tvb_length(tvb);
/* Check for a dnp packet. It should begin with 0x0564 */
if(length < DNP_HDR_LEN || tvb_get_ntohs(tvb, 0) != 0x0564) {
static int
dissect_dnp3_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- gint length = tvb_length_remaining(tvb, 0);
+ gint length = tvb_length(tvb);
/* Check for a dnp packet. It should begin with 0x0564 */
if(length < DNP_HDR_LEN || tvb_get_ntohs(tvb, 0) != 0x0564) {
/* Not a DNP 3.0 packet, just happened to use the same port */
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(iCommand, drda_opcode_abbr, "Unknown (0x%02x)"));
+ col_append_str(pinfo->cinfo, COL_INFO, val_to_str(iCommand, drda_opcode_abbr, "Unknown (0x%02x)"));
}
if (tree)
if (!first_iteration)
{
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", ");
+ col_append_str(pinfo->cinfo, COL_INFO, ", ");
}
/*
* Update our info string
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", (msg_type_str != NULL)
+ col_append_str(pinfo->cinfo, COL_INFO, (msg_type_str != NULL)
? msg_type_str : "Encrypted Handshake Message");
if (tree)
}
if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
- col_add_str(pinfo->cinfo, COL_PROTOCOL, "ECHO");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECHO");
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_set_str(pinfo->cinfo, COL_INFO,
(request) ? "Request" : "Response");
}
if (protocol_name == NULL) {
/* Not a recognized eDonkey protocol - probably a continuation */
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "eDonkey Continuation");
+ col_set_str(pinfo->cinfo, COL_INFO, "eDonkey Continuation");
if (edonkey_tree) {
bytes = tvb_length_remaining(tvb, offset);
proto_tree_add_text(edonkey_tree, tvb, 0, -1, "Continuation data (%d bytes)", bytes);
/* Call dissector for interface */
next_tvb = tvb_new_subset( tvb, offset+6, item_length, item_length );
- if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_port(subdissector_srrd_table, ifacehndl, next_tvb, pinfo, g_tree) )
+ if( tvb_length(next_tvb) == 0 || !dissector_try_port(subdissector_srrd_table, ifacehndl, next_tvb, pinfo, g_tree) )
{
/* Show the undissected payload */
if( tvb_length_remaining(tvb, offset) > 0 )
/* Call dissector for interface */
next_tvb = tvb_new_subset (tvb, offset+8, item_length-2, item_length-2);
- if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_port(subdissector_sud_table, ifacehndl, next_tvb, pinfo, g_tree) )
+ if( tvb_length(next_tvb) == 0 || !dissector_try_port(subdissector_sud_table, ifacehndl, next_tvb, pinfo, g_tree) )
{
/* Show the undissected payload */
if( tvb_length_remaining(tvb, offset) > 0 )
proto_tree *epl_tree = NULL, *epl_src_item, *epl_dest_item;
gint offset = 0;
- if (tvb_length_remaining(tvb, offset) < 3)
+ if (tvb_length(tvb) < 3)
{
/* Not enough data for an EPL header; don't try to interpret it */
return FALSE;
{
case EPL_SOC:
/* source and destination NodeID are fixed according to the spec */
- col_add_str(pinfo->cinfo, COL_INFO, "SoC ");
+ col_set_str(pinfo->cinfo, COL_INFO, "SoC ");
break;
case EPL_PREQ:
case EPL_SOA:
/* source and destination NodeID are fixed according to the spec */
- col_add_str(pinfo->cinfo, COL_INFO, "SoA ");
+ col_set_str(pinfo->cinfo, COL_INFO, "SoA ");
break;
case EPL_ASND:
if (udpencap)
{
- col_add_str(pinfo->cinfo, COL_INFO, "ASnd ");
+ col_set_str(pinfo->cinfo, COL_INFO, "ASnd ");
}
else
{
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
match_strval(rcid, asnd_cid_vals));
}
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
match_strval(epl_asnd_nmtcommand_cid, asnd_cid_vals));
}
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(profile, epl_device_profiles, "Device Profile %d"));
+ col_append_str(pinfo->cinfo, COL_INFO, val_to_str(profile, epl_device_profiles, "Device Profile %d"));
}
return offset;
proto_item *ti=NULL;
proto_tree *epl_v1_tree=NULL;
- offset = 0;
-
- info_str = ep_alloc(200);
- info_str[0] = 0;
- if(tvb_length_remaining(tvb, offset) < 3){
+ if(tvb_length(tvb) < 3){
/* Not enough data for an EPL_V1 header; don't try to interpret it */
return FALSE;
}
+ offset = 0;
+ info_str = ep_alloc(200);
+ info_str[0] = 0;
+
/* make entries in Protocol column and Info column on summary display */
if(check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL_V1");
if (check_col(pinfo->cinfo, COL_INFO)) {
description = match_strval(etype, etype_vals);
if (description) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
description);
}
}
proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
}
if (check_col (pinfo->cinfo, COL_INFO)) {
- col_add_str (pinfo->cinfo, COL_INFO, "CBIND ");
+ col_set_str (pinfo->cinfo, COL_INFO, "CBIND ");
}
proto_tree_add_item (cbind_tree, hf_fcels_cbind_liveness, tvb, offset+4, 2, FALSE);
proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
}
if (check_col (pinfo->cinfo, COL_INFO)) {
- col_add_str (pinfo->cinfo, COL_INFO, "UNBIND ");
+ col_set_str (pinfo->cinfo, COL_INFO, "UNBIND ");
}
proto_tree_add_item (cbind_tree, hf_fcels_cbind_userinfo, tvb, offset+4, 4, FALSE);
gint offset = 0,
start = 0,
frame_len = 0;
- gint bytes_remaining = tvb_length_remaining (tvb, offset);
+ gint bytes_remaining = tvb_length (tvb);
guint8 pflags, sof = 0, eof = 0;
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti;
guint version;
char *ver;
guint16 len_sof;
- gint bytes_remaining = tvb_length_remaining(tvb, 0);
+ gint bytes_remaining = tvb_length(tvb);
guint8 sof = 0;
guint8 eof = 0;
const char *eof_str;
if (check_col(pinfo->cinfo, COL_INFO)) {
if (msg_count > 1)
g_string_sprintfa(summary_label, " (%d)", msg_count);
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", summary_label->str);
+ col_add_str(pinfo->cinfo, COL_INFO, summary_label->str);
g_string_free(summary_label, TRUE);
}
/*define END_OF_GIOP_MESSAGE (offset - first_offset - GIOP_HEADER_SIZE) */
- tot_len = tvb_length_remaining(tvb, 0);
+ tot_len = tvb_length(tvb);
if (tot_len < GIOP_HEADER_SIZE) /* tot_len < 12 */
{
unsigned int position = 3;
unsigned int offset=0;
- if (tvb_length_remaining(tvb, 0) < 2)
+ if (tvb_length(tvb) < 2)
{
/* Not enough data captured to hold the "S5" header; don't try
to interpret it as H1. */
if (check_col (pinfo->cinfo, COL_PROTOCOL))
col_set_str (pinfo->cinfo, COL_PROTOCOL, "H1");
if (check_col (pinfo->cinfo, COL_INFO))
- col_add_str (pinfo->cinfo, COL_INFO, "S5: ");
+ col_set_str (pinfo->cinfo, COL_INFO, "S5: ");
if (tree)
{
ti = proto_tree_add_item (tree, proto_h1, tvb, offset, 16, FALSE);
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
dissect_ber_octet_string(implicit_p ? *((gboolean*)implicit_p) : FALSE, &asn1_ctx, tree, tvb, 0, hfid, &new_tvb);
if (new_tvb) {
- dissect_nsap(new_tvb, 0,tvb_length_remaining(new_tvb, 0), tree);
+ dissect_nsap(new_tvb, 0,tvb_length(new_tvb), tree);
if ( h248_info->term && ! h248_info->term->nsap) {
h248_info->term->nsap = se_strdup(tvb_bytes_to_str(new_tvb,0,tvb_length(new_tvb)));
}
opcode = tvb_get_guint8(tvb, 1);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(opcode, hsrp_opcode_vals, "Unknown"));
}
if (opcode < 3) {
}
if( rtp_marker && check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, ", Mark" );
+ col_append_str (pinfo->cinfo, COL_INFO, ", Mark" );
dissect_payload(tvb, offset, pinfo, iax2_tree, main_tree, ts, TRUE, iax_packet);
if( offset >= tvb_reported_length (tvb)) {
if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, ", empty frame" );
+ col_append_str (pinfo->cinfo, COL_INFO, ", empty frame" );
return;
}
iax_dataformats, "unknown (0x%02x)"));
#if 0
if( out_of_order )
- col_append_fstr (pinfo->cinfo, COL_INFO, " (out-of-order packet)");
+ col_append_str (pinfo->cinfo, COL_INFO, " (out-of-order packet)");
#endif
} else {
col_append_fstr (pinfo->cinfo, COL_INFO, ", %s",
proto_tree_add_text(icep_tree, tvb, offset, -1,
"empty batch requests sequence");
if ( check_col(mypinfo->cinfo, COL_INFO) ) {
- col_append_fstr(mypinfo->cinfo, COL_INFO,
+ col_append_str(mypinfo->cinfo, COL_INFO,
" (empty batch requests sequence)");
}
if ( check_col(mypinfo->cinfo, COL_INFO) ) {
- col_append_fstr(mypinfo->cinfo, COL_INFO,
+ col_append_str(mypinfo->cinfo, COL_INFO,
":");
}
}
if ( check_col(mypinfo->cinfo, COL_INFO) && (i != 0) ) {
- col_append_fstr(mypinfo->cinfo, COL_INFO,
+ col_append_str(mypinfo->cinfo, COL_INFO,
",");
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICEP");
if ( check_col(pinfo->cinfo, COL_INFO) ) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(tvb_get_guint8(tvb, 8),
icep_msgtype_vals,
"Unknown Message Type: 0x%02x"));
if (colcodename) {
col_add_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", coltypename, colcodename);
} else {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", coltypename);
+ col_add_str(pinfo->cinfo, COL_INFO, coltypename);
}
}
dissect_vendor_ie_wpawme(proto_tree * ietree, proto_tree * tree, tvbuff_t * tag_tvb)
{
gint tag_off = 0;
- gint tag_len = tvb_length_remaining(tag_tvb, 0);
+ gint tag_len = tvb_length(tag_tvb);
gchar out_buff[SHORT_STR];
guint i, byte1, byte2;
dissect_vendor_ie_rsn(proto_tree * ietree, proto_tree * tree, tvbuff_t * tag_tvb)
{
guint tag_off = 0;
- guint tag_len = tvb_length_remaining(tag_tvb, 0);
+ guint tag_len = tvb_length(tag_tvb);
guint pmkid_len = tag_len - 4;
char out_buff[SHORT_STR], valid_str[SHORT_STR] = "";
dissect_rsn_ie(proto_tree * tree, tvbuff_t * tag_tvb)
{
guint tag_off = 0;
- guint tag_len = tvb_length_remaining(tag_tvb, 0);
+ guint tag_len = tvb_length(tag_tvb);
guint16 rsn_capab;
char out_buff[SHORT_STR];
int i, count;
static void
dissect_vendor_ie_ht(proto_tree * ietree, proto_tree * tree, tvbuff_t * tag_tvb)
{
- gint tag_len = tvb_length_remaining(tag_tvb, 0);
+ gint tag_len = tvb_length(tag_tvb);
gchar out_buff[SHORT_STR];
g_snprintf(out_buff, SHORT_STR, "802.11n (Pre) OUI");
col_append_fstr(pinfo->cinfo, COL_INFO, ", SSID=\"%s\"",
format_text(ssid, tag_len));
} else {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", SSID=Broadcast");
+ col_append_str(pinfo->cinfo, COL_INFO, ", SSID=Broadcast");
}
}
if (tag_len > 0) {
col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "%s (%s)",
get_ether_name(addr), type);
if (check_col(pinfo->cinfo, COL_UNRES_DL_SRC))
- col_add_fstr(pinfo->cinfo, COL_UNRES_DL_SRC, "%s",
- ether_to_str(addr));
+ col_add_str(pinfo->cinfo, COL_UNRES_DL_SRC, ether_to_str(addr));
}
static void
col_add_fstr(pinfo->cinfo, COL_RES_DL_DST, "%s (%s)",
get_ether_name(addr), type);
if (check_col(pinfo->cinfo, COL_UNRES_DL_DST))
- col_add_fstr(pinfo->cinfo, COL_UNRES_DL_DST, "%s",
- ether_to_str(addr));
+ col_add_str(pinfo->cinfo, COL_UNRES_DL_DST, ether_to_str(addr));
}
static guint32
type = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(type, igap_types, "Unknown Type: 0x%02x"));
}
proto_tree_add_uint(tree, hf_type, tvb, offset, 1, type);
if (check_col(pinfo->cinfo, COL_INFO)) {
switch (ver_and_opcode) {
case 0x11:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Response" );
+ col_set_str(pinfo->cinfo, COL_INFO, "Response" );
break;
case 0x12:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Request" );
+ col_set_str(pinfo->cinfo, COL_INFO, "Request" );
break;
default:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown version or opcode");
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown version or opcode");
}
}
tree = proto_item_add_subtree(item, ett_imf);
}
- max_length = tvb_length_remaining(tvb, 0);
+ max_length = tvb_length(tvb);
/* first go through the tvb until we find a blank line and extract the content type if
we find one */
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, type_str);
+ col_set_str(pinfo->cinfo, COL_INFO, type_str);
if (code_str[0] != '\0')
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", code_str);
}
tvb, offset, 1, TRUE);
offset++;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(payloadtype, ipmi_payload_vals, "Unknown (0x%02x)"));
}
if (!is_cksum_correct) {
expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " [Shim6 CHECKSUM INCORRECT]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [Shim6 CHECKSUM INCORRECT]");
}
}
}
if (shim6) {
if (stype & SHIM6_BITMASK_P) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "Shim6 (Payload)");
+ col_append_str(pinfo->cinfo, COL_INFO, "Shim6 (Payload)");
}
else {
col_append_fstr(pinfo->cinfo, COL_INFO, "Shim6 (%s)",
*/
if( (tvb_length(tvb)==1) && (tvb_get_guint8(tvb, offset)==0xff) ){
if (check_col(pinfo->cinfo, COL_INFO)){
- col_add_str(pinfo->cinfo, COL_INFO, "NAT Keepalive");
+ col_set_str(pinfo->cinfo, COL_INFO, "NAT Keepalive");
}
proto_tree_add_item(isakmp_tree, hf_isakmp_nat_keepalive, tvb, offset, 1, FALSE);
return;
/* Set up structures needed to add the protocol subtree and manage it */
guint iSCSIPdusDissected = 0;
guint offset = 0;
- guint32 available_bytes = tvb_length_remaining(tvb, offset);
+ guint32 available_bytes = tvb_length(tvb);
int digestsActive = 1;
conversation_t *conversation = NULL;
iscsi_session_t *iscsi_session=NULL;
case DATA_MISSING :
isis_dissect_unknown(tvb, tree, offset,
"[packet length %d went beyond packet]",
- tvb_length_remaining(tvb, 0));
+ tvb_length(tvb));
break;
case CKSUM_NOT_OK :
proto_tree_add_text ( tree, tvb, offset, length,
if (!is_cksum_correct) {
expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " [ISIS CHECKSUM INCORRECT]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [ISIS CHECKSUM INCORRECT]");
}
}
case DATA_MISSING :
isis_dissect_unknown(tvb, tree, offset,
"[packet length %d went beyond packet]",
- tvb_length_remaining(tvb, 0));
+ tvb_length(tvb));
break;
case CKSUM_NOT_OK :
proto_tree_add_text ( tree, tvb, offset, length,
guint offset = 0;
guint16 function_id;
guint16 isns_protocol_version;
- guint32 packet_len = tvb_length_remaining(tvb, offset);
+ guint32 packet_len = tvb_length(tvb);
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti = NULL;
proto_tree *isns_tree = NULL;
static int
dissect_isns_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- gint length = tvb_length_remaining(tvb, 0);
+ gint length = tvb_length(tvb);
guint16 isns_protocol_version;
guint16 function_id;
static int
dissect_isns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- gint length = tvb_length_remaining(tvb, 0);
+ gint length = tvb_length(tvb);
guint16 isns_protocol_version;
guint16 function_id;
static gboolean dissect_iuup_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
- int len = tvb_length_remaining(tvb,0);
+ int len = tvb_length(tvb);
guint8 first_octet = tvb_get_guint8(tvb,0);
guint8 second_octet = tvb_get_guint8(tvb,1);
static void find_iuup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
- int len = tvb_length_remaining(tvb,0);
+ int len = tvb_length(tvb);
int offset = 0;
while (len > 3) {
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "Welcome");
+ col_set_str(pinfo->cinfo, COL_INFO, "Welcome");
}
{
/* It shows kink type by the type value. */
if(check_col(pinfo->cinfo, COL_INFO)){
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(type, kink_type_vals, "unknown"));
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, kink_type_vals, "unknown"));
}
/* Make the kink tree */
if(tree){
if( rem < 8 ) {/*chk for minimum header = type + length + msg_id*/
if( check_col(pinfo->cinfo, COL_INFO) )
- col_append_fstr(pinfo->cinfo, COL_INFO, "Bad Message");
+ col_append_str(pinfo->cinfo, COL_INFO, "Bad Message");
if(tree)
proto_tree_add_text(tree, tvb, offset, rem,
"Error processing Message: length is %d, should be >= 8",
if( (length = tvb_get_ntohs(tvb, offset + 2)) < (4+extra) ) {/*not enough data for type*/
if( check_col(pinfo->cinfo, COL_INFO) )
- col_append_fstr(pinfo->cinfo, COL_INFO, "Bad Message Length ");
+ col_append_str(pinfo->cinfo, COL_INFO, "Bad Message Length ");
if(tree)
proto_tree_add_text(tree, tvb, offset, rem,
"Error processing Message Length: length is %d, should be >= %u",
} else
xid_tree = NULL;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
"Basic Format");
}
} while (more_function);
if (set_info && check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "No valid function found");
+ col_set_str(pinfo->cinfo, COL_INFO, "No valid function found");
}
if (tvb_length_remaining(tvb, offset) > 0)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"CNTL ");
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
+ col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3");
}
if (tree) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"LWAPP IP or Layer 2");
}
}
if (tree) {
- if ( (bytes = tvb_length_remaining(tvb, 0)) > 0 )
+ if ( (bytes = tvb_length(tvb)) > 0 )
{
ti = proto_tree_add_item(tree, proto_media, tvb, 0, -1, FALSE);
media_tree = proto_item_add_subtree(ti, ett_media);
}
if (check_col(pinfo->cinfo,COL_INFO)) {
- col_add_fstr(pinfo->cinfo,COL_INFO,"MPLS Label Switched Packet");
+ col_set_str(pinfo->cinfo,COL_INFO,"MPLS Label Switched Packet");
}
/* Start Decoding Here. */
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(iCommand, mqpcf_opcode_vals, "Unknown (0x%02x)"));
+ col_append_str(pinfo->cinfo, COL_INFO, val_to_str(iCommand, mqpcf_opcode_vals, "Unknown (0x%02x)"));
}
if (tree)
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, mq_opcode_vals, "Unknown (0x%02x)"));
+ col_append_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, mq_opcode_vals, "Unknown (0x%02x)"));
}
if (tree)
type = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "%s",val_to_str(type, mrdisc_types,
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(type, mrdisc_types,
"Unknown Type:0x%02x"));
}
/* Work out what type of packet this is and dissect it as such */
/* Just don't dissect if can't even read command signature */
- if (tvb_length_remaining(tvb, 0) < 8)
+ if (tvb_length(tvb) < 8)
{
return 0;
}
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_add_str(pinfo->cinfo, COL_INFO, "Request to resend packet(s):");
+ col_set_str(pinfo->cinfo, COL_INFO, "Request to resend packet(s):");
}
/* Show list of packets to resend */
/*
* Put the first line from the buffer into the summary.
*/
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
format_text(line, linelen));
}
type = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "%s",val_to_str(type, msnip_types,
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(type, msnip_types,
"Unknown Type:0x%02x"));
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
- col_append_fstr(pinfo->cinfo, COL_INFO, "MS NLB heartbeat");
+ col_append_str(pinfo->cinfo, COL_INFO, "MS NLB heartbeat");
}
if (tree) {
{
guint8 message_length;
- message_length = tvb_length_remaining(tvb, 0);
+ message_length = tvb_length(tvb);
proto_tree_add_text(tree, tvb, 0, message_length,
"Unknown message (%u byte%s)", message_length,
plurality(message_length, "", "s"));
default:
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ");
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown ");
dissect_mtp3mg_unknown_message(tvb, mtp3mg_tree);
} /* switch */
default:
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ");
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown ");
dissect_mtp3mg_unknown_message(tvb, mtp3mg_tree);
} /* switch */
char *data;
size_t len;
- data = g_strdup(tvb_get_ephemeral_string(b64_tvb, 0, tvb_length_remaining(b64_tvb, 0)));
+ data = g_strdup(tvb_get_ephemeral_string(b64_tvb, 0, tvb_length(b64_tvb)));
len = epan_base64_decode(data);
tvb = tvb_new_real_data((const guint8 *)data, len, len);
if (is_response) {
if (packet_number == 0) {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "Server Greeting" );
+ col_set_str(pinfo->cinfo, COL_INFO, "Server Greeting" );
}
offset= mysql_dissect_greeting(tvb, pinfo, offset,
mysql_tree, conn_data);
} else {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "Response" );
+ col_set_str(pinfo->cinfo, COL_INFO, "Response" );
}
offset= mysql_dissect_response(tvb, pinfo, offset,
mysql_tree, conn_data);
} else {
if (packet_number == 1) {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "Login Request");
+ col_set_str(pinfo->cinfo, COL_INFO, "Login Request");
}
offset= mysql_dissect_login(tvb, pinfo, offset,
mysql_tree, conn_data);
} else {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, "Request");
+ col_set_str(pinfo->cinfo, COL_INFO, "Request");
}
offset= mysql_dissect_request(tvb, pinfo, offset,
mysql_tree, conn_data);
col_add_fstr(pinfo->cinfo, COL_INFO, "Read Request Offset:0x%" G_GINT64_MODIFIER "x Length:%d", from, nbd_trans->datalen);
break;
case NBD_CMD_DISC:
- col_add_str(pinfo->cinfo, COL_INFO, "Disconnect Request");
+ col_set_str(pinfo->cinfo, COL_INFO, "Disconnect Request");
break;
}
}
case NBIPX_SESSION_END:
case NBIPX_SESSION_END_ACK:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(packet_type, nbipx_data_stream_type_vals, "Unknown"));
}
dissect_conn_control(tvb, offset, nbipx_tree);
case NBIPX_DIRECTED_DATAGRAM:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(packet_type, nbipx_data_stream_type_vals, "Unknown"));
}
dissect_conn_control(tvb, offset, nbipx_tree);
default:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(packet_type, nbipx_data_stream_type_vals, "Unknown"));
}
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(msg_type, message_types, "Unknown (%02x)"));
}
* It looks like a continuation.
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "NBSS Continuation Message");
+ col_set_str(pinfo->cinfo, COL_INFO, "NBSS Continuation Message");
if (tree) {
ti = proto_tree_add_item(tree, proto_nbss, tvb, 0, -1, FALSE);
else
{
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "C SecretStore - fragment");
+ col_set_str(pinfo->cinfo, COL_INFO, "C SecretStore - fragment");
proto_tree_add_text(ncp_tree, tvb, foffset, 4, "Fragment");
}
/* Fragments don't really carry a subverb so store 0xff as the subverb number */
tap_queue_packet(ncp_tap.hdr, pinfo, ncp_hdr);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(header.type, ncp_type_vals, "Unknown type (0x%04x)"));
}
{
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDS");
- col_add_fstr(pinfo->cinfo, COL_INFO, "C Ping for NDS");
+ col_set_str(pinfo->cinfo, COL_INFO, "C Ping for NDS");
}
}
if (ndps_packet_type != 0 && ndps_packet_type != 1) { /* Packet Type */
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "(Continuation Data)");
- proto_tree_add_text(ndps_tree, tvb, 0, tvb_length_remaining(tvb, 0), "Data - (%d Bytes)", tvb_length_remaining(tvb, 0));
+ proto_tree_add_text(ndps_tree, tvb, 0, tvb_length(tvb), "Data - (%d Bytes)", tvb_length(tvb));
return;
}
foffset = 0;
{
if (!spx_info->eom)
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "[NDPS Fragment]");
+ col_append_str(pinfo->cinfo, COL_INFO, "[NDPS Fragment]");
}
}
}
{
if (!spx_info->eom)
{
- col_append_fstr(pinfo->cinfo, COL_INFO, "[NDPS Fragment]");
+ col_append_str(pinfo->cinfo, COL_INFO, "[NDPS Fragment]");
}
}
next_tvb = NULL;
ndps_problem_type = tvb_get_ntohl(tvb, foffset);
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
expert_item = proto_tree_add_uint(ndps_tree, hf_ndps_problem_type, tvb, foffset, 4, ndps_problem_type);
expert_add_info_format(pinfo, expert_item, PI_RESPONSE_CODE, PI_ERROR, "Fault: %s", val_to_str(ndps_problem_type, error_type_enum, "Unknown NDPS Error (0x%08x)"));
foffset += 4;
}
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
if (tvb_get_ntohl(tvb, foffset-4) == 0)
{
return foffset;
proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE);
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
if (tvb_get_ntohl(tvb, foffset-4) != 0)
{
break;
proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE);
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
if (tvb_get_ntohl(tvb, foffset-4) != 0)
{
break;
proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE);
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
if (tvb_get_ntohl(tvb, foffset-4) != 0)
{
break;
proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE);
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
if (tvb_get_ntohl(tvb, foffset-4) != 0)
{
break;
proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE);
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
break;
case 0x00000002: /* Delivery Unbind */
/* NoOp */
proto_tree_add_item(ndps_tree, hf_ndps_return_code, tvb, foffset, 4, FALSE);
foffset += 4;
if (check_col(pinfo->cinfo, COL_INFO) && tvb_get_ntohl(tvb, foffset-4) != 0)
- col_add_fstr(pinfo->cinfo, COL_INFO, "R NDPS - Error");
+ col_set_str(pinfo->cinfo, COL_INFO, "R NDPS - Error");
if (tvb_get_ntohl(tvb, foffset-4) != 0)
{
break;
break;
default:
- col_add_fstr( pinfo->cinfo, COL_INFO, "%s",
+ col_add_str( pinfo->cinfo, COL_INFO,
command_name);
break;
}
hdr.ar_op_type = tvb_get_guint8(tvb, 17);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(hdr.ar_op_type, nhrp_op_type_vals,
"0x%02X - unknown"));
}
guint32 verifier_length;
guint32 encrypted_block_length;
- verifier_length = tvb_length_remaining (tvb, offset);
+ verifier_length = tvb_length (tvb);
encrypted_block_length = verifier_length - 4;
if (encrypted_block_length < 12) {
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_add_fstr(pinfo->cinfo, COL_INFO, "Status message");
+ col_set_str(pinfo->cinfo, COL_INFO, "Status message");
}
proto_item_append_text(ti, ", Status message");
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_add_fstr(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor)), omapi_opcode_vals, "Unknown opcode (0x%04x)"));
}
proto_item_append_text(ti, ", Opcode: %s",
p_mul_tree = proto_item_add_subtree (ti, ett_p_mul);
if (check_col (pinfo->cinfo, COL_INFO))
- col_append_fstr (pinfo->cinfo, COL_INFO, "%s", get_type (pdu_type));
+ col_append_str (pinfo->cinfo, COL_INFO, get_type (pdu_type));
/* Length of PDU */
pdu_length = tvb_get_ntohs (tvb, offset);
&p_mul_frag_items, NULL, tree);
if (check_col (pinfo->cinfo, COL_INFO) && frag_msg)
- col_append_fstr (pinfo->cinfo, COL_INFO, " (Message Reassembled)");
+ col_append_str (pinfo->cinfo, COL_INFO, " (Message Reassembled)");
if (new_tvb) {
dissect_reassembled_data (new_tvb, pinfo, tree);
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGSQL");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
(pinfo->match_port == pinfo->destport) ?
">" : "<");
proto_item_append_text(tree, " Port:%d", port);
} else {
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " PROGRAM_NOT_AVAILABLE");
+ col_append_str(pinfo->cinfo, COL_INFO, " PROGRAM_NOT_AVAILABLE");
}
proto_item_append_text(tree, " PROGRAM_NOT_AVAILABLE");
}
col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Full Header");
+ col_set_str(pinfo->cinfo, COL_INFO, "Full Header");
/* only dissect IPv4 and UDP */
ip_version = tvb_get_guint8(tvb, 0) >> 4;
col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Compressed UDP 16");
+ col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 16");
length = tvb_reported_length(tvb);
col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Compressed UDP 8");
+ col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 8");
length = tvb_reported_length(tvb);
col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Context State");
+ col_set_str(pinfo->cinfo, COL_INFO, "Context State");
if (tree) {
* packet and continued in a later packet.
*/
if (check_col(pinfo->cinfo, COL_INFO)){
- col_add_str(pinfo->cinfo, COL_INFO,"PPP Fragment");
+ col_set_str(pinfo->cinfo, COL_INFO,"PPP Fragment");
}
if (tree)
proto_tree_add_text(bs_tree, tvb, offset, -1, "PPP Fragment");
* mark it as a PPP fragment.
*/
if(check_col(pinfo->cinfo, COL_INFO)){
- col_add_str(pinfo->cinfo, COL_INFO,"PPP Fragment");
+ col_set_str(pinfo->cinfo, COL_INFO,"PPP Fragment");
}
length = offset;
if (tree)
*/
if (first) {
if(check_col(pinfo->cinfo, COL_INFO)){
- col_add_str(pinfo->cinfo, COL_INFO,"PPP Fragment");
+ col_set_str(pinfo->cinfo, COL_INFO,"PPP Fragment");
}
}
if (tree)
if (check_col(pinfo->cinfo,COL_INFO))
{
- col_add_fstr(pinfo->cinfo,COL_INFO, val_to_str(pppoe_code, code_vals, "Unknown"));
+ col_add_str(pinfo->cinfo,COL_INFO, val_to_str(pppoe_code, code_vals, "Unknown"));
}
/* Read length of payload */
if (check_col(pinfo->cinfo,COL_INFO))
{
- col_add_fstr(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(pppoe_code, code_vals, "Unknown"));
}
cntrl_type = tvb_get_ntohs(tvb, offset + 8);
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", cntrltype2str(cntrl_type));
+ col_add_str(pinfo->cinfo, COL_INFO, cntrltype2str(cntrl_type));
if (tree) {
guint32 cookie;
}
default:{
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Unknown Message");
+ col_set_str(pinfo->cinfo, COL_INFO, "Unknown Message");
break;
}
}
guint64 size;
/* verify that this is indeed PVFS and that it looks sane */
- if(tvb_length_remaining(tvb,0)<24){
+ if(tvb_length(tvb)<24){
/* too few bytes remaining to verify the header */
return 0;
}
col_set_str(pinfo->cinfo, COL_INFO,
val_to_str(server_op, names_pvfs_server_op, "%u (unknown)"));
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
(mode == TCP_MODE_UNEXP)? " (request)": " (response)");
}
type = tvb_get_guint8(tvb, offset);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(type, rgmp_types, "Unknown Type: 0x%02x"));
}
proto_tree_add_uint(tree, hf_type, tvb, offset, 1, type);
break;
case RMI_OUTPUTMESSAGE:
message = tvb_get_guint8(tvb,0);
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"JRMI, ");
col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(message, rmi_output_message_str,
break;
case RMI_INPUTSTREAM:
message = tvb_get_guint8(tvb,0);
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"JRMI, ");
col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(message, rmi_input_message_str,
if (hi_nibble(byte1) != 1) return FALSE;
if (lo_nibble(byte1) < 1 || lo_nibble(byte1) > 6) return FALSE;
if (tvb_get_guint8(tvb, 1) > 20) return FALSE;
- if (tvb_length_remaining(tvb, 0) < 12)
+ if (tvb_length(tvb) < 12)
return FALSE;
dissect_norm(tvb, pinfo, tree);
return TRUE; /* appears to be a NORM packet */
if (first_pdu)
col_clear(pinfo->cinfo, COL_INFO);
else
- col_append_fstr(pinfo->cinfo, COL_INFO, " ; ");
+ col_append_str(pinfo->cinfo, COL_INFO, " ; ");
col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s %s",
vers,
procname,
if (first_pdu)
col_clear(pinfo->cinfo, COL_INFO);
else
- col_append_fstr(pinfo->cinfo, COL_INFO, " ; ");
+ col_append_str(pinfo->cinfo, COL_INFO, " ; ");
col_append_fstr(pinfo->cinfo, COL_INFO,"V%u %s %s",
vers,
procname,
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(message_type, message_type_vals, "Unknown (%u). "));
if (message_type == RSVP_MSG_BUNDLE) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
rsvp_bundle_dissect ?
"Component Messages Dissected" :
"Component Messages Not Dissected");
proto_tree_add_item(rsync_tree, hf_rsync_motd_string, tvb, offset, -1, TRUE);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "Server MOTD");
+ col_append_str(pinfo->cinfo, COL_INFO, "Server MOTD");
}
conversation_data->state = RSYNC_SERV_RESPONSE;
proto_tree_add_item(rsync_tree, hf_rsync_response_string, tvb, offset, -1, TRUE);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "Module list");
+ col_append_str(pinfo->cinfo, COL_INFO, "Module list");
}
/* we need to check the end of the buffer for magic string */
g_snprintf(buff+buff_len, 200-buff_len, "vendor specific(%d) ",count_msg_type[10]);
}
- col_add_fstr(pinfo->cinfo, COL_INFO, buff);
+ col_add_str(pinfo->cinfo, COL_INFO, buff);
}
line = tvb_get_ptr(tvb, offset, first_linelen);
if (is_request_or_reply)
if ( rtsp_type == RTSP_REPLY ) {
- col_add_str(pinfo->cinfo, COL_INFO, "Reply: ");
+ col_set_str(pinfo->cinfo, COL_INFO, "Reply: ");
col_append_str(pinfo->cinfo, COL_INFO,
format_text(line, first_linelen));
}
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(svcaction, scsi_osd_svcaction_vals, "Unknown OSD Serviceaction"));
}
dissector=find_svcaction_dissector(svcaction);
svcaction=extra_data->svcaction;
}
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(svcaction, scsi_osd_svcaction_vals, "Unknown OSD Serviceaction"));
}
if(svcaction){
* Message format 1
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Msg format 1");
+ col_set_str(pinfo->cinfo, COL_INFO, "Msg format 1");
if ( tbit == 1 ) {
/*
* Message format 2
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Msg format 2");
+ col_set_str(pinfo->cinfo, COL_INFO, "Msg format 2");
if ( tbit == 1 ) {
/*
* Returned feedback item exists
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", opcode_str);
+ col_add_str(pinfo->cinfo, COL_INFO, opcode_str);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
if (to_server) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Response");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Response");
} else {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Request");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Request");
}
}
break;
COUNT_BYTES(dn_len);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", User: ");
+ col_append_str(pinfo->cinfo, COL_INFO, ", User: ");
if (!dn[0] && !an[0])
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
"anonymous");
else
col_append_fstr(pinfo->cinfo, COL_INFO,
} else {
/* secondary request */
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " (secondary request)");
+ col_append_str(pinfo->cinfo, COL_INFO, " (secondary request)");
}
}
offset += 2;
proto_tree_add_text(tree, tvb, offset, 0,
"Function: <unknown function - could not find matching request>");
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, ", <unknown>");
+ col_append_str(pinfo->cinfo, COL_INFO, ", <unknown>");
}
}
break;
}
if (count && check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
", Files:");
}
break;
}
if (count && check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
", Files:");
}
proto_tree_add_text(tree, tvb, 0, 0,
"Subcommand: <UNKNOWN> since request packet wasn't seen");
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "<unknown>");
+ col_append_str(pinfo->cinfo, COL_INFO, "<unknown>");
}
} else {
si->info_level = t2i->info_level;
proto_tree_add_text(tree, tvb, 0, 0,
"Subcommand: <UNKNOWN> since transaction code wasn't found in request packet");
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "<unknown>");
+ col_append_str(pinfo->cinfo, COL_INFO, "<unknown>");
}
} else {
proto_tree_add_uint(tree, hf_smb_trans2_subcmd, tvb, 0, 0, t2i->subcmd);
"Invalid offset/length. Malformed packet");
if (check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed packet]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]");
}
return NULL;
"Invalid offset/length. Malformed packet");
if (check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed packet]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [Malformed packet]");
}
return;
item = proto_tree_get_parent(tree);
}
- if (tvb_length_remaining(tvb, offset) == 0) {
+ if (tvb_length(tvb) == 0) {
if (item) {
proto_item_append_text(item, ": NO DATA");
}
frag_msg = fragment_add_seq_next (tvb, 0, pinfo, frame_data->conversation_id,
smtp_data_segment_table, smtp_data_reassembled_table,
- tvb_length_remaining(tvb,0), frame_data->more_frags);
+ tvb_length(tvb), frame_data->more_frags);
} else {
/*
}
if (bits & 0x40) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"HPR Idle Message");
} else {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"HPR Status Message");
}
}
nhdr_1 = tvb_get_guint8(tvb, index+1);
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "HPR NLP Packet");
+ col_set_str(pinfo->cinfo, COL_INFO, "HPR NLP Packet");
if (tree) {
/* Don't bother setting length. We'll set it later after we
index += (thdr_len << 2);
if (((thdr_8 & 0x20) == 0) && thdr_dlf) {
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "HPR Fragment");
+ col_set_str(pinfo->cinfo, COL_INFO, "HPR Fragment");
if (tvb_offset_exists(tvb, index)) {
call_dissector(data_handle,
tvb_new_subset(tvb, index, -1, -1), pinfo,
if (tvb_get_ntohs(tvb, index+2) == 0x12ce) {
/* Route Setup */
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
"HPR Route Setup");
dissect_gds(tvb_new_subset(tvb, index, -1, -1),
pinfo, tree, parent_tree);
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",m_pCurQuery );
+ col_add_str(pinfo->cinfo, COL_INFO, m_pCurQuery );
return TRUE;
}
return FALSE;
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",m_pCurQuery );
+ col_add_str(pinfo->cinfo, COL_INFO, m_pCurQuery );
proto_tree_add_text(tree, tvb, offset+amount-sqlamount, sqlamount,
"SQL statement = %s",m_pCurQuery);
return TRUE;
if (ParseCommand(sqloracle_tree,tvb, offset + 0x14, pinfo,dataLen - 0x14) == TRUE)
{
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",m_pCurQuery );
+ col_add_str(pinfo->cinfo, COL_INFO, m_pCurQuery );
break;
}
else
msg_code);
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(msg_code, ssh1_msg_vals, "Unknown (%u)"));
}
offset += 1;
}
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(msg_code, ssh2_msg_vals, "Unknown (%u)"));
}
offset += 1;
if (!first_iteration)
{
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", ");
+ col_append_str(pinfo->cinfo, COL_INFO, ", ");
}
/*
* Update our info string
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", (msg_type_str != NULL)
+ col_append_str(pinfo->cinfo, COL_INFO, (msg_type_str != NULL)
? msg_type_str : "Encrypted Handshake Message");
if (tree)
iCommand = tvb_get_letohl(tvb, offset + 62);
}
if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(iCommand, starteam_opcode_vals, "Unknown (0x%02x)"));
+ col_append_str(pinfo->cinfo, COL_INFO, val_to_str(iCommand, starteam_opcode_vals, "Unknown (0x%02x)"));
}
}
return;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_add_str(pinfo->cinfo, COL_PROTOCOL, "Symantec");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "Symantec");
if (etypev3 == 0) { /* SEF and SGS v2 processing */
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Symantec Enterprise Firewall");
+ col_set_str(pinfo->cinfo, COL_INFO, "Symantec Enterprise Firewall");
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_symantec, tvb,
0, 44, "Symantec firewall");
if (etypev2 == 0) { /* SGS v3 processing */
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Symantec SGS v3");
+ col_set_str(pinfo->cinfo, COL_INFO, "Symantec SGS v3");
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_symantec, tvb,
0, 56, "Symantec SGSv3");
expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_WARN, "TCP Checksum 0xffff instead of 0x0000 (see RFC 1624)");
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM 0xFFFF]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM 0xFFFF]");
/* Checksum is treated as valid on most systems, so we're willing to desegment it. */
desegment_ok = TRUE;
expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM INCORRECT]");
+ col_append_str(pinfo->cinfo, COL_INFO, " [TCP CHECKSUM INCORRECT]");
/* Checksum is invalid, so we're not willing to desegment it. */
desegment_ok = FALSE;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELNET");
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Telnet Data ...");
+ col_set_str(pinfo->cinfo, COL_INFO, "Telnet Data ...");
if (tree) {
gint offset = 0;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(opcode, tftp_opcode_vals, "Unknown (0x%04x)"));
}
{
if ( is_sns )
{
- col_append_fstr(pinfo->cinfo, COL_INFO, ", SNS");
+ col_append_str(pinfo->cinfo, COL_INFO, ", SNS");
}
else
{
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Data");
+ col_append_str(pinfo->cinfo, COL_INFO, ", Data");
}
}
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
(pinfo->match_port == pinfo->destport) ? "Request" : "Response");
}
if (check_col(pinfo->cinfo, COL_INFO))
{
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(opcode, tuxedo_opcode_vals, "Unknown (0x%02x)"));
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, tuxedo_opcode_vals, "Unknown (0x%02x)"));
}
if (tree)
type = pinfo->pseudo_header->linux_usb.transfer_type;
proto_tree_add_uint(tree, hf_usb_transfer_type, tvb, 0, 0, type);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(type, usb_transfer_type_vals, "Unknown type %x"));
}
switch (command) {
case WREPL_REPL_TABLE_QUERY:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_QUERY");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_QUERY");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_TABLE_QUERY");
proto_item_append_text(repl_item, ", WREPL_REPL_TABLE_QUERY");
break;
case WREPL_REPL_TABLE_REPLY:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_REPLY");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_REPLY");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_TABLE_REPLY");
proto_item_append_text(repl_item, ", WREPL_REPL_TABLE_REPLY");
break;
case WREPL_REPL_SEND_REQUEST:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REQUEST");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REQUEST");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_SEND_REQUEST");
proto_item_append_text(repl_item, ", WREPL_REPL_SEND_REQUEST");
break;
case WREPL_REPL_SEND_REPLY:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REPLY");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REPLY");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_SEND_REPLY");
proto_item_append_text(repl_item, ", WREPL_REPL_SEND_REPLY");
break;
case WREPL_REPL_UPDATE:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_UPDATE");
proto_item_append_text(repl_item, ", WREPL_REPL_UPDATE");
break;
case WREPL_REPL_UPDATE2:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE2");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE2");
}
proto_item_append_text(winsrepl_item, ",WREPL_REPL_UPDATE2");
proto_item_append_text(repl_item, ",WREPL_REPL_UPDATE2");
break;
case WREPL_REPL_INFORM:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_INFORM");
proto_item_append_text(repl_item, ", WREPL_REPL_INFORM");
break;
case WREPL_REPL_INFORM2:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM2");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM2");
}
proto_item_append_text(winsrepl_item, ", WREPL_REPL_INFORM2");
proto_item_append_text(repl_item, ", WREPL_REPL_INFORM2");
switch (mess_type) {
case WREPL_START_ASSOCIATION:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION");
}
proto_item_append_text(winsrepl_item, ", WREPL_START_ASSOCIATION");
offset = dissect_winsrepl_start(tvb, pinfo,
break;
case WREPL_START_ASSOCIATION_REPLY:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION_REPLY");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION_REPLY");
}
proto_item_append_text(winsrepl_item, ", WREPL_START_ASSOCIATION_REPLY");
offset = dissect_winsrepl_start(tvb, pinfo,
break;
case WREPL_STOP_ASSOCIATION:
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "WREPL_STOP_ASSOCIATION");
+ col_set_str(pinfo->cinfo, COL_INFO, "WREPL_STOP_ASSOCIATION");
}
proto_item_append_text(winsrepl_item, ", WREPL_STOP_ASSOCIATION");
offset = dissect_winsrepl_stop(tvb, pinfo,
if (check_col(pinfo->cinfo, COL_INFO))
{ /* Append status code to INFO column */
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
": WAP Session Initiation Request");
}
\
if (sep == NULL) { \
if (check_col(pinfo->cinfo, COL_INFO)) \
- col_add_str(pinfo->cinfo, COL_INFO, str); \
+ col_set_str(pinfo->cinfo, COL_INFO, str); \
sep = ":"; \
} \
\
* We haven't set the column yet; set it.
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, "Requests");
+ col_set_str(pinfo->cinfo, COL_INFO, "Requests");
/*
* Initialize the separator.
* Q bit not set - this is data.
*/
if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Data ...");
+ col_set_str(pinfo->cinfo, COL_INFO, "Data ...");
if (tree) {
while (tvb_offset_exists(tvb, offset)) {
}
offset += 2;
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(opcode, opcode_vals, "Unknown (0x%04x)"));
}
/*map*/
offset = dissect_rpc_string(tvb, tree, hf_ypserv_map, offset, &str);
if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,"%s", str);
+ col_append_str(pinfo->cinfo, COL_INFO, str);
}
proto_item_append_text(tree, "%s", str);
git.samba.org / obnox / wireshark / wip.git / commitdiff