Apply r30376 to asn1 template files.

[metze/wireshark/wip.git] / tap-iousers.c

diff --git a/tap-iousers.c b/tap-iousers.c
index ced4eb814ebcb1724e0ac31f2cf73f2de8bca12a..d25417e23a0f7b640ddcd7251c9d08086a642349 100644 (file)
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -35,7 +35,6 @@
 #include <string.h>
 #include <epan/packet_info.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/addr_resolv.h>
 #include <epan/tap.h>
 #include <epan/conversation.h>
@@ -82,20 +81,20 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 
        if(udph->uh_sport>udph->uh_dport){
                direction=0;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
        } else if(udph->uh_sport<udph->uh_dport){
                direction=1;
-               g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
        } else if(CMP_ADDRESS(&udph->ip_src, &udph->ip_dst)>0){
                direction=0;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
        } else {
                direction=1;
-               g_snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               g_snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
        }
 
        for(iui=iu->items;iui;iui=iui->next){
@@ -110,9 +109,9 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
                iui->next=iu->items;
                iu->items=iui;
 /*             iui->addr1=NULL;*/
-               iui->name1=strdup(name1);
+               iui->name1=g_strdup(name1);
 /*             iui->addr2=NULL;*/
-               iui->name2=strdup(name2);
+               iui->name2=g_strdup(name2);
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -145,16 +144,16 @@ iousers_sctp_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons
 
        if(sctph->sport > sctph->dport) {
                direction=0;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);
-               g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&sctph->ip_src),s_sport);
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&sctph->ip_dst),s_dport);
        } else if(sctph->sport < sctph->dport) {
                direction=1;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);
-               g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&sctph->ip_src),s_sport);
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&sctph->ip_dst),s_dport);
        } else {
                direction=0;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);
-               g_snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&sctph->ip_src),s_sport);
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&sctph->ip_dst),s_dport);
        }
 
        for(iui=iu->items;iui;iui=iui->next){
@@ -169,9 +168,9 @@ iousers_sctp_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons
                 iui->next=iu->items;
                 iu->items=iui;
 /*              iui->addr1=NULL;*/
-                iui->name1=strdup(name1);
+                iui->name1=g_strdup(name1);
 /*              iui->addr2=NULL;*/
-                iui->name2=strdup(name2);
+                iui->name2=g_strdup(name2);
                 iui->frames1=0;
                 iui->frames2=0;
                 iui->bytes1=0;
@@ -201,20 +200,20 @@ iousers_tcpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 
        if(tcph->th_sport>tcph->th_dport){
                direction=0;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
        } else if(tcph->th_sport<tcph->th_dport){
                direction=1;
-               g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
        } else if(CMP_ADDRESS(&tcph->ip_src, &tcph->ip_dst)>0){
                direction=0;
-               g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
        } else {
                direction=1;
-               g_snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               g_snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               g_snprintf(name2,256,"%s:%s",ep_address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
+               g_snprintf(name1,256,"%s:%s",ep_address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
        }
 
        for(iui=iu->items;iui;iui=iui->next){
@@ -229,9 +228,9 @@ iousers_tcpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
                iui->next=iu->items;
                iu->items=iui;
 /*             iui->addr1=NULL;*/
-               iui->name1=strdup(name1);
+               iui->name1=g_strdup(name1);
 /*             iui->addr2=NULL;*/
-               iui->name2=strdup(name2);
+               iui->name2=g_strdup(name2);
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -254,7 +253,7 @@ static int
 iousers_ip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
 {
        io_users_t *iu=arg;
-       const e_ip *iph=vip;
+       const ws_ip *iph=vip;
        const address *addr1, *addr2;
        io_users_item_t *iui;
 
@@ -278,9 +277,9 @@ iousers_ip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
                iui->next=iu->items;
                iu->items=iui;
                COPY_ADDRESS(&iui->addr1, addr1);
-               iui->name1=strdup(address_to_str(addr1));
+               iui->name1=g_strdup(ep_address_to_str(addr1));
                COPY_ADDRESS(&iui->addr2, addr2);
-               iui->name2=strdup(address_to_str(addr2));
+               iui->name2=g_strdup(ep_address_to_str(addr2));
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -326,9 +325,9 @@ iousers_ipx_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
                iui->next=iu->items;
                iu->items=iui;
                COPY_ADDRESS(&iui->addr1, addr1);
-               iui->name1=strdup(address_to_str(addr1));
+               iui->name1=g_strdup(ep_address_to_str(addr1));
                COPY_ADDRESS(&iui->addr2, addr2);
-               iui->name2=strdup(address_to_str(addr2));
+               iui->name2=g_strdup(ep_address_to_str(addr2));
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -374,9 +373,9 @@ iousers_fc_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
                iui->next=iu->items;
                iu->items=iui;
                COPY_ADDRESS(&iui->addr1, addr1);
-               iui->name1=strdup(address_to_str(addr1));
+               iui->name1=g_strdup(ep_address_to_str(addr1));
                COPY_ADDRESS(&iui->addr2, addr2);
-               iui->name2=strdup(address_to_str(addr2));
+               iui->name2=g_strdup(ep_address_to_str(addr2));
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -422,9 +421,9 @@ iousers_eth_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
                iui->next=iu->items;
                iu->items=iui;
                COPY_ADDRESS(&iui->addr1, addr1);
-               iui->name1=strdup(address_to_str(addr1));
+               iui->name1=g_strdup(ep_address_to_str(addr1));
                COPY_ADDRESS(&iui->addr2, addr2);
-               iui->name2=strdup(address_to_str(addr2));
+               iui->name2=g_strdup(ep_address_to_str(addr2));
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -470,9 +469,9 @@ iousers_fddi_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons
                iui->next=iu->items;
                iu->items=iui;
                COPY_ADDRESS(&iui->addr1, addr1);
-               iui->name1=strdup(address_to_str(addr1));
+               iui->name1=g_strdup(ep_address_to_str(addr1));
                COPY_ADDRESS(&iui->addr2, addr2);
-               iui->name2=strdup(address_to_str(addr2));
+               iui->name2=g_strdup(ep_address_to_str(addr2));
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -518,9 +517,9 @@ iousers_tr_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
                iui->next=iu->items;
                iu->items=iui;
                COPY_ADDRESS(&iui->addr1, addr1);
-               iui->name1=strdup(address_to_str(addr1));
+               iui->name1=g_strdup(ep_address_to_str(addr1));
                COPY_ADDRESS(&iui->addr2, addr2);
-               iui->name2=strdup(address_to_str(addr2));
+               iui->name2=g_strdup(ep_address_to_str(addr2));
                iui->frames1=0;
                iui->frames2=0;
                iui->bytes1=0;
@@ -581,7 +580,7 @@ iousers_draw(void *arg)
        printf("================================================================================\n");
 }
 
-void
+static void
 iousers_init(const char *optarg, void* userdata _U_)
 {
        const char *filter=NULL;
@@ -691,12 +690,12 @@ iousers_init(const char *optarg, void* userdata _U_)
        iu->items=NULL;
        iu->type=tap_type_name;
        if(filter){
-               iu->filter=strdup(filter);
+               iu->filter=g_strdup(filter);
        } else {
                iu->filter=NULL;
        }
 
-       error_string=register_tap_listener(tap_type, iu, filter, NULL, packet_func, iousers_draw);
+       error_string=register_tap_listener(tap_type, iu, filter, 0, NULL, packet_func, iousers_draw);
        if(error_string){
                if(iu->items){
                        g_free(iu->items);