diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/stats_tree/pinfo_stats_tree.c | 4 | ||||
| -rw-r--r-- | plugins/transum/packet-transum.c | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index c1ce818083..b8eb54b7c1 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -60,7 +60,7 @@ static void *uat_plen_record_copy_cb(void *n, const void *o, size_t siz _U_) { uat_plen_record_t *rn = (uat_plen_record_t *)n; if (r->packet_range) - rn->packet_range = range_copy(r->packet_range); + rn->packet_range = range_copy(NULL, r->packet_range); return n; } @@ -82,7 +82,7 @@ static void uat_plen_record_free_cb(void*r) { uat_plen_record_t *record = (uat_plen_record_t*)r; if (record->packet_range) - g_free(record->packet_range); + wmem_free(NULL, record->packet_range); } static void uat_plen_record_post_update_cb(void) { diff --git a/plugins/transum/packet-transum.c b/plugins/transum/packet-transum.c index 08e5169471..18f2ab25e5 100644 --- a/plugins/transum/packet-transum.c +++ b/plugins/transum/packet-transum.c @@ -1128,21 +1128,8 @@ proto_register_transum(void) preferences.capture_position = TRACE_CAP_CLIENT; preferences.reassembly = TRUE; - tcp_svc_port_range_values = (range_t *)g_malloc((sizeof(guint) + (4 * sizeof(range_admin_t)))); - tcp_svc_port_range_values->nranges = 4; - tcp_svc_port_range_values->ranges[0].low = 25; - tcp_svc_port_range_values->ranges[0].high = 25; - tcp_svc_port_range_values->ranges[1].low = 80; - tcp_svc_port_range_values->ranges[1].high = 80; - tcp_svc_port_range_values->ranges[2].low = 443; - tcp_svc_port_range_values->ranges[2].high = 443; - tcp_svc_port_range_values->ranges[3].low = 1433; - tcp_svc_port_range_values->ranges[3].high = 1433; - - udp_svc_port_range_values = (range_t *)g_malloc((sizeof(guint) + (1 * sizeof(range_admin_t)))); - udp_svc_port_range_values->nranges = 1; - udp_svc_port_range_values->ranges[0].low = 137; - udp_svc_port_range_values->ranges[0].high = 139; + range_convert_str(wmem_epan_scope(), &tcp_svc_port_range_values, "25, 80, 443, 1433", MAX_TCP_PORT); + range_convert_str(wmem_epan_scope(), &udp_svc_port_range_values, "137-139", MAX_UDP_PORT); preferences.orphan_ka_discard = FALSE; preferences.time_multiplier = RTE_TIME_SEC; |