diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
| commit | 8c48c6835fbfada96d2197bcbc7a87023bfc8291 (patch) | |
| tree | 2a60509a6637549f370b63ce3b27a3de8f9736d8 /plugins/stats_tree | |
| parent | d6b920b8f6b22548e3828258ea11b2443af89ce4 (diff) | |
| download | wireshark-8c48c6835fbfada96d2197bcbc7a87023bfc8291.tar.gz | |
Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().
svn path=/trunk/; revision=29747
Diffstat (limited to 'plugins/stats_tree')
| -rw-r--r-- | plugins/stats_tree/pinfo_stats_tree.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index b41583d531..adcca0f38c 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -54,14 +54,14 @@ static int st_node_ip = -1; static const gchar* st_str_ip = "IP Addresses"; static void ip_hosts_stats_tree_init(stats_tree* st) { - st_node_ip = stats_tree_create_node(st, st_str_ip, 0, TRUE); + st_node_ip = stats_tree_create_node(st, st_str_ip, 0, TRUE); } static int ip_hosts_stats_tree_packet(stats_tree *st , packet_info *pinfo, epan_dissect_t *edt _U_, const void *p _U_) { tick_stat_node(st, st_str_ip, 0, FALSE); - tick_stat_node(st, address_to_str(&pinfo->net_src), st_node_ip, FALSE); - tick_stat_node(st, address_to_str(&pinfo->net_dst), st_node_ip, FALSE); - + tick_stat_node(st, ep_address_to_str(&pinfo->net_src), st_node_ip, FALSE); + tick_stat_node(st, ep_address_to_str(&pinfo->net_dst), st_node_ip, FALSE); + return 1; } @@ -75,15 +75,15 @@ static void ptype_stats_tree_init(stats_tree* st) { static int ptype_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) { const gchar* ptype; - + ptype = port_type_to_str(pinfo->ptype); stats_tree_tick_pivot(st,st_node_ptype,ptype); - + return 1; } -/* packet length stats_tree -- test range node */ +/* packet length stats_tree -- test range node */ static int st_node_plen = -1; static const gchar* st_str_plen = "Packet Lengths"; @@ -94,7 +94,7 @@ static void plen_stats_tree_init(stats_tree* st) { static int plen_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) { tick_stat_node(st, st_str_plen, 0, FALSE); stats_tree_tick_range(st, st_str_plen, 0, pinfo->fd->pkt_len); - + return 1; } @@ -108,23 +108,23 @@ static int st_node_dsts = -1; static const gchar* st_str_dsts = "IP Destinations"; static void dsts_stats_tree_init(stats_tree* st) { - st_node_dsts = stats_tree_create_node(st, st_str_dsts, 0, TRUE); + st_node_dsts = stats_tree_create_node(st, st_str_dsts, 0, TRUE); } static int dsts_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t *edt _U_, const void *p _U_) { static gchar str[128]; int ip_dst_node; int proto_node; - + tick_stat_node(st, st_str_dsts, 0, FALSE); - - ip_dst_node = tick_stat_node(st, address_to_str(&pinfo->net_src), st_node_dsts, TRUE); - + + ip_dst_node = tick_stat_node(st, ep_address_to_str(&pinfo->net_src), st_node_dsts, TRUE); + proto_node = tick_stat_node(st,port_type_to_str(pinfo->ptype),ip_dst_node,TRUE); g_snprintf(str, sizeof(str),"%u",pinfo->destport); tick_stat_node(st,str,proto_node,TRUE); - + return 1; } @@ -135,4 +135,4 @@ void register_pinfo_stat_trees(void) { stats_tree_register_with_group("frame","plen",st_str_plen, 0, plen_stats_tree_packet, plen_stats_tree_init, NULL, REGISTER_STAT_GROUP_GENERIC ); stats_tree_register("ip","dests",st_str_dsts, 0, dsts_stats_tree_packet, dsts_stats_tree_init, NULL ); } - + |