diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/addr_resolv.c | 28 | ||||
-rw-r--r-- | epan/addr_resolv.h | 16 | ||||
-rw-r--r-- | epan/column-utils.c | 6 | ||||
-rw-r--r-- | epan/conversation_table.c | 10 | ||||
-rw-r--r-- | epan/conversation_table.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dccp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-dns.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-dvbci.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-ipmi.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-nt-tpcp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-rx.c | 20 | ||||
-rw-r--r-- | epan/dissectors/packet-sctp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tcp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-udp.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-xmcp.c | 8 |
15 files changed, 71 insertions, 71 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index bbc1d13675..7221ee34b2 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -601,9 +601,9 @@ parse_services_file(const char * path) * unsigned integer to ascii */ static gchar * -ep_utoa(guint port) +wmem_utoa(wmem_allocator_t *allocator, guint port) { - gchar *bp = (gchar *)ep_alloc(MAXNAMELEN); + gchar *bp = (gchar *)wmem_alloc(allocator, MAXNAMELEN); /* XXX, guint32_to_str() ? */ guint32_to_str_buf(port, bp, MAXNAMELEN); @@ -2834,52 +2834,52 @@ manually_resolve_cleanup(void) } gchar * -ep_udp_port_to_display(guint port) +udp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_UDP); -} /* ep_udp_port_to_display */ +} /* udp_port_to_display */ gchar * -ep_dccp_port_to_display(guint port) +dccp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_DCCP); -} /* ep_dccp_port_to_display */ +} /* dccp_port_to_display */ gchar * -ep_tcp_port_to_display(guint port) +tcp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_TCP); -} /* ep_tcp_port_to_display */ +} /* tcp_port_to_display */ gchar * -ep_sctp_port_to_display(guint port) +sctp_port_to_display(wmem_allocator_t *allocator, guint port) { if (!gbl_resolv_flags.transport_name) { - return ep_utoa(port); + return wmem_utoa(allocator, port); } return serv_name_lookup(port, PT_SCTP); -} /* ep_sctp_port_to_display */ +} /* sctp_port_to_display */ const gchar * address_to_display(wmem_allocator_t *allocator, const address *addr) diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 91c273c3ae..23e1c37967 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -109,28 +109,28 @@ extern gchar *g_pipxnets_path; /* Functions in addr_resolv.c */ /* - * ep_udp_port_to_display() returns the port name corresponding to that UDP port, + * udp_port_to_display() returns the port name corresponding to that UDP port, * or the port number as a string if not found. */ -WS_DLL_PUBLIC gchar *ep_udp_port_to_display(guint port); +WS_DLL_PUBLIC gchar *udp_port_to_display(wmem_allocator_t *allocator, guint port); /* - * ep_tcp_port_to_display() returns the port name corresponding to that TCP port, + * tcp_port_to_display() returns the port name corresponding to that TCP port, * or the port number as a string if not found. */ -WS_DLL_PUBLIC gchar *ep_tcp_port_to_display(guint port); +WS_DLL_PUBLIC gchar *tcp_port_to_display(wmem_allocator_t *allocator, guint port); /* - * ep_dccp_port_to_display() returns the port name corresponding to that DCCP port, + * dccp_port_to_display() returns the port name corresponding to that DCCP port, * or the port number as a string if not found. */ -extern gchar *ep_dccp_port_to_display(guint port); +extern gchar *dccp_port_to_display(wmem_allocator_t *allocator, guint port); /* - * ep_sctp_port_to_display() returns the port name corresponding to that SCTP port, + * sctp_port_to_display() returns the port name corresponding to that SCTP port, * or the port number as a string if not found. */ -WS_DLL_PUBLIC gchar *ep_sctp_port_to_display(guint port); +WS_DLL_PUBLIC gchar *sctp_port_to_display(wmem_allocator_t *allocator, guint port); /* * address_to_display takes as input an "address", as defined in address.h */ diff --git a/epan/column-utils.c b/epan/column-utils.c index 41092e8fd2..8d088e0098 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -1946,7 +1946,7 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo switch (pinfo->ptype) { case PT_SCTP: if (is_res) - g_strlcpy(pinfo->cinfo->col_buf[col], ep_sctp_port_to_display(port), COL_MAX_LEN); + g_strlcpy(pinfo->cinfo->col_buf[col], sctp_port_to_display(pinfo->pool, port), COL_MAX_LEN); else guint32_to_str_buf(port, pinfo->cinfo->col_buf[col], COL_MAX_LEN); break; @@ -1954,7 +1954,7 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo case PT_TCP: guint32_to_str_buf(port, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_res) - g_strlcpy(pinfo->cinfo->col_buf[col], ep_tcp_port_to_display(port), COL_MAX_LEN); + g_strlcpy(pinfo->cinfo->col_buf[col], tcp_port_to_display(pinfo->pool, port), COL_MAX_LEN); else g_strlcpy(pinfo->cinfo->col_buf[col], pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_src) @@ -1966,7 +1966,7 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo case PT_UDP: guint32_to_str_buf(port, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_res) - g_strlcpy(pinfo->cinfo->col_buf[col], ep_udp_port_to_display(port), COL_MAX_LEN); + g_strlcpy(pinfo->cinfo->col_buf[col], udp_port_to_display(pinfo->pool, port), COL_MAX_LEN); else g_strlcpy(pinfo->cinfo->col_buf[col], pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_src) diff --git a/epan/conversation_table.c b/epan/conversation_table.c index 283c4e89cc..269ef89988 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -341,20 +341,20 @@ const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, } } -const char *get_conversation_port(guint32 port, port_type ptype, gboolean resolve_names) +const char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names) { if(!resolve_names) ptype = PT_NONE; switch(ptype) { case(PT_TCP): - return ep_tcp_port_to_display(port); + return tcp_port_to_display(allocator, port); case(PT_UDP): - return ep_udp_port_to_display(port); + return udp_port_to_display(allocator, port); case(PT_SCTP): - return ep_sctp_port_to_display(port); + return sctp_port_to_display(allocator, port); default: - return ep_strdup_printf("%d", port); + return wmem_strdup_printf(allocator, "%d", port); } } diff --git a/epan/conversation_table.h b/epan/conversation_table.h index 536a237487..9d277b48cb 100644 --- a/epan/conversation_table.h +++ b/epan/conversation_table.h @@ -266,7 +266,7 @@ WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator, * @param resolve_names Enable name resolution. * @return An ep_allocated string representing the port. */ -WS_DLL_PUBLIC const char *get_conversation_port(guint32 port, port_type ptype, gboolean resolve_names); +WS_DLL_PUBLIC const char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names); /** Get a display filter for the given conversation and direction. * diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index b7f4471bc3..b4a5211e3b 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -650,14 +650,14 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ proto_tree_add_uint_format_value(dccp_tree, hf_dccp_srcport, tvb, offset, 2, dccph->sport, "%s (%u)", - ep_dccp_port_to_display(dccph->sport), + dccp_port_to_display(wmem_packet_scope(), dccph->sport), dccph->sport); if (dccp_summary_in_tree) { proto_item_append_text(dccp_item, ", Src Port: %s (%u)", - ep_dccp_port_to_display(dccph->sport), dccph->sport); + dccp_port_to_display(wmem_packet_scope(), dccph->sport), dccph->sport); } col_add_fstr(pinfo->cinfo, COL_INFO, - "%s ", ep_dccp_port_to_display(dccph->sport)); + "%s ", dccp_port_to_display(wmem_packet_scope(), dccph->sport)); hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_port, tvb, offset, 2, dccph->sport); @@ -668,14 +668,14 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ proto_tree_add_uint_format_value(dccp_tree, hf_dccp_dstport, tvb, offset, 2, dccph->dport, "%s (%u)", - ep_dccp_port_to_display(dccph->dport), + dccp_port_to_display(wmem_packet_scope(), dccph->dport), dccph->dport); if (dccp_summary_in_tree) { proto_item_append_text(dccp_item, ", Dst Port: %s (%u)", - ep_dccp_port_to_display(dccph->dport), dccph->dport); + dccp_port_to_display(wmem_packet_scope(), dccph->dport), dccph->dport); } col_append_fstr(pinfo->cinfo, COL_INFO, " > %s", - ep_dccp_port_to_display(dccph->dport)); + dccp_port_to_display(wmem_packet_scope(), dccph->dport)); hidden_item = proto_tree_add_uint(dccp_tree, hf_dccp_port, tvb, offset, 2, dccph->dport); diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 09e941b5c8..915eae74dc 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -2008,11 +2008,11 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, switch (protocol) { case IP_PROTO_TCP: - wmem_strbuf_append(bitnames, ep_tcp_port_to_display(port_num)); + wmem_strbuf_append(bitnames, tcp_port_to_display(wmem_packet_scope(), port_num)); break; case IP_PROTO_UDP: - wmem_strbuf_append(bitnames, ep_udp_port_to_display(port_num)); + wmem_strbuf_append(bitnames, udp_port_to_display(wmem_packet_scope(), port_num)); break; default: diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 434d99010b..42517ae9cc 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -1888,13 +1888,13 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset, circuit_t *circuit, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; if (port_item) { - if (ip_proto==LSC_TCP && ep_tcp_port_to_display(port)) { + if (ip_proto==LSC_TCP && tcp_port_to_display(wmem_packet_scope(), port)) { proto_item_append_text(port_item, " (%s)", - ep_tcp_port_to_display(port)); + tcp_port_to_display(wmem_packet_scope(), port)); } - else if (ip_proto==LSC_UDP && ep_udp_port_to_display(port)) { + else if (ip_proto==LSC_UDP && udp_port_to_display(wmem_packet_scope(), port)) { proto_item_append_text(port_item, " (%s)", - ep_udp_port_to_display(port)); + udp_port_to_display(wmem_packet_scope(), port)); } } store_lsc_msg_dissector(circuit, ip_proto, port); @@ -1915,13 +1915,13 @@ dissect_conn_desc(tvbuff_t *tvb, gint offset, circuit_t *circuit, hf_dvbci_lsc_dst_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset +=2; if (port_item) { - if (ip_proto==LSC_TCP && ep_tcp_port_to_display(port)) { + if (ip_proto==LSC_TCP && tcp_port_to_display(wmem_packet_scope(), port)) { proto_item_append_text(port_item, " (%s)", - ep_tcp_port_to_display(port)); + tcp_port_to_display(wmem_packet_scope(), port)); } - else if (ip_proto==LSC_UDP && ep_udp_port_to_display(port)) { + else if (ip_proto==LSC_UDP && udp_port_to_display(wmem_packet_scope(), port)) { proto_item_append_text(port_item, " (%s)", - ep_udp_port_to_display(port)); + udp_port_to_display(wmem_packet_scope(), port)); } } store_lsc_msg_dissector(circuit, ip_proto, port); diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index e0bcfcfb53..1a0701adb2 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1277,7 +1277,7 @@ ipmi_fmt_channel(gchar *s, guint32 v) void ipmi_fmt_udpport(gchar *s, guint32 v) { - g_snprintf(s, ITEM_LABEL_LENGTH, "%s (%d)", ep_udp_port_to_display(v), v); + g_snprintf(s, ITEM_LABEL_LENGTH, "%s (%d)", udp_port_to_display(wmem_packet_scope(), v), v); } void diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index a3b9af761c..b24f643b85 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -25,7 +25,7 @@ #include <epan/packet.h> -#include <epan/addr_resolv.h> /* this is for get_hostname and ep_udp_port_to_display */ +#include <epan/addr_resolv.h> /* this is for get_hostname and udp_port_to_display */ void proto_register_tpcp(void); void proto_reg_handoff_tpcp(void); @@ -141,7 +141,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ cport = tvb_get_ntohs(tvb, 6); proto_tree_add_uint_format_value(tpcp_tree, hf_tpcp_cport, tvb, 6, 2, cport, - "%s", ep_udp_port_to_display(cport)); + "%s", udp_port_to_display(wmem_packet_scope(), cport)); proto_tree_add_item(tpcp_tree, hf_tpcp_caddr, tvb, 8, 4, ENC_BIG_ENDIAN); proto_tree_add_item(tpcp_tree, hf_tpcp_saddr, tvb, 12, 4, ENC_BIG_ENDIAN); @@ -155,7 +155,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ col_add_fstr(pinfo->cinfo, COL_INFO,"%s id %d CPort %s CIP %s SIP %s", val_to_str_const(type, type_vals, "Unknown"), id, - ep_udp_port_to_display(cport), + udp_port_to_display(wmem_packet_scope(), cport), tvb_ip_to_str(tvb, 8), tvb_ip_to_str(tvb, 12)); diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 39c24b3103..0ac7b255ac 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -203,8 +203,8 @@ dissect_rx_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, "Destination Port: %s ", (unsigned long)seq, (unsigned long)callnumber, - ep_udp_port_to_display(pinfo->srcport), - ep_udp_port_to_display(pinfo->destport) + udp_port_to_display(wmem_packet_scope(), pinfo->srcport), + udp_port_to_display(wmem_packet_scope(), pinfo->destport) ); item = proto_tree_add_item(parent_tree, hf_rx_response, tvb, offset, -1, ENC_NA); @@ -255,8 +255,8 @@ dissect_rx_abort(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int "Destination Port: %s ", (unsigned long)seq, (unsigned long)callnumber, - ep_udp_port_to_display(pinfo->srcport), - ep_udp_port_to_display(pinfo->destport) + udp_port_to_display(wmem_packet_scope(), pinfo->srcport), + udp_port_to_display(wmem_packet_scope(), pinfo->destport) ); item = proto_tree_add_item(parent_tree, hf_rx_abort, tvb, offset, -1, ENC_NA); @@ -287,8 +287,8 @@ dissect_rx_challenge(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, "Destination Port: %s ", (unsigned long)seq, (unsigned long)callnumber, - ep_udp_port_to_display(pinfo->srcport), - ep_udp_port_to_display(pinfo->destport) + udp_port_to_display(wmem_packet_scope(), pinfo->srcport), + udp_port_to_display(wmem_packet_scope(), pinfo->destport) ); item = proto_tree_add_item(parent_tree, hf_rx_challenge, tvb, offset, -1, ENC_NA); @@ -327,8 +327,8 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int "Destination Port: %s ", (unsigned long)seq, (unsigned long)callnumber, - ep_udp_port_to_display(pinfo->srcport), - ep_udp_port_to_display(pinfo->destport) + udp_port_to_display(wmem_packet_scope(), pinfo->srcport), + udp_port_to_display(wmem_packet_scope(), pinfo->destport) ); item = proto_tree_add_item(parent_tree, hf_rx_ack, tvb, offset, -1, ENC_NA); @@ -539,8 +539,8 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *dat "Destination Port: %s ", (unsigned long)seq, (unsigned long)callnumber, - ep_udp_port_to_display(pinfo->srcport), - ep_udp_port_to_display(pinfo->destport) + udp_port_to_display(wmem_packet_scope(), pinfo->srcport), + udp_port_to_display(wmem_packet_scope(), pinfo->destport) ); break; case RX_PACKET_TYPE_CHALLENGE: diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index f5e2c88336..3e3e65bb68 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -4501,8 +4501,8 @@ dissect_sctp_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea if (show_port_numbers) sctp_item = proto_tree_add_protocol_format(tree, proto_sctp, tvb, 0, -1, "Stream Control Transmission Protocol, Src Port: %s (%u), Dst Port: %s (%u)", - ep_sctp_port_to_display(source_port), source_port, - ep_sctp_port_to_display(destination_port), destination_port); + sctp_port_to_display(wmem_packet_scope(), source_port), source_port, + sctp_port_to_display(wmem_packet_scope(), destination_port), destination_port); else sctp_item = proto_tree_add_item(tree, proto_sctp, tvb, 0, -1, ENC_NA); diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 71b28c76e5..b8dbeea2d5 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -4355,8 +4355,8 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tcph->th_sport = tvb_get_ntohs(tvb, offset); tcph->th_dport = tvb_get_ntohs(tvb, offset + 2); - src_port_str = ep_tcp_port_to_display(tcph->th_sport); - dst_port_str = ep_tcp_port_to_display(tcph->th_dport); + src_port_str = tcp_port_to_display(wmem_packet_scope(), tcph->th_sport); + dst_port_str = tcp_port_to_display(wmem_packet_scope(), tcph->th_dport); col_add_lstr(pinfo->cinfo, COL_INFO, src_port_str, "\xe2\x86\x92", /* UTF8_RIGHTWARDS_ARROW */ diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index 02cc1fb8f1..d7c51af450 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -581,8 +581,8 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) udph->uh_sport=tvb_get_ntohs(tvb, offset); udph->uh_dport=tvb_get_ntohs(tvb, offset+2); - src_port_str = ep_udp_port_to_display(udph->uh_sport); - dst_port_str = ep_udp_port_to_display(udph->uh_dport); + src_port_str = udp_port_to_display(wmem_packet_scope(), udph->uh_sport); + dst_port_str = udp_port_to_display(wmem_packet_scope(), udph->uh_dport); col_add_lstr(pinfo->cinfo, COL_INFO, "Source port: ", src_port_str, " " diff --git a/epan/dissectors/packet-xmcp.c b/epan/dissectors/packet-xmcp.c index 57cf6d98d8..73d0645dc8 100644 --- a/epan/dissectors/packet-xmcp.c +++ b/epan/dissectors/packet-xmcp.c @@ -404,19 +404,19 @@ add_xmcp_port_name (void) switch(xmcp_service_protocol) { case IP_PROTO_TCP: proto_item_append_text(xmcp_it_service_port, " (TCP: %s)", - ep_tcp_port_to_display(xmcp_service_port)); + tcp_port_to_display(wmem_packet_scope(), xmcp_service_port)); break; case IP_PROTO_UDP: proto_item_append_text(xmcp_it_service_port, " (UDP: %s)", - ep_udp_port_to_display(xmcp_service_port)); + udp_port_to_display(wmem_packet_scope(), xmcp_service_port)); break; case IP_PROTO_DCCP: proto_item_append_text(xmcp_it_service_port, " (DCCP: %s)", - ep_dccp_port_to_display(xmcp_service_port)); + dccp_port_to_display(wmem_packet_scope(), xmcp_service_port)); break; case IP_PROTO_SCTP: proto_item_append_text(xmcp_it_service_port, " (SCTP: %s)", - ep_sctp_port_to_display(xmcp_service_port)); + sctp_port_to_display(wmem_packet_scope(), xmcp_service_port)); break; default: break; |