Add parsertab.pyc in clean target

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

diff --git a/tap-iousers.c b/tap-iousers.c
index f20137e816b80f83703139ac3255250b8b9f899f..d7c779b981bd8456d9bcce74bd55b4fdd1e84eaf 100644 (file)
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -37,6 +37,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
 #include "register.h"
 #include <epan/dissectors/packet-ip.h>
 #include <epan/dissectors/packet-ipx.h>
@@ -47,10 +48,9 @@
 #include <epan/dissectors/packet-tr.h>
 #include <epan/dissectors/packet-fc.h>
 #include <epan/dissectors/packet-fddi.h>
-#include <string.h>
 
 typedef struct _io_users_t {
-       char *type;
+       const char *type;
        char *filter;
        struct _io_users_item_t *items;
 } io_users_t;
@@ -79,20 +79,20 @@ iousers_udpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 
        if(udph->uh_sport>udph->uh_dport){
                direction=0;
-               snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               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));
        } else if(udph->uh_sport<udph->uh_dport){
                direction=1;
-               snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               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));
        } else if(CMP_ADDRESS(&udph->ip_src, &udph->ip_dst)>0){
                direction=0;
-               snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               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));
        } else {
                direction=1;
-               snprintf(name2,256,"%s:%s",address_to_str(&udph->ip_src),get_udp_port(udph->uh_sport));
-               snprintf(name1,256,"%s:%s",address_to_str(&udph->ip_dst),get_udp_port(udph->uh_dport));
+               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));
        }
 
        for(iui=iu->items;iui;iui=iui->next){
@@ -137,21 +137,21 @@ iousers_sctp_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, cons
        io_users_item_t *iui;
        int direction=0;
 
-       sprintf(s_sport,"%d",sctph->sport);
-       sprintf(s_dport,"%d",sctph->dport);
+       g_snprintf(s_sport, sizeof s_sport, "%d",sctph->sport);
+       g_snprintf(s_dport, sizeof s_dport, "%d",sctph->dport);
        
        if(sctph->sport > sctph->dport) {
                direction=0;
-               snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);     
-               snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);     
+               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);   
        } else if(sctph->sport < sctph->dport) {
                direction=1;
-               snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);     
-               snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);     
+               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);   
        } else {
                direction=0;
-               snprintf(name1,256,"%s:%s",address_to_str(&sctph->ip_src),s_sport);     
-               snprintf(name2,256,"%s:%s",address_to_str(&sctph->ip_dst),s_dport);     
+               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);   
        }
 
        for(iui=iu->items;iui;iui=iui->next){
@@ -198,20 +198,20 @@ iousers_tcpip_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 
        if(tcph->th_sport>tcph->th_dport){
                direction=0;
-               snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               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));
        } else if(tcph->th_sport<tcph->th_dport){
                direction=1;
-               snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               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));
        } else if(CMP_ADDRESS(&tcph->ip_src, &tcph->ip_dst)>0){
                direction=0;
-               snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               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));
        } else {
                direction=1;
-               snprintf(name2,256,"%s:%s",address_to_str(&tcph->ip_src),get_tcp_port(tcph->th_sport));
-               snprintf(name1,256,"%s:%s",address_to_str(&tcph->ip_dst),get_tcp_port(tcph->th_dport));
+               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));
        }
 
        for(iui=iu->items;iui;iui=iui->next){
@@ -579,10 +579,10 @@ iousers_draw(void *arg)
 }
 
 void
-iousers_init(char *optarg)
+iousers_init(const char *optarg, void* userdata _U_)
 {
-       char *filter=NULL;
-       char *tap_type, *tap_type_name;
+       const char *filter=NULL;
+       const char *tap_type, *tap_type_name;
        tap_packet_cb packet_func;
        io_users_t *iu=NULL;
        GString *error_string;
@@ -710,5 +710,5 @@ iousers_init(char *optarg)
 void
 register_tap_listener_iousers(void)
 {
-       register_tap_listener_cmd_arg("conv,", iousers_init);
+       register_stat_cmd_arg("conv,", iousers_init, NULL);
 }