As suggested by Anders: back out 37112.

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

diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c
index 4f6e79425ba6e41982f7f5c7a9766363c96fcfe1..a0c6d8e37e85c82e4dd759a81640e3c3dc574bc8 100644 (file)
--- a/tap-h225rassrt.c
+++ b/tap-h225rassrt.c
@@ -1,11 +1,11 @@
 /* tap_h225rassrt.c
- * h225 RAS Service Response Time statistics for ethereal
+ * h225 RAS Service Response Time statistics for wireshark
  * Copyright 2003 Lars Roland
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -34,11 +34,11 @@
 #endif
 
 #include <string.h>
+#include "epan/packet.h"
 #include "epan/packet_info.h"
 #include <epan/tap.h>
-#include <epan/stat.h>
+#include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
-#include "register.h"
 #include <epan/dissectors/packet-h225.h>
 #include "timestats.h"
 
@@ -168,7 +168,6 @@ h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, co
 
        default:
                return 0;
-               break;
        }
        return 1;
 }
@@ -212,31 +211,27 @@ h225rassrt_draw(void *phs)
 
 
 static void
-h225rassrt_init(const char *optarg)
+h225rassrt_init(const char *optarg, void* userdata _U_)
 {
        h225rassrt_t *hs;
-       const char *filter=NULL;
        GString *error_string;
 
+       hs = g_malloc(sizeof(h225rassrt_t));
        if(!strncmp(optarg,"h225,srt,",9)){
-               filter=optarg+9;
+               hs->filter=g_strdup(optarg+9);
        } else {
-               filter="";
+               hs->filter=NULL;
        }
 
-       hs = g_malloc(sizeof(h225rassrt_t));
-       hs->filter=g_malloc(strlen(filter)+1);
-       strcpy(hs->filter, filter);
-
        h225rassrt_reset(hs);
 
-       error_string=register_tap_listener("h225", hs, filter, NULL, h225rassrt_packet, h225rassrt_draw);
+       error_string=register_tap_listener("h225", hs, hs->filter, 0, NULL, h225rassrt_packet, h225rassrt_draw);
        if(error_string){
                /* error, we failed to attach to the tap. clean up */
                g_free(hs->filter);
                g_free(hs);
 
-               fprintf(stderr, "tethereal: Couldn't register h225,srt tap: %s\n",
+               fprintf(stderr, "tshark: Couldn't register h225,srt tap: %s\n",
                    error_string->str);
                g_string_free(error_string, TRUE);
                exit(1);
@@ -247,5 +242,5 @@ h225rassrt_init(const char *optarg)
 void
 register_tap_listener_h225rassrt(void)
 {
-       register_stat_cmd_arg("h225,srt", h225rassrt_init);
+       register_stat_cmd_arg("h225,srt", h225rassrt_init,NULL);
 }