diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-10-23 05:50:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-10-23 05:50:00 +0000 |
| commit | 1950ffc2141ffdb7a0b8ec8291b0bf99ac12d9d6 (patch) | |
| tree | a3358964f8621efae38bb4df4903f6b9f3f46ea5 /epan | |
| parent | e78cce5fbd7a11b0d3122b6d64968c15ea3106f8 (diff) | |
Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace
- col_append_fstr() with faster col_append_str()
- col_add_str() with col_set_str()
when it's safe
svn path=/trunk/; revision=23252
Diffstat (limited to 'epan')
126 files changed, 264 insertions, 267 deletions
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index a5e099897b..4a02fe2ea1 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -5449,7 +5449,7 @@ dissect_bacapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index a42e418083..f5a1b6d678 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -3980,7 +3980,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* 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); diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index db084f7976..94245d166d 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2636,7 +2636,7 @@ dissect_bgp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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); } diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 37ecd42821..b40fc9d22e 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -334,7 +334,7 @@ dissect_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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: diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 567c33ab4d..20dbac0f61 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -4121,7 +4121,7 @@ decode_iei_application_error(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offs 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; diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 036c273aab..e259f9c725 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -458,7 +458,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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){ diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 96c9272bdd..2167b14588 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -632,7 +632,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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 "); } diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index a70965313a..b0c8ebfa30 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -768,7 +768,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* 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 */ diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 725e83ff21..fa123158a6 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -2091,7 +2091,7 @@ dissect_cigi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) { diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 60dda2d45e..ea518964b6 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -688,7 +688,7 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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"); } diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index cd9c3a340a..236fee2499 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -1053,7 +1053,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_len /* 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)") ); } @@ -1224,7 +1224,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_len */ 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 ); } @@ -1304,7 +1304,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_len /* 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)") ); } @@ -1520,7 +1520,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_len */ 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 ); @@ -1583,7 +1583,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_len */ 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 ); } diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 636a158037..66b536826d 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -85,7 +85,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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?); */ diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index a8748a5f98..256b066b74 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -1740,7 +1740,7 @@ static gboolean dissect_ositp_internal(tvbuff_t *tvb, packet_info *pinfo, /* 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) { diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index fb076251cd..1228466f2c 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -912,7 +912,7 @@ dissect_ctdb_req_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree } 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; diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 27afb3eff5..4b924c094b 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -156,12 +156,12 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ 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)); } diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index d226bad2ce..479f34e6cf 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -676,7 +676,7 @@ static int dissect_printerdata_data(tvbuff_t *tvb, int offset, } case DCERPC_REG_BINARY: if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr( + col_append_str( pinfo->cinfo, COL_INFO, " = <binary data>"); break; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 6989d6c17b..95af4b7e40 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -3736,7 +3736,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, } 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) { @@ -3771,7 +3771,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, 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 */ @@ -3818,7 +3818,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, /* 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]"); } } @@ -3831,7 +3831,7 @@ dissect_dcerpc_cn_fault (tvbuff_t *tvb, gint offset, packet_info *pinfo, 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]"); } } @@ -4463,7 +4463,7 @@ dissect_dcerpc_dg_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, } 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) { @@ -4526,7 +4526,7 @@ dissect_dcerpc_dg_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, } 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]"); } } } diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c index a636abe17b..4e2a35fe6e 100644 --- a/epan/dissectors/packet-dcom-remunkn.c +++ b/epan/dissectors/packet-dcom-remunkn.c @@ -253,7 +253,7 @@ dissect_remunk_remrelease_rqst(tvbuff_t *tvb, int offset, 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"); } } diff --git a/epan/dissectors/packet-dcp.c b/epan/dissectors/packet-dcp.c index 9a972350dc..cec47499c3 100644 --- a/epan/dissectors/packet-dcp.c +++ b/epan/dissectors/packet-dcp.c @@ -581,7 +581,7 @@ static void dissect_dcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); } diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 58aa391448..31901a0b39 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -560,7 +560,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; @@ -593,7 +593,7 @@ do_initialization_msg( 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, @@ -636,7 +636,7 @@ do_verification_msg( 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, @@ -663,7 +663,7 @@ do_hello_test_msg( 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, @@ -705,7 +705,7 @@ do_routing_msg( 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, @@ -714,7 +714,7 @@ do_routing_msg( 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, @@ -799,7 +799,7 @@ do_hello_msg( /* 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); @@ -814,7 +814,7 @@ do_hello_msg( 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); @@ -984,7 +984,7 @@ handle_nsp_msg( 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); @@ -1027,7 +1027,7 @@ handle_nsp_msg( 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); @@ -1127,7 +1127,7 @@ handle_nsp_msg( 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); @@ -1155,7 +1155,7 @@ handle_nsp_msg( 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); @@ -1177,7 +1177,7 @@ handle_nsp_msg( 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); diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 0f45549647..0d22a966bd 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -408,7 +408,7 @@ static int dissect_diameter_avp(diam_ctx_t* c, tvbuff_t* tvb, int 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); @@ -459,7 +459,7 @@ static const char* proto_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) } 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; @@ -482,9 +482,9 @@ static const char* time_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) { 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: @@ -509,7 +509,7 @@ static const char* address_v16_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) 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; @@ -542,7 +542,7 @@ static const char* unsigned32_avp(diam_ctx_t* c, diam_avp_t* a, tvbuff_t* tvb) { 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; diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index f39a5cf89b..38f0c0ca18 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -71,7 +71,7 @@ extern void proto_reg_handoff_distcc(void); 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); @@ -248,7 +248,7 @@ dissect_distcc_doti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off 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); @@ -270,7 +270,7 @@ dissect_distcc_doto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off 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); diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index b77c633080..caf58132cd 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -3377,7 +3377,7 @@ static void dissect_dmp (tvbuff_t *tvb, packet_info *pinfo _U_ , 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)) @@ -3390,7 +3390,7 @@ static void dissect_dmp (tvbuff_t *tvb, packet_info *pinfo _U_ , } 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) || @@ -3413,7 +3413,7 @@ static void dissect_dmp (tvbuff_t *tvb, packet_info *pinfo _U_ , } } if (dmp.checksum && (checksum1 != checksum2)) { - col_append_fstr (pinfo->cinfo, COL_INFO, ", Checksum incorrect"); + col_append_str (pinfo->cinfo, COL_INFO, ", Checksum incorrect"); } } diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 84ba32cf92..57203760b4 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2547,7 +2547,7 @@ get_dnp3_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) 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) { @@ -2564,7 +2564,7 @@ dissect_dnp3_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 */ diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index f4abea6f9d..d4a95f1919 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -693,7 +693,7 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 8ac915a18b..dd5e261ba6 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -960,14 +960,14 @@ dissect_dtls_handshake(tvbuff_t *tvb, packet_info *pinfo, 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) diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index 4ecb7ff1a7..4883adc15f 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -60,11 +60,11 @@ static void dissect_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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"); } diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index fd4e830052..73864b35e8 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -1773,7 +1773,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre 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); diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 59daefc5c6..3ce7246721 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -308,7 +308,7 @@ dissect_cpf( int command, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* 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 ) @@ -332,7 +332,7 @@ dissect_cpf( int command, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* 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 ) diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 1a9597b3f5..47b0ada34d 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -245,7 +245,7 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; @@ -294,7 +294,7 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { 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: @@ -309,13 +309,13 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 { @@ -728,7 +728,7 @@ dissect_epl_asnd_nmtreq(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, 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)); } @@ -772,7 +772,7 @@ dissect_epl_asnd_nmtcmd(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, 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)); } @@ -907,7 +907,7 @@ dissect_epl_asnd_ires(proto_tree *epl_tree, tvbuff_t *tvb, packet_info *pinfo, g 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; diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index a3d339611e..f7523b167f 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -245,16 +245,16 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 0943ca4354..34f6e862e2 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -261,7 +261,7 @@ ethertype(guint16 etype, tvbuff_t *tvb, int offset_after_etype, 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); } } diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 2499b23d4a..8f083fbfaa 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1732,7 +1732,7 @@ dissect_fcels_cbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, 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); @@ -1775,7 +1775,7 @@ dissect_fcels_unbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, 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); diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 8838c8db20..c234a6da6d 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -374,7 +374,7 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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; diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index bf2a081906..8cdf0f4a91 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -120,7 +120,7 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index 00b39999b6..374f2de0e2 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -3027,7 +3027,7 @@ dissect_fix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); } diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index c5d3fe28b2..8b4859719e 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -4039,7 +4039,7 @@ dissect_giop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { /*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 */ { diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index f0a77819f0..c088f83fe6 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -110,7 +110,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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. */ @@ -125,7 +125,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c index e2df0f6056..98348f39d0 100644 --- a/epan/dissectors/packet-h248_annex_c.c +++ b/epan/dissectors/packet-h248_annex_c.c @@ -776,7 +776,7 @@ static void dissect_h248_annexc_NSAP(proto_tree* tree, 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))); } diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 1ccee09c88..a6bf8beb85 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -351,7 +351,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) { diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 03218dda9c..3b271e764f 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1575,7 +1575,7 @@ dissect_fullpacket (tvbuff_t * tvb, guint32 offset, } 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); @@ -1958,7 +1958,7 @@ static void dissect_payload(tvbuff_t *tvb, guint32 offset, 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; } @@ -1973,7 +1973,7 @@ static void dissect_payload(tvbuff_t *tvb, guint32 offset, 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", diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 4ff5f58e33..66fd241e24 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -928,7 +928,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset, 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)"); } @@ -937,7 +937,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset, if ( check_col(mypinfo->cinfo, COL_INFO) ) { - col_append_fstr(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, ":"); } @@ -961,7 +961,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset, } if ( check_col(mypinfo->cinfo, COL_INFO) && (i != 0) ) { - col_append_fstr(mypinfo->cinfo, COL_INFO, + col_append_str(mypinfo->cinfo, COL_INFO, ","); } @@ -1125,7 +1125,7 @@ static void dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree 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")); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 6deef857f8..613066eaa8 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1459,7 +1459,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); } } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index abbeb91265..c56ecc1d47 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -2810,7 +2810,7 @@ static void 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; @@ -2997,7 +2997,7 @@ static void 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] = ""; @@ -3095,7 +3095,7 @@ static void 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; @@ -3771,7 +3771,7 @@ dissect_frame_control(proto_tree * tree, tvbuff_t * tvb, gboolean wlan_broken_fc 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"); @@ -3918,7 +3918,7 @@ add_tagged_field (packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int of 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) { @@ -5350,8 +5350,7 @@ set_src_addr_cols(packet_info *pinfo, const guint8 *addr, const char *type) 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 @@ -5361,8 +5360,7 @@ set_dst_addr_cols(packet_info *pinfo, const guint8 *addr, const char *type) 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 diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index 85b29d7ae0..1241bd43cd 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -155,7 +155,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off 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); diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index fc95252a8b..44affe0527 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -74,13 +74,13 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); } } diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 7c2cb96b8d..5b98b5348a 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -487,7 +487,7 @@ static void dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 */ diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 2b70df4835..4c28cf69f0 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2145,7 +2145,7 @@ dissect_icmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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); } diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 0462e90fb7..5ffa34e164 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -4259,7 +4259,7 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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)")); } diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index fbbbe4b8f6..9b3e04b836 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1119,7 +1119,7 @@ static void ipv6_shim6_checkum_additional_info(tvbuff_t * tvb, packet_info * pin 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]"); } } @@ -1480,7 +1480,7 @@ again: } 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)", diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 79cfc00637..f3ff67dfbc 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -867,7 +867,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ 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; diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index c5c5dd2cdc..140f3908d8 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -1703,7 +1703,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean chec /* 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; diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 1520e9aed9..bd70860289 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -646,7 +646,7 @@ dissect_hello_checksum_clv(tvbuff_t *tvb, 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, diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index d80c41e3b8..d37425dd77 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -1746,7 +1746,7 @@ static void isis_lsp_checkum_additional_info(tvbuff_t * tvb, packet_info * pinfo 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]"); } } diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c index 363712859e..7c6bcd53c0 100644 --- a/epan/dissectors/packet-isis-snp.c +++ b/epan/dissectors/packet-isis-snp.c @@ -509,7 +509,7 @@ dissect_snp_checksum_clv(tvbuff_t *tvb, 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, diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 8308c4faca..7aab967105 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -607,7 +607,7 @@ dissect_isns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; @@ -784,7 +784,7 @@ get_isns_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) 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; @@ -815,7 +815,7 @@ dissect_isns_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index dd7becbb2e..9d256ce7c7 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -803,7 +803,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree) 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); @@ -834,7 +834,7 @@ static gboolean dissect_iuup_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree 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) { diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 0b392d6cb6..55ee55b5b6 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -1052,7 +1052,7 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree } if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, "Welcome"); + col_set_str(pinfo->cinfo, COL_INFO, "Welcome"); } { diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 66324174c7..22c876a2b1 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -203,7 +203,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ /* 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){ diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 2e62f22ddc..b382fdec3d 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -2264,7 +2264,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *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", @@ -2287,7 +2287,7 @@ dissect_msg(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree) 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", diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 51e3f90b04..726883fb99 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -420,7 +420,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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"); } diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index 264244ae61..ed296f068f 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -118,7 +118,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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) diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 5ce768f6bc..cf202a73ce 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -275,7 +275,7 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo, 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 "); } @@ -339,7 +339,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo, 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) { @@ -383,7 +383,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, 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"); } diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index ad7591ccc6..1e776a90af 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.c @@ -59,7 +59,7 @@ dissect_media(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree) } 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); diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index b3490cb939..69398c5a53 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -481,7 +481,7 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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. */ diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index 128a19515c..4de3dcd801 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -226,7 +226,7 @@ dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 8718572ec9..545d6c49fa 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -1272,7 +1272,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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) diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index dd8413adaf..36a7efba88 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -213,8 +213,8 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o 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")); } diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 3c089d7321..7ce282ac7b 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -322,7 +322,7 @@ static gint dissect_msmms_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre /* 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; } @@ -612,7 +612,7 @@ gint dissect_msmms_data_udp_command(tvbuff_t *tvb, packet_info *pinfo, proto_tre 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 */ diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c index d68c107790..a4d31b5ef5 100644 --- a/epan/dissectors/packet-msn-messenger.c +++ b/epan/dissectors/packet-msn-messenger.c @@ -96,7 +96,7 @@ dissect_msnms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * 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)); } diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index 775083aa06..f3af65c908 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -243,8 +243,8 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of 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")); } diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 512166bd84..aa9c806e6e 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -60,7 +60,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) { diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c index 86e449b431..6dd8bffbdb 100644 --- a/epan/dissectors/packet-mtp3mg.c +++ b/epan/dissectors/packet-mtp3mg.c @@ -456,7 +456,7 @@ dissect_mtp3mg_unknown_message(tvbuff_t *tvb, proto_tree *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")); @@ -1109,7 +1109,7 @@ dissect_mtp3mg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 */ @@ -1203,7 +1203,7 @@ dissect_mtp3mg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 */ diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c index a71b69f295..fe2ceb393c 100644 --- a/epan/dissectors/packet-multipart.c +++ b/epan/dissectors/packet-multipart.c @@ -182,7 +182,7 @@ base64_decode(packet_info *pinfo, tvbuff_t *b64_tvb, char *name) 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); diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 5f89a3f4f5..d6bbc930ad 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -1044,13 +1044,13 @@ static void dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre 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); @@ -1058,13 +1058,13 @@ static void dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } 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); diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index abfa103560..c3d150055d 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -364,7 +364,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) 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; } } diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 24d67e6488..917686bd20 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -334,7 +334,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); @@ -407,7 +407,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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); @@ -434,7 +434,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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")); } diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 3af5691d22..791874b020 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1785,7 +1785,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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)")); } @@ -1815,7 +1815,7 @@ continuation: * 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); diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 9583c43c52..0aa3b0479a 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -684,7 +684,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp 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 */ diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index c71eeab184..0f5978a2f1 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -465,8 +465,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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)")); } diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 8ef5902c3c..2336f5fe74 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -12039,7 +12039,7 @@ dissect_ping_req(tvbuff_t *tvb, packet_info *pinfo, { 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"); } } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index c306645a52..51188c5fb8 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4186,7 +4186,7 @@ dissect_ndps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree) 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; @@ -4438,7 +4438,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!spx_info->eom) { - col_append_fstr(pinfo->cinfo, COL_INFO, "[NDPS Fragment]"); + col_append_str(pinfo->cinfo, COL_INFO, "[NDPS Fragment]"); } } } @@ -4450,7 +4450,7 @@ ndps_defrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { 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; @@ -6743,7 +6743,7 @@ ndps_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffset 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; @@ -6947,7 +6947,7 @@ return_code(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int foffse } 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; @@ -7965,7 +7965,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int 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; @@ -8219,7 +8219,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int 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; @@ -8234,7 +8234,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int 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; @@ -8258,7 +8258,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int 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; @@ -8277,7 +8277,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int 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 */ @@ -8287,7 +8287,7 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int 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; diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index e8cd689e12..196b3287ef 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1149,7 +1149,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - col_add_fstr( pinfo->cinfo, COL_INFO, "%s", + col_add_str( pinfo->cinfo, COL_INFO, command_name); break; } diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 2d1ce2663a..4015cd435e 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -586,7 +586,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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")); } diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 565a6f85fc..84c83bb723 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1384,7 +1384,7 @@ dissect_ntlmssp_verf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) { diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index 9a495ce110..dfef66c9cc 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -136,7 +136,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); @@ -149,7 +149,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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", diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 7c747ef57e..15b7efb9b5 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -254,7 +254,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo _U_, 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); @@ -469,7 +469,7 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo _U_, &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); diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 477e369672..2be28a394d 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -376,7 +376,7 @@ dissect_pgsql(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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) ? ">" : "<"); diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c index f360bf8f79..e0ea1f750e 100644 --- a/epan/dissectors/packet-portmap.c +++ b/epan/dissectors/packet-portmap.c @@ -168,7 +168,7 @@ dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, 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"); } diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 8a82c5a362..8fa857ff85 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3135,7 +3135,7 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; @@ -3223,7 +3223,7 @@ dissect_iphc_crtp_cudp16(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); @@ -3260,7 +3260,7 @@ dissect_iphc_crtp_cudp8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); @@ -3298,7 +3298,7 @@ dissect_iphc_crtp_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) { @@ -3608,7 +3608,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *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"); @@ -3627,7 +3627,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * 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) @@ -3652,7 +3652,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *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) diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 4cd245f93c..0ddc43bb43 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -256,7 +256,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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 */ @@ -444,7 +444,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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")); } diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 4af93ea5c7..841eab9a71 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -244,7 +244,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 9557cb1578..b3127853fd 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1112,7 +1112,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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; } } diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 6cb9b48be3..23478d1600 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -267,7 +267,7 @@ dissect_pvfs_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; } @@ -3205,7 +3205,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, 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)"); } diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index a8b48cf2af..916c5a1cd0 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -86,7 +86,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off 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); diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index 1dadd6510b..5ca84f7245 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -153,7 +153,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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, @@ -161,7 +161,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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, diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index f0c570b3fd..0f68c40006 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -662,7 +662,7 @@ dissect_norm_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 */ diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 3350f5d907..68d90ab110 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -2081,7 +2081,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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, @@ -2289,7 +2289,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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, diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index eedd364a93..3c05eacad0 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -5327,7 +5327,7 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 41c49b91d0..29c146e12a 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -191,7 +191,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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; @@ -216,7 +216,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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 */ diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 3e41b02658..ad5790e7ed 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -480,7 +480,7 @@ dissect_rtps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); } diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 29085f55cd..3ba3631080 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -655,7 +655,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, 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)); } diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c index be3acea50f..186319d7e7 100644 --- a/epan/dissectors/packet-scsi-osd.c +++ b/epan/dissectors/packet-scsi-osd.c @@ -2635,7 +2635,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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); @@ -2653,7 +2653,7 @@ dissect_osd_opcode(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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){ diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 5b8b515561..2a120877d9 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -668,7 +668,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr * 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 ) { /* @@ -816,7 +816,7 @@ dissect_sigcomp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sigcomp_tr * 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 diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 1493991721..a31a58e1d9 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -257,7 +257,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); } @@ -512,9 +512,9 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index ef8c05780f..34671f9e30 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -6955,10 +6955,10 @@ dissect_session_setup_andx_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree 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, @@ -8590,7 +8590,7 @@ dissect_nt_transaction_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } 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; @@ -9051,7 +9051,7 @@ dissect_nt_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre 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>"); } } @@ -14277,7 +14277,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, break; } if (count && check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, ", Files:"); } @@ -14296,7 +14296,7 @@ dissect_transaction2_response_data(tvbuff_t *tvb, packet_info *pinfo, break; } if (count && check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, ", Files:"); } @@ -14695,7 +14695,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * 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; @@ -14709,7 +14709,7 @@ dissect_transaction_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * 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); diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0f911e417f..e65fdb6aa4 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -546,7 +546,7 @@ dissect_smb2_olb_string(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t "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; @@ -625,7 +625,7 @@ dissect_smb2_olb_buffer(packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *t "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; @@ -3280,7 +3280,7 @@ dissect_smb2_MxAc_buffer(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree 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"); } diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 2de26ca2be..e6d3cd7f40 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -528,7 +528,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 { /* diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 8835870694..a76881572d 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -899,11 +899,11 @@ dissect_optional_0e(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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"); } } @@ -1217,7 +1217,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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 @@ -1372,7 +1372,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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, @@ -1390,7 +1390,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, 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); diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c index c2bb11c0c3..d631f58e3e 100644 --- a/epan/dissectors/packet-sqloracle.c +++ b/epan/dissectors/packet-sqloracle.c @@ -497,7 +497,7 @@ static gboolean ParseCommand(proto_tree *tree,tvbuff_t *tvb, int offset, packet_ 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; @@ -544,7 +544,7 @@ static gboolean ParseNewCommand( proto_tree *tree,tvbuff_t *tvb, int offset, pac 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; @@ -633,7 +633,7 @@ dissect_sqloracle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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 diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 8e3ceb8348..7322e94c6e 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -450,7 +450,7 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, 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; @@ -554,7 +554,7 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, } 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; diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index c4b60da5cb..780af152cc 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1713,14 +1713,14 @@ dissect_ssl3_handshake(tvbuff_t *tvb, packet_info *pinfo, 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) diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index e445940e12..b710a5b4ab 100755 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -516,7 +516,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *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)")); } } diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index c2bf929d5a..d247be63ef 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -79,11 +79,11 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); @@ -102,7 +102,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 9b30e98417..6c99c36f03 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -2842,7 +2842,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; @@ -2891,7 +2891,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index 4a67f6fd73..994d3d93c9 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1605,7 +1605,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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; diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 779e6b03b1..29ec49183f 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -216,7 +216,7 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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)")); } diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index 538355de5b..5bfb3cf04f 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -298,11 +298,11 @@ static void dissect_tns_data(tvbuff_t *tvb, int offset, packet_info *pinfo, { 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"); } } @@ -894,7 +894,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); } diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index d0268a9f0c..92572a0fca 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -119,7 +119,7 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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) diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 4fc7c8f77c..4d749aff6a 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -942,7 +942,7 @@ dissect_linux_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent) 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")); } diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 67a200acf5..648fe589b6 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -579,7 +579,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -588,7 +588,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -597,7 +597,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -606,7 +606,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -615,7 +615,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -624,7 +624,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -633,7 +633,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -642,7 +642,7 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, 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"); @@ -694,7 +694,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) 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, @@ -702,7 +702,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) 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, @@ -710,7 +710,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) 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, diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 6f3758ec9c..e5a6f410c0 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -4874,7 +4874,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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"); } diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 590c4b8029..d639310487 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -1219,7 +1219,7 @@ static const value_string zero_is_none_vals[] = { \ 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 = ":"; \ } \ \ @@ -4289,7 +4289,7 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, * 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. diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index 8271431d21..92c8e11a58 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -219,7 +219,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * 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)) { diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index aeb1ccfd4d..0bd6bb4143 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -219,7 +219,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } 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)")); } diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c index ab6755e658..aea967bae4 100644 --- a/epan/dissectors/packet-ypserv.c +++ b/epan/dissectors/packet-ypserv.c @@ -408,7 +408,7 @@ dissect_order_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree /*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); |