diff options
author | Michael Mann <mmann78@netscape.net> | 2014-04-05 21:15:23 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-04-06 01:31:28 +0000 |
commit | fdeed480bf89a1f43f7b3d4be67fa0e4333f7120 (patch) | |
tree | 03e0f5f102625697d49e9f8f80d3fdf55703a7e4 | |
parent | 941bd013b3f481e9fd42c175ea6a5194b8046ca4 (diff) |
Convert ep_address_to_str -> address_to_str(wmem_packet_scope, ...) for all dissectors
Change-Id: I7489e2fb3a1f2630ca17b0a5fe1aa873992f1061
Reviewed-on: https://code.wireshark.org/review/975
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | asn1/tcap/packet-tcap-template.c | 40 | ||||
-rw-r--r-- | epan/dissectors/packet-acn.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-bacapp.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-dtls.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-hpteam.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-http.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-iax2.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-ipsec.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-isup.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-jxta.c | 24 | ||||
-rw-r--r-- | epan/dissectors/packet-rtcp.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-sccp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-sua.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tacacs.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-tcap.c | 40 | ||||
-rw-r--r-- | epan/dissectors/packet-vuze-dht.c | 2 |
17 files changed, 89 insertions, 93 deletions
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index 69361c7e99..a1ff2dc5ab 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -995,8 +995,8 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); @@ -1004,7 +1004,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #ifdef DEBUG_TCAPSRT dbg(10,"\n Hbegin #%u ", pinfo->fd->num); dbg(11,"key %lx ",tcaphash_begin_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx \n",tcaphash_begin_key.tid); #endif @@ -1190,14 +1190,14 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_cont_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_cont_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_cont_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_cont_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_cont_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_cont_key.hashKey=tcaphash_cont_calchash(&tcaphash_cont_key); #ifdef DEBUG_TCAPSRT dbg(11,"Ckey %lx ", tcaphash_cont_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx %lx \n",tcaphash_cont_key.src_tid, tcaphash_cont_key.dst_tid); #endif p_tcaphash_contcall = find_tcaphash_cont(&tcaphash_cont_key, pinfo); @@ -1219,14 +1219,14 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); #ifdef DEBUG_TCAPSRT dbg(11,"Bkey %lx ", tcaphash_begin_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx \n",tcaphash_begin_key.tid); #endif p_tcaphash_begincall = find_tcaphash_begin(&tcaphash_begin_key, pinfo, FALSE); @@ -1259,8 +1259,8 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_end_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_end_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_end_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_end_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key); @@ -1330,14 +1330,14 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_end_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_end_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_end_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_end_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key); #ifdef DEBUG_TCAPSRT dbg(11,"Ekey %lx ",tcaphash_end_key.hashKey); - dbg(11,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(11,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx ",tcaphash_end_key.tid); #endif p_tcaphash_endcall = find_tcaphash_end(&tcaphash_end_key, pinfo,TRUE); @@ -1354,14 +1354,14 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); #ifdef DEBUG_TCAPSRT dbg(11,"Bkey %lx ", tcaphash_begin_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx ",tcaphash_begin_key.tid); #endif p_tcaphash_begincall = find_tcaphash_begin(&tcaphash_begin_key, pinfo,FALSE); @@ -1453,8 +1453,8 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_ansi_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_ansi_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_ansi_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_ansi_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_ansi_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_ansi_key.hashKey=tcaphash_ansi_calchash(&tcaphash_ansi_key); @@ -1462,7 +1462,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #ifdef DEBUG_TCAPSRT dbg(10,"\n Hansi #%u ", pinfo->fd->num); dbg(11,"key %lx ",tcaphash_ansi_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx ",tcaphash_ansi_key.tid); #endif p_tcaphash_ansicall = (struct tcaphash_ansicall_t *) diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 3242d62774..dae082ce49 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -624,7 +624,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off /* Append port and address to tree item */ IPv4 = tvb_get_ipv4(tvb, offset); SET_ADDRESS(&addr, AT_IPv4, sizeof(IPv4), &IPv4); - proto_item_append_text(pi, " %s, Port %d", ep_address_to_str(&addr), port); + proto_item_append_text(pi, " %s, Port %d", address_to_str(wmem_packet_scope(), &addr), port); offset += 4; break; case ACN_ADDR_IPV6: @@ -642,7 +642,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off /* Append port and address to tree item */ tvb_get_ipv6(tvb, offset, &IPv6); SET_ADDRESS(&addr, AT_IPv6, sizeof(struct e_in6_addr), &IPv6); - proto_item_append_text(pi, " %s, Port %d", ep_address_to_str(&addr), port); + proto_item_append_text(pi, " %s, Port %d", address_to_str(wmem_packet_scope(), &addr), port); offset += 16; break; case ACN_ADDR_IPPORT: @@ -655,7 +655,7 @@ acn_add_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int off port = tvb_get_ntohs(tvb, offset); proto_tree_add_item(addr_tree, hf_acn_port, tvb, offset, 2, ENC_BIG_ENDIAN); /* Append port to tree item */ - proto_item_append_text(pi, " %s Port %d", ep_address_to_str(&addr), port); + proto_item_append_text(pi, " %s Port %d", address_to_str(wmem_packet_scope(), &addr), port); offset += 2; break; } diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 20fe7d7fe7..7e90dfd9f9 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -4838,8 +4838,8 @@ bacapp_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt gchar *srcstr; const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(wmem_packet_scope(), &pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(wmem_packet_scope(), &pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_ip, 0, TRUE); packets_for_this_dst = tick_stat_node(st, st_str_packets_by_ip_dst, st_node_packets_by_ip, TRUE); @@ -4884,8 +4884,8 @@ bacapp_stats_tree_service(stats_tree* st, packet_info* pinfo, epan_dissect_t* ed const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(wmem_packet_scope(), &pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(wmem_packet_scope(), &pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_service, 0, TRUE); if (binfo->service_type) { @@ -4922,8 +4922,8 @@ bacapp_stats_tree_objectid(stats_tree* st, packet_info* pinfo, epan_dissect_t* e gchar *srcstr; const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(wmem_packet_scope(), &pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(wmem_packet_scope(), &pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_objectid, 0, TRUE); if (binfo->object_ident) { @@ -4960,8 +4960,8 @@ bacapp_stats_tree_instanceid(stats_tree* st, packet_info* pinfo, epan_dissect_t* gchar *srcstr; const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(wmem_packet_scope(), &pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(wmem_packet_scope(), &pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_instanceid, 0, TRUE); if (binfo->object_ident) { diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 628ba19f04..6578f6e07b 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -511,7 +511,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dummy.port = pinfo->destport; } ssl_debug_printf("dissect_dtls server %s:%d\n", - ep_address_to_str(&dummy.addr),dummy.port); + address_to_str(wmem_packet_scope(), &dummy.addr),dummy.port); /* try to retrieve private key for this service. Do it now 'cause pinfo * is not always available diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 8ce21effed..219e5cb0f2 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -91,7 +91,7 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP NIC Team"); col_add_fstr(pinfo->cinfo, COL_INFO, "HP NIC Teaming Heartbeat; Port MAC = %s", - ep_address_to_str(&pinfo->dl_src)); + address_to_str(wmem_packet_scope(), &pinfo->dl_src)); if (tree) { /* we are being asked for details */ proto_item *hpteam_item; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 5463d22bac..44cc406bb5 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -414,7 +414,7 @@ http_reqs_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* if (v->request_method) { - ip_str = ep_address_to_str(&pinfo->dst); + ip_str = address_to_str(wmem_packet_scope(), &pinfo->dst); tick_stat_node(st, st_str_reqs, 0, FALSE); tick_stat_node(st, st_str_reqs_by_srv_addr, st_node_reqs, TRUE); @@ -431,7 +431,7 @@ http_reqs_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* return 1; } else if (i != 0) { - ip_str = ep_address_to_str(&pinfo->src); + ip_str = address_to_str(wmem_packet_scope(), &pinfo->src); tick_stat_node(st, st_str_resps_by_srv_addr, 0, FALSE); resps_by_this_addr = tick_stat_node(st, ip_str, st_node_resps_by_srv_addr, TRUE); diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 9813e75e3d..e47768898d 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -580,12 +580,8 @@ static gchar *key_to_str( const iax_circuit_key *key ) } strp = str[i]; - /* why doesn't ep_address_to_str take a const pointer? - cast the warnings into oblivion. */ - - /* XXX - is this a case for wmem_packet_scope()? */ g_snprintf(strp, 80, "{%s:%i,%i}", - ep_address_to_str((address *)&key->addr), + address_to_str(wmem_packet_scope(), &key->addr), key->port, key->callno); return strp; @@ -904,8 +900,8 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, #ifdef DEBUG_HASHING g_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, " "from {%s:%u:%u} to {%s:%u:%u}", pinfo->fd->num, - ep_address_to_str(&pinfo->src), pinfo->srcport, scallno, - ep_address_to_str(&pinfo->dst), pinfo->destport, dcallno); + address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, scallno, + address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, dcallno); #endif diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 7ff497e04e..2ced09cfdb 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1161,8 +1161,8 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) }else if (pinfo->src.type == AT_IPv6){ protocol_typ = IPSEC_SA_IPV6; } - ip_src = ep_address_to_str(&pinfo->src); - ip_dst = ep_address_to_str(&pinfo->dst); + ip_src = address_to_str(wmem_packet_scope(), &pinfo->src); + ip_dst = address_to_str(wmem_packet_scope(), &pinfo->dst); get_address_ok = TRUE; /* The packet cannot be decoded using the SAD */ diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index ecc5caf407..1c2ccb5253 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -10873,7 +10873,7 @@ msg_stats_tree_packet(stats_tree *st, packet_info *pinfo, epan_dissect_t *edt _U int msg_node; int dir_node; - dir = wmem_strdup_printf(wmem_packet_scope(), "%s->%s", ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dir = wmem_strdup_printf(wmem_packet_scope(), "%s->%s", address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); msg_node = tick_stat_node(st, msg, st_node_msg, TRUE); tick_stat_node(st, dir, msg_node, FALSE); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 2522878592..5a44ac5a61 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -588,8 +588,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * } /* g_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->fd->num, - ep_address_to_str(&pinfo->src), pinfo->srcport, - ep_address_to_str(&pinfo->dst), pinfo->destport, + address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, + address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, tvb_reported_length_remaining(tvb, 0), content_type ? content_type : "[unknown content type]", (gint) content_length); */ @@ -616,14 +616,14 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* Use our source and destination addresses if we have them */ if (NULL != peer_conversation) { /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->fd->num, - ep_address_to_str(&tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port, - ep_address_to_str(&tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */ + address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port, + address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */ if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->initiator_tpt_address) && tpt_conv_data->initiator_tpt_port == pinfo->srcport) { /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num, - ep_address_to_str(&tpt_conv_data->initiator_address), - ep_address_to_str(&tpt_conv_data->receiver_address)); */ + address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address), + address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address)); */ pinfo->src = tpt_conv_data->initiator_address; pinfo->srcport = 0; pinfo->dst = tpt_conv_data->receiver_address; @@ -632,8 +632,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * } else if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->receiver_tpt_address) && tpt_conv_data->receiver_tpt_port == pinfo->srcport) { /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num, - ep_address_to_str(&tpt_conv_data->receiver_address), - ep_address_to_str(&tpt_conv_data->initiator_address)); */ + address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address), + address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address)); */ pinfo->src = tpt_conv_data->receiver_address; pinfo->srcport = 0; pinfo->dst = tpt_conv_data->initiator_address; @@ -641,8 +641,8 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pinfo->ptype = PT_NONE; } else { /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->fd->num, - ep_address_to_str(&pinfo->src), pinfo->srcport, - ep_address_to_str(&pinfo->dst), pinfo->destport); */ + address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, + address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport); */ } } @@ -1286,9 +1286,9 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree } src_addr = wmem_strbuf_new_label(wmem_packet_scope()); - wmem_strbuf_append(src_addr, ep_address_to_str(&pinfo->src)); + wmem_strbuf_append(src_addr, address_to_str(wmem_packet_scope(), &pinfo->src)); dst_addr = wmem_strbuf_new_label(wmem_packet_scope()); - wmem_strbuf_append(dst_addr, ep_address_to_str(&pinfo->dst)); + wmem_strbuf_append(dst_addr, address_to_str(wmem_packet_scope(), &pinfo->dst)); /* append the port if appropriate */ if (PT_NONE != pinfo->ptype) { diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index c4c0ded1de..6c868c6d71 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -628,7 +628,7 @@ void srtcp_add_address( packet_info *pinfo, } #ifdef DEBUG - printf("#%u: %srtcp_add_address(%s, %u, %u, %s, %u\n", pinfo->fd->num, (srtcp_info)?"s":"", ep_address_to_str(addr), port, other_port, setup_method, setup_frame_number); + printf("#%u: %srtcp_add_address(%s, %u, %u, %s, %u\n", pinfo->fd->num, (srtcp_info)?"s":"", address_to_str(wmem_packet_scope(), addr), port, other_port, setup_method, setup_frame_number); #endif SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); @@ -834,7 +834,7 @@ dissect_rtcp_psfb_remb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_ fci_tree = proto_item_add_subtree( ti, ett_ssrc ); /* Uniquie identifier 'REMB' */ - proto_tree_add_item( fci_tree, hf_rtcp_psfb_remb_fci_identifier, tvb, offset, 4, ENC_BIG_ENDIAN ); + proto_tree_add_item( fci_tree, hf_rtcp_psfb_remb_fci_identifier, tvb, offset, 4, ENC_ASCII|ENC_NA ); offset += 4; /* Number of ssrcs - they will each be parsed below */ @@ -2341,7 +2341,7 @@ dissect_rtcp_avb( tvbuff_t *tvb, packet_info *pinfo _U_, int offset, proto_tree offset += 4; /* Name (ASCII) */ - proto_tree_add_item( tree, hf_rtcp_name_ascii, tvb, offset, 4, ENC_ASCII ); + proto_tree_add_item( tree, hf_rtcp_name_ascii, tvb, offset, 4, ENC_ASCII|ENC_NA ); offset += 4; /* 32 bit wide @@ -2850,7 +2850,7 @@ static void add_roundtrip_delay_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr /* Report delay in INFO column */ col_append_fstr(pinfo->cinfo, COL_INFO, " (roundtrip delay <-> %s = %dms, using frame %u) ", - ep_address_to_str(&pinfo->net_src), delay, frame); + address_to_str(wmem_packet_scope(), &pinfo->net_src), delay, frame); } static int diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index ab2bf66ce2..dbda73ef60 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -1353,8 +1353,8 @@ get_sccp_assoc(packet_info *pinfo, guint offset, guint32 src_lr, guint32 dst_lr, if (assoc) return assoc; - opck = opc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)opc->data) : g_str_hash(ep_address_to_str(opc)); - dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)dpc->data) : g_str_hash(ep_address_to_str(dpc)); + opck = opc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)opc->data) : g_str_hash(address_to_str(wmem_packet_scope(), opc)); + dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)dpc->data) : g_str_hash(address_to_str(wmem_packet_scope(), dpc)); switch (msg_type) { diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 25e252efec..796e0845b0 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3679,7 +3679,7 @@ ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree dummy.port = port = pinfo->destport; } ssl_debug_printf("ssl_find_private_key server %s:%u\n", - ep_address_to_str(&dummy.addr),dummy.port); + address_to_str(wmem_packet_scope(), &dummy.addr),dummy.port); /* try to retrieve private key for this service. Do it now 'cause pinfo * is not always available @@ -4212,7 +4212,7 @@ ssl_parse_key_list(const ssldecrypt_assoc_t * uats, GHashTable *key_hash, GTree* } ssl_debug_printf("ssl_init %s addr '%s' (%s) port '%d' filename '%s' password(only for p12 file) '%s'\n", - (addr_type[at] == AT_IPv4) ? "IPv4" : "IPv6", uats->ipaddr, ep_address_to_str(&service->addr), + (addr_type[at] == AT_IPv4) ? "IPv4" : "IPv6", uats->ipaddr, address_to_str(wmem_packet_scope(), &service->addr), service->port, uats->keyfile, uats->password); ssl_debug_printf("ssl_init private key file %s successfully loaded.\n", uats->keyfile); diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 09aacfb624..40b28b8631 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -435,8 +435,8 @@ sua_assoc(packet_info* pinfo, address* opc, address* dpc, guint src_rn, guint ds return &no_sua_assoc; } - opck = opc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)opc->data) : g_str_hash(ep_address_to_str(opc)); - dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)dpc->data) : g_str_hash(ep_address_to_str(dpc)); + opck = opc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)opc->data) : g_str_hash(address_to_str(wmem_packet_scope(), opc)); + dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((const mtp3_addr_pc_t *)dpc->data) : g_str_hash(address_to_str(wmem_packet_scope(), dpc)); switch (message_type) { case MESSAGE_TYPE_CORE: diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index a47bf3f0cd..b4c18715af 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -430,7 +430,7 @@ proto_tree_add_tacplus_common_fields( tvbuff_t *tvb, proto_tree *tree, int offs proto_tree_add_uint(tree, hf_tacplus_user_len, tvb, offset, 1, val); if( val ){ - proto_tree_add_item(tree, hf_tacplus_user, tvb, var_off, val, ENC_NA); + proto_tree_add_item(tree, hf_tacplus_user, tvb, var_off, val, ENC_ASCII|ENC_NA); var_off+=val; } offset++; @@ -748,11 +748,11 @@ tacplus_print_key_entry( gpointer data, gpointer user_data ) { tacplus_key_entry *tacplus_data=(tacplus_key_entry *)data; if( user_data ) { - printf("%s:%s=%s\n", ep_address_to_str( tacplus_data->s ), - ep_address_to_str( tacplus_data->c ), tacplus_data->k ); + printf("%s:%s=%s\n", address_to_str(wmem_packet_scope(), tacplus_data->s ), + address_to_str(wmem_packet_scope(), tacplus_data->c ), tacplus_data->k ); } else { - printf("%s:%s\n", ep_address_to_str( tacplus_data->s ), - ep_address_to_str( tacplus_data->c ) ); + printf("%s:%s\n", address_to_str(wmem_packet_scope(), tacplus_data->s ), + address_to_str(wmem_packet_scope(), tacplus_data->c ) ); } } #endif diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 2d851edfe2..b4cfd67d74 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -2281,8 +2281,8 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); @@ -2290,7 +2290,7 @@ tcaphash_begin_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #ifdef DEBUG_TCAPSRT dbg(10,"\n Hbegin #%u ", pinfo->fd->num); dbg(11,"key %lx ",tcaphash_begin_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx \n",tcaphash_begin_key.tid); #endif @@ -2476,14 +2476,14 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_cont_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_cont_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_cont_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_cont_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_cont_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_cont_key.hashKey=tcaphash_cont_calchash(&tcaphash_cont_key); #ifdef DEBUG_TCAPSRT dbg(11,"Ckey %lx ", tcaphash_cont_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx %lx \n",tcaphash_cont_key.src_tid, tcaphash_cont_key.dst_tid); #endif p_tcaphash_contcall = find_tcaphash_cont(&tcaphash_cont_key, pinfo); @@ -2505,14 +2505,14 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); #ifdef DEBUG_TCAPSRT dbg(11,"Bkey %lx ", tcaphash_begin_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx \n",tcaphash_begin_key.tid); #endif p_tcaphash_begincall = find_tcaphash_begin(&tcaphash_begin_key, pinfo, FALSE); @@ -2545,8 +2545,8 @@ tcaphash_cont_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_end_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_end_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_end_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_end_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key); @@ -2616,14 +2616,14 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_end_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_end_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_end_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_end_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_end_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_end_key.hashKey=tcaphash_end_calchash(&tcaphash_end_key); #ifdef DEBUG_TCAPSRT dbg(11,"Ekey %lx ",tcaphash_end_key.hashKey); - dbg(11,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(11,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx ",tcaphash_end_key.tid); #endif p_tcaphash_endcall = find_tcaphash_end(&tcaphash_end_key, pinfo,TRUE); @@ -2640,14 +2640,14 @@ tcaphash_end_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_begin_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_begin_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_begin_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_begin_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_begin_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_begin_key.hashKey=tcaphash_begin_calchash(&tcaphash_begin_key); #ifdef DEBUG_TCAPSRT dbg(11,"Bkey %lx ", tcaphash_begin_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx ",tcaphash_begin_key.tid); #endif p_tcaphash_begincall = find_tcaphash_begin(&tcaphash_begin_key, pinfo,FALSE); @@ -2739,8 +2739,8 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tcaphash_ansi_key.dpc_hash = mtp3_pc_hash((const mtp3_addr_pc_t *)pinfo->dst.data); } else { /* Don't have MTP3 PCs (maybe we're over SUA?) */ - tcaphash_ansi_key.opc_hash = g_str_hash(ep_address_to_str(&pinfo->src)); - tcaphash_ansi_key.dpc_hash = g_str_hash(ep_address_to_str(&pinfo->dst)); + tcaphash_ansi_key.opc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->src)); + tcaphash_ansi_key.dpc_hash = g_str_hash(address_to_str(wmem_packet_scope(), &pinfo->dst)); } tcaphash_ansi_key.hashKey=tcaphash_ansi_calchash(&tcaphash_ansi_key); @@ -2748,7 +2748,7 @@ tcaphash_ansi_matching(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #ifdef DEBUG_TCAPSRT dbg(10,"\n Hansi #%u ", pinfo->fd->num); dbg(11,"key %lx ",tcaphash_ansi_key.hashKey); - dbg(51,"PC %s %s ",ep_address_to_str(&pinfo->src), ep_address_to_str(&pinfo->dst)); + dbg(51,"PC %s %s ",address_to_str(wmem_packet_scope(), &pinfo->src), address_to_str(wmem_packet_scope(), &pinfo->dst)); dbg(51,"Tid %lx ",tcaphash_ansi_key.tid); #endif p_tcaphash_ansicall = (struct tcaphash_ansicall_t *) diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 92568a5ec7..3e2ad8c9a1 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -317,7 +317,7 @@ dissect_vuze_dht_address(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, offset += ip_length; proto_tree_add_item(sub_tree, hf_vuze_dht_address_port, tvb, offset, TL_SHORT, ENC_BIG_ENDIAN); - proto_item_append_text( ti, "%s:%d", ep_address_to_str( &addr ), tvb_get_ntohs(tvb,offset) ); + proto_item_append_text( ti, "%s:%d", address_to_str(wmem_packet_scope(), &addr ), tvb_get_ntohs(tvb,offset) ); offset += TL_SHORT; return offset; |