From e6f1bd90565ca801cd44dc685b15235ef8224b5e Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 29 Sep 2013 18:19:29 +0000 Subject: [PATCH] Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value. svn path=/trunk/; revision=52272 --- epan/dissectors/packet-arp.c | 8 +++---- epan/dissectors/packet-clnp.c | 8 +++---- epan/dissectors/packet-fcswils.c | 24 ++++++++++----------- epan/dissectors/packet-ieee80211-radiotap.c | 8 +++---- epan/dissectors/packet-isakmp.c | 4 ++-- epan/dissectors/packet-isis-hello.c | 18 +++++++--------- epan/dissectors/packet-ismp.c | 6 +++--- epan/dissectors/packet-knet.c | 4 ++-- epan/dissectors/packet-nhrp.c | 4 ++-- epan/dissectors/packet-ntp.c | 4 ++-- epan/dissectors/packet-olsr.c | 16 +++++++------- epan/dissectors/packet-p_mul.c | 4 ++-- epan/dissectors/packet-pgm.c | 8 +++---- epan/dissectors/packet-rtnet.c | 4 ++-- epan/dissectors/packet-wol.c | 8 +++---- 15 files changed, 63 insertions(+), 65 deletions(-) diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 7f0083eea5..c66ec87c82 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -1183,10 +1183,10 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_atmarp_src_atm_num_nsap, arp_tree); if (ar_ssl != 0) - proto_tree_add_bytes_format(arp_tree, hf_atmarp_src_atm_subaddr, tvb, ssa_offset, + proto_tree_add_bytes_format_value(arp_tree, hf_atmarp_src_atm_subaddr, tvb, ssa_offset, ar_ssl, ssa_val, - "Sender ATM subaddress: %s", ssa_str); + "%s", ssa_str); if (ar_spln != 0) { proto_tree_add_item(arp_tree, @@ -1200,10 +1200,10 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_atmarp_dst_atm_num_nsap, arp_tree); if (ar_tsl != 0) - proto_tree_add_bytes_format(arp_tree, hf_atmarp_dst_atm_subaddr, tvb, tsa_offset, + proto_tree_add_bytes_format_value(arp_tree, hf_atmarp_dst_atm_subaddr, tvb, tsa_offset, ar_tsl, tsa_val, - "Target ATM subaddress: %s", tsa_str); + "%s", tsa_str); if (ar_tpln != 0) { proto_tree_add_item(arp_tree, diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 4497c41545..800b28e31a 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -395,9 +395,9 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nsel = tvb_get_guint8(tvb, offset + dst_len - 1); SET_ADDRESS(&pinfo->net_dst, AT_OSI, dst_len, dst_addr); SET_ADDRESS(&pinfo->dst, AT_OSI, dst_len, dst_addr); - proto_tree_add_bytes_format(clnp_tree, hf_clnp_dest, tvb, offset, dst_len, + proto_tree_add_bytes_format_value(clnp_tree, hf_clnp_dest, tvb, offset, dst_len, dst_addr, - " DA : %s", + "%s", print_nsap_net(dst_addr, dst_len)); offset += dst_len; opt_len -= dst_len; @@ -432,10 +432,10 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) src_addr = tvb_get_ptr(tvb, offset, src_len); SET_ADDRESS(&pinfo->net_src, AT_OSI, src_len, src_addr); SET_ADDRESS(&pinfo->src, AT_OSI, src_len, src_addr); - proto_tree_add_bytes_format(clnp_tree, hf_clnp_src, tvb, + proto_tree_add_bytes_format_value(clnp_tree, hf_clnp_src, tvb, offset, src_len, src_addr, - " SA : %s", + "%s", print_nsap_net(src_addr, src_len)); offset += src_len; diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index 26f198252c..f0ae267534 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -740,8 +740,8 @@ dissect_swils_elp(tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) } else { flags="Class F Invld"; } - proto_tree_add_bytes_format(elp_tree, hf_swils_elp_clsf_svcp, tvb, offset, 6, - &elp.clsf_svcparm[0], "Class F Svc Parameters: (%s)", flags); + proto_tree_add_bytes_format_value(elp_tree, hf_swils_elp_clsf_svcp, tvb, offset, 6, + &elp.clsf_svcparm[0], "(%s)", flags); offset += 6; proto_tree_add_item(elp_tree, hf_swils_elp_clsf_rcvsz, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -781,8 +781,8 @@ dissect_swils_elp(tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) flags="Class 1 Invalid"; } - proto_tree_add_bytes_format(elp_tree, hf_swils_elp_cls1_svcp, tvb, offset, 2, - NULL, "Class 1 Svc Parameters: (%s)", flags); + proto_tree_add_bytes_format_value(elp_tree, hf_swils_elp_cls1_svcp, tvb, offset, 2, + NULL, "(%s)", flags); offset += 2; if (elp.cls1_svcparm[0] & 0x80) { proto_tree_add_item(elp_tree, hf_swils_elp_cls1_rcvsz, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -801,9 +801,9 @@ dissect_swils_elp(tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) flags="Class 2 Invld"; } - proto_tree_add_bytes_format(elp_tree, hf_swils_elp_cls2_svcp, tvb, offset, 2, + proto_tree_add_bytes_format_value(elp_tree, hf_swils_elp_cls2_svcp, tvb, offset, 2, &elp.cls2_svcparm[0], - "Class 2 Svc Parameters: (%s)", flags); + "(%s)", flags); offset += 2; if (elp.cls2_svcparm[0] & 0x80) { @@ -822,9 +822,9 @@ dissect_swils_elp(tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_) else { flags="Class 3 Invld"; } - proto_tree_add_bytes_format(elp_tree, hf_swils_elp_cls3_svcp, tvb, offset, 2, + proto_tree_add_bytes_format_value(elp_tree, hf_swils_elp_cls3_svcp, tvb, offset, 2, &elp.cls3_svcparm[0], - "Class 3 Svc Parameters: (%s)", flags); + "(%s)", flags); offset += 2; if (elp.cls3_svcparm[0] & 0x80) { @@ -1925,7 +1925,7 @@ proto_register_fcswils(void) NULL, HFILL}}, { &hf_swils_elp_clsf_svcp, - {"Class F Svc Param", "swils.elp.clsfp", + {"Class F Svc Parameters", "swils.elp.clsfp", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1950,7 +1950,7 @@ proto_register_fcswils(void) NULL, HFILL}}, { &hf_swils_elp_cls1_svcp, - {"Class 1 Svc Param", "swils.elp.cls1p", + {"Class 1 Svc Parameters", "swils.elp.cls1p", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1960,7 +1960,7 @@ proto_register_fcswils(void) NULL, HFILL}}, { &hf_swils_elp_cls2_svcp, - {"Class 2 Svc Param", "swils.elp.cls2p", + {"Class 2 Svc Parameters", "swils.elp.cls2p", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, @@ -1970,7 +1970,7 @@ proto_register_fcswils(void) NULL, HFILL}}, { &hf_swils_elp_cls3_svcp, - {"Class 3 Svc Param", "swils.elp.cls3p", + {"Class 3 Svc Parameters", "swils.elp.cls3p", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index b3238ef42d..9c99d08f57 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -1190,18 +1190,18 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) manuf_name = tvb_get_manuf_name(tvb, offset); subns = tvb_get_guint8(tvb, offset+3); - vt = proto_tree_add_bytes_format(radiotap_tree, + vt = proto_tree_add_bytes_format_value(radiotap_tree, hf_radiotap_vendor_ns, tvb, offset, iter.this_arg_size, NULL, - "Vendor namespace: %s-%d", + "%s-%d", manuf_name, subns); ven_tree = proto_item_add_subtree(vt, ett_radiotap_vendor); - proto_tree_add_bytes_format(ven_tree, + proto_tree_add_bytes_format_value(ven_tree, hf_radiotap_ven_oui, tvb, offset, 3, NULL, - "Vendor: %s", manuf_name); + "%s", manuf_name); proto_tree_add_item(ven_tree, hf_radiotap_ven_subns, tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item(ven_tree, hf_radiotap_ven_skip, tvb, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index b1bb8784ac..b7a582fda9 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2985,9 +2985,9 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v if (doi == 1) { /* IPSEC */ if (length < 4) { - proto_tree_add_bytes_format(tree, hf_isakmp_sa_situation, tvb, offset, length, + proto_tree_add_bytes_format_value(tree, hf_isakmp_sa_situation, tvb, offset, length, NULL, - "Situation: %s (length is %u, should be >= 4)", + "%s (length is %u, should be >= 4)", tvb_bytes_to_str(tvb, offset, length), length); return; } diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 684fc80120..c354aadf1b 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -614,9 +614,9 @@ dissect_hello_restart_clv(tvbuff_t *tvb, */ if (length >= 3 + id_length && ISIS_MASK_RESTART_RA(restart_options)) { neighbor_id = tvb_get_ptr(tvb, offset+3, id_length); - proto_tree_add_bytes_format( tree, + proto_tree_add_bytes_format_value( tree, hf_isis_hello_clv_restart_neighbor, tvb, offset+3, - id_length, neighbor_id, "Restarting Neighbor ID: %s", + id_length, neighbor_id, "%s", print_system_id( neighbor_id, id_length ) ); } } @@ -1032,10 +1032,9 @@ isis_dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int if (tree) { source_id = tvb_get_ptr(tvb, offset, id_length); - proto_tree_add_bytes_format(hello_tree, hf_isis_hello_source_id, tvb, + proto_tree_add_bytes_format_value(hello_tree, hf_isis_hello_source_id, tvb, offset, id_length, source_id, - "System-ID {Sender of PDU} : %s", - print_system_id( source_id, id_length ) ); + "%s", print_system_id( source_id, id_length ) ); } col_append_fstr(pinfo->cinfo, COL_INFO, ", System-ID: %s", print_system_id( tvb_get_ptr(tvb, offset, id_length), id_length ) ); @@ -1074,10 +1073,9 @@ isis_dissect_isis_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int if (tree) { lan_id = tvb_get_ptr(tvb, offset, id_length+1); - proto_tree_add_bytes_format(hello_tree, hf_isis_hello_lan_id, tvb, + proto_tree_add_bytes_format_value(hello_tree, hf_isis_hello_lan_id, tvb, offset, id_length + 1, lan_id, - "System-ID {Designated IS} : %s", - print_system_id( lan_id, id_length + 1 ) ); + "%s", print_system_id( lan_id, id_length + 1 ) ); } offset += id_length + 1; } @@ -1129,7 +1127,7 @@ isis_register_hello(int proto_isis) { FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_source_id, - { "SystemID{ Sender of PDU }", "isis.hello.source_id", + { "SystemID {Sender of PDU}", "isis.hello.source_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_holding_timer, @@ -1145,7 +1143,7 @@ isis_register_hello(int proto_isis) { FT_UINT8, BASE_DEC, NULL, ISIS_HELLO_P_RESERVED_MASK, NULL, HFILL }}, { &hf_isis_hello_lan_id, - { "SystemID{ Designated IS }", "isis.hello.lan_id", + { "SystemID {Designated IS}", "isis.hello.lan_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_local_circuit_id, diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index e86f6619d2..4bd870b587 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -353,13 +353,13 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp offset += 2; if (num_neighbors > 0) { - edp_neighbors_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_neighbors, tvb, - offset, num_neighbors*10, NULL, "Neighbors:"); + edp_neighbors_ti = proto_tree_add_bytes(edp_tree, hf_ismp_edp_neighbors, tvb, + offset, num_neighbors*10, NULL); edp_neighbors_tree = proto_item_add_subtree(edp_neighbors_ti, ett_ismp_edp_neighbors); while ( neighbors_count < num_neighbors && tvb_reported_length_remaining(tvb, offset) >= 10) { edp_neighbors_leaf_ti = proto_tree_add_text(edp_neighbors_tree, tvb, offset, 10, - "Neighbor%d", (neighbors_count+1)); + "Neighbor%d", (neighbors_count+1)); edp_neighbors_leaf_tree = proto_item_add_subtree(edp_neighbors_leaf_ti, ett_ismp_edp_neighbors_leaf); proto_tree_add_text(edp_neighbors_leaf_tree, tvb, offset, 6, diff --git a/epan/dissectors/packet-knet.c b/epan/dissectors/packet-knet.c index a7d2977f46..259ea160ea 100644 --- a/epan/dissectors/packet-knet.c +++ b/epan/dissectors/packet-knet.c @@ -385,8 +385,8 @@ dissect_messageid(tvbuff_t *buffer, int *offset, proto_tree *tree, packet_info * break; } - proto_tree_add_bytes_format(tree, hf_knet_messageid, buffer, *offset, messageid_length, NULL, - "Message ID: %s (%d)", val_to_str_const(messageid, packettypenames, "AppData or Malformed Message ID"), messageid); + proto_tree_add_bytes_format_value(tree, hf_knet_messageid, buffer, *offset, messageid_length, NULL, + "%s (%d)", val_to_str_const(messageid, packettypenames, "AppData or Malformed Message ID"), messageid); col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str_const(messageid, packettypenames, "AppData ")); diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index fac16a6a7b..ec8d858580 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -944,8 +944,8 @@ void dissect_nhrp_ext(tvbuff_t *tvb, "Extension Data: Vendor ID=%s, Data=%s", get_manuf_name(manuf), tvb_bytes_to_str(tvb, offset + 3, len - 3)); vendor_tree = proto_item_add_subtree(vendor_item, ett_nhrp_vendor_ext); - proto_tree_add_bytes_format(vendor_tree, hf_nhrp_vendor_ext_id, tvb, - offset, 3, manuf, "Vendor ID: %s", get_manuf_name(manuf)); + proto_tree_add_bytes_format_value(vendor_tree, hf_nhrp_vendor_ext_id, tvb, + offset, 3, manuf, "%s", get_manuf_name(manuf)); if (len > 3) { proto_tree_add_text(vendor_tree, tvb, offset + 3, len - 3, "Data: %s", tvb_bytes_to_str(tvb, offset + 3, len - 3)); diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index a5d3abdee5..abc76bfac0 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -853,8 +853,8 @@ dissect_ntp_std(tvbuff_t *tvb, proto_tree *ntp_tree, guint8 flags) buff[NTP_TS_SIZE-1]=0; } } - proto_tree_add_bytes_format(ntp_tree, hf_ntp_refid, tvb, 12, 4, - NULL, "Reference ID: %s", buff); + proto_tree_add_bytes_format_value(ntp_tree, hf_ntp_refid, tvb, 12, 4, + NULL, "%s", buff); /* Reference Timestamp: This is the time at which the local clock was * last set or corrected. diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index 7b585dabbe..efc6f0e65d 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -211,8 +211,8 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * lq = tvb_get_guint8(tvb, offset + 4); nlq = tvb_get_guint8(tvb, offset + 5); - address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, - NULL, "Neighbor Address: %s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq); + address_group = proto_tree_add_bytes_format_value(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, + NULL, "%s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -227,8 +227,8 @@ static int dissect_olsrorg_lq_tc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * lq = tvb_get_guint8(tvb, offset + 16); nlq = tvb_get_guint8(tvb, offset + 17); - address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, - NULL, "Neighbor Address: %s (%d/%d)", tvb_ip6_to_str(tvb, offset), lq, nlq); + address_group = proto_tree_add_bytes_format_value(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, + NULL, "%s (%d/%d)", tvb_ip6_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -372,8 +372,8 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr lq = tvb_get_guint8(tvb, offset + 4); nlq = tvb_get_guint8(tvb, offset + 5); - address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, - NULL, "Neighbor Address: %s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq); + address_group = proto_tree_add_bytes_format_value(olsr_tree, hf_olsr_neighbor, tvb, offset, 8, + NULL, "%s (%d/%d)", tvb_ip_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); @@ -383,8 +383,8 @@ static int handle_olsr_hello_olsrorg(tvbuff_t *tvb, packet_info *pinfo, proto_tr lq = tvb_get_guint8(tvb, offset + 16); nlq = tvb_get_guint8(tvb, offset + 17); - address_group = proto_tree_add_bytes_format(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, - NULL, "Neighbor Address: %s (%d/%d)", tvb_ip6_to_str(tvb, offset), lq, nlq); + address_group = proto_tree_add_bytes_format_value(olsr_tree, hf_olsr_neighbor, tvb, offset, 20, + NULL, "%s (%d/%d)", tvb_ip6_to_str(tvb, offset), lq, nlq); address_tree = proto_item_add_subtree(address_group, ett_olsr_message_neigh); diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index f19d1ffcc1..6046e5f57f 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -1125,9 +1125,9 @@ static void dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* We are handling a range */ guint16 end_seq_no = tvb_get_ntohs (tvb, offset + 4); - en = proto_tree_add_bytes_format (field_tree, hf_miss_seq_range, + en = proto_tree_add_bytes_format_value(field_tree, hf_miss_seq_range, tvb, offset, 6, NULL, - "Missing Data PDU Seq Range: %d - %d", + "%d - %d", ack_seq_no, end_seq_no); if (ack_seq_no >= end_seq_no) { proto_item_append_text (en, " (invalid)"); diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 65f49f18e0..b67bee398a 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -523,9 +523,9 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) soffset = 0; firsttime = FALSE; } else { - proto_tree_add_bytes_format(opt_tree, + proto_tree_add_bytes_format_value(opt_tree, hf_pgm_opt_nak_list, tvb, ptvcursor_current_offset(cursor), j*4, - nakbuf, "List: %s", nakbuf); + nakbuf, "%s", nakbuf); soffset = 0; } ptvcursor_advance(cursor, j*4); @@ -538,9 +538,9 @@ dissect_pgmopts(ptvcursor_t* cursor, const char *pktname) hf_pgm_opt_nak_list, tvb, ptvcursor_current_offset(cursor), j*4, nakbuf, "List(%d): %s", naks, nakbuf); } else { - proto_tree_add_bytes_format(opt_tree, + proto_tree_add_bytes_format_value(opt_tree, hf_pgm_opt_nak_list, tvb, ptvcursor_current_offset(cursor), j*4, - nakbuf, "List: %s", nakbuf); + nakbuf, "%s", nakbuf); } ptvcursor_advance(cursor, j*4); } diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index 5400862fc4..093d280c20 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -860,8 +860,8 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { switch (pinfo->fd->lnk_t) { case WTAP_ENCAP_ETHERNET: - proto_tree_add_bytes_format( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32, - NULL, "Client Hardware Address: %s", + proto_tree_add_bytes_format_value( rtcfg_tree, hf_rtcfg_client_hw_address, tvb, offset, 32, + NULL, "%s", tvb_ether_to_str(tvb, offset)); break; diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 2969acc015..239edc57b0 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -251,11 +251,11 @@ dissect_wol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_tree_add_ether(mac_tree, hf_wol_mac, tvb, offset, 6, mac); if ( len == 106 ) - proto_tree_add_bytes_format(wol_tree, hf_wol_passwd, tvb, offset, - 4, passwd, "Password: %s", passwd); + proto_tree_add_bytes_format_value(wol_tree, hf_wol_passwd, tvb, offset, + 4, passwd, "%s", passwd); else if ( len == 108 ) - proto_tree_add_bytes_format(wol_tree, hf_wol_passwd, tvb, offset, - 6, passwd, "Password: %s", passwd); + proto_tree_add_bytes_format_value(wol_tree, hf_wol_passwd, tvb, offset, + 6, passwd, "%s", passwd); } /* If this protocol has a sub-dissector call it here, see section 1.8 */