the flags are FT_BOOLEAN not FT_UINT8

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

diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c
old mode 100755 (executable)
new mode 100644 (file)
index 97f5409..d9db414
--- 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
@@ -35,10 +35,11 @@
 
 #include <string.h>
 #include "epan/packet_info.h"
-#include "tap.h"
+#include <epan/tap.h>
+#include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
 #include "register.h"
-#include "packet-h225.h"
+#include <epan/dissectors/packet-h225.h>
 #include "timestats.h"
 
 /* following values represent the size of their valuestring arrays */
@@ -114,10 +115,10 @@ h225rassrt_reset(void *phs)
 }
 
 static int
-h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, void *phi)
+h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi)
 {
        h225rassrt_t *hs=(h225rassrt_t *)phs;
-       h225_packet_info *pi=phi;
+       const h225_packet_info *pi=phi;
 
        ras_type rasmsg_type = RAS_OTHER;
        ras_category rascategory = RAS_OTHERS;
@@ -211,17 +212,16 @@ h225rassrt_draw(void *phs)
 
 
 static void
-h225rassrt_init(char *optarg)
+h225rassrt_init(const char *optarg, void* userdata _U_)
 {
        h225rassrt_t *hs;
-       char *filter=NULL;
+       const char *filter=NULL;
        GString *error_string;
 
        if(!strncmp(optarg,"h225,srt,",9)){
                filter=optarg+9;
        } else {
-               filter=g_malloc(1);
-               *filter='\0';
+               filter="";
        }
 
        hs = g_malloc(sizeof(h225rassrt_t));
@@ -236,7 +236,7 @@ h225rassrt_init(char *optarg)
                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 +247,5 @@ h225rassrt_init(char *optarg)
 void
 register_tap_listener_h225rassrt(void)
 {
-       register_ethereal_tap("h225,srt", h225rassrt_init);
+       register_stat_cmd_arg("h225,srt", h225rassrt_init,NULL);
 }