Convert Camel tap stats to new "generic stat API".

Migrate the Camel stats similar to the recent BOOTP and H.225
migrations.

Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb
Reviewed-on: https://code.wireshark.org/review/9865
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

7 files changed, 10 insertions, 391 deletions

diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common
index 4b0f78ad17..cdaa354f1e 100644
--- a/ui/cli/Makefile.common
+++ b/ui/cli/Makefile.common
@@ -38,7 +38,6 @@ GENERATOR_FILES =
 
 # sources for TShark taps
 TSHARK_TAP_SRC = \
-	tap-camelcounter.c	\
 	tap-camelsrt.c		\
 	tap-comparestat.c	\
 	tap-diameter-avp.c	\
diff --git a/ui/cli/tap-camelcounter.c b/ui/cli/tap-camelcounter.c
deleted file mode 100644
index 6013a1e772..0000000000
--- a/ui/cli/tap-camelcounter.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* tap_camelcounter.c
- * camel message counter for tshark
- * Copyright 2006 Florent DROUIN
- *
- * This part of code is extracted from tap-h225counter.c from Lars Roland
- *
- * 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
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "epan/packet.h"
-#include "epan/tap.h"
-#include "epan/value_string.h"
-#include "epan/stat_tap_ui.h"
-#include "epan/dissectors/packet-camel.h"
-
-void register_tap_listener_camelcounter(void);
-
-/* used to keep track of the statistics for an entire program interface */
-struct camelcounter_t {
-  char *filter;
-  guint32 camel_msg[camel_MAX_NUM_OPR_CODES];
-};
-
-
-static void camelcounter_reset(void *phs)
-{
-  struct camelcounter_t * p_counter= ( struct camelcounter_t *) phs;
-  memset(p_counter, 0, sizeof(struct camelcounter_t));
-}
-
-static int camelcounter_packet(void *phs,
-                               packet_info *pinfo _U_,
-                               epan_dissect_t *edt _U_,
-                               const void *phi)
-{
-  struct camelcounter_t * p_counter =(struct camelcounter_t *)phs;
-  const struct camelsrt_info_t * pi = (const struct camelsrt_info_t *)phi;
-  if (pi->opcode != 255)
-    p_counter->camel_msg[pi->opcode]++;
-
-  return 1;
-}
-
-
-static void camelcounter_draw(void *phs)
-{
-  struct camelcounter_t * p_counter= (struct camelcounter_t *)phs;
-  int i;
-  gchar *tmp_str;
-  printf("\n");
-  printf("CAMEL Message and Response Status Counter:\n");
-  printf("------------------------------------------\n");
-
-  for (i=0; i<camel_MAX_NUM_OPR_CODES; i++) {
-    /* Message counter */
-    if (p_counter->camel_msg[i] != 0) {
-      tmp_str = val_to_str_wmem(NULL, i, camel_opr_code_strings, "Unknown message (%d)");
-      printf("%30s ", tmp_str);
-      wmem_free(NULL, tmp_str);
-      printf("%6u\n", p_counter->camel_msg[i]);
-    }
-  } /* Message Type */
-  printf("------------------------------------------\n");
-}
-
-static void camelcounter_init(const char *opt_arg, void *userdata _U_)
-{
-  struct camelcounter_t *p_camelcounter;
-  GString *error_string;
-
-  p_camelcounter = g_new(struct camelcounter_t, 1);
-  if (!strncmp(opt_arg, "camel,counter,", 13)) {
-    p_camelcounter->filter = g_strdup(opt_arg+13);
-  } else {
-    p_camelcounter->filter = NULL;
-  }
-
-  camelcounter_reset(p_camelcounter);
-
-  error_string = register_tap_listener("CAMEL",
-                                     p_camelcounter,
-                                     p_camelcounter->filter,
-                                     0,
-                                     NULL,
-                                     camelcounter_packet,
-                                     camelcounter_draw);
-
-  if (error_string) {
-    /* error, we failed to attach to the tap. clean up */
-    g_free(p_camelcounter->filter);
-    g_free(p_camelcounter);
-
-    fprintf(stderr, "tshark: Couldn't register camel,counter tap: %s\n",
-            error_string->str);
-    g_string_free(error_string, TRUE);
-    exit(1);
-  }
-}
-
-static stat_tap_ui camelcounter_ui = {
-  REGISTER_STAT_GROUP_GENERIC,
-  NULL,
-  "camel,counter",
-  camelcounter_init,
-  0,
-  NULL
-};
-
-void  /* Next line mandatory */
-register_tap_listener_camelcounter(void)
-{
-  register_stat_tap_ui(&camelcounter_ui, NULL);
-}
-
-/*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
- *
- * Local Variables:
- * c-basic-offset: 2
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * ex: set shiftwidth=2 tabstop=8 expandtab:
- * :indentSize=2:tabSize=8:noTabs=true:
- */
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index 6ef954d7b2..a6f3a3be4d 100644
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -197,7 +197,6 @@ if(ENABLE_EXTCAP)
 endif()
 
 set(WIRESHARK_TAP_SRC
-	camel_counter.c
 	compare_stat.c
 	dcerpc_stat.c
 	expert_comp_dlg.c
diff --git a/ui/gtk/Makefile.common b/ui/gtk/Makefile.common
index f359409618..25a85192ec 100644
--- a/ui/gtk/Makefile.common
+++ b/ui/gtk/Makefile.common
@@ -147,7 +147,6 @@ prefs_layout.c: layouts.h
 stock_icons.c: stock_icons.h toolbar_icons.h wsicon.h
 
 WIRESHARK_TAP_SRC = \
-	camel_counter.c	\
 	compare_stat.c	\
 	dcerpc_stat.c	\
 	expert_comp_dlg.c     \
diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c
deleted file mode 100644
index e77be0dd33..0000000000
--- a/ui/gtk/camel_counter.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* camel_counter.c
- * camel message counter for Wireshark
- * Copyright 2006 Florent Drouin (based on h225_counter.c from Lars Roland)
- *
- * 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
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <epan/packet_info.h>
-#include <epan/value_string.h>
-#include <epan/tap.h>
-#include <epan/packet.h>
-#include <epan/dissectors/packet-camel.h>
-
-
-#include "ui/simple_dialog.h"
-
-#include "ui/gtk/main.h"
-#include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/gui_stat_util.h"
-#include "ui/gtk/tap_param_dlg.h"
-
-
-static void gtk_camelcounter_reset(void *phs);
-static int gtk_camelcounter_packet(void *phs,
-                                   packet_info *pinfo _U_,
-                                   epan_dissect_t *edt _U_,
-                                   const void *phi);
-static void gtk_camelcounter_draw(void *phs);
-static void win_destroy_cb(GtkWindow *win _U_, gpointer data);
-static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_);
-void register_tap_listener_gtk_camelcounter(void);
-
-/* following values represent the size of their valuestring arrays */
-
-struct camelcounter_t {
-  GtkWidget   *win;
-  GtkWidget   *vbox;
-  char        *filter;
-  GtkWidget   *scrolled_window;
-  GtkTreeView *table;
-  guint32      camel_msg[camel_MAX_NUM_OPR_CODES];
-};
-
-static void gtk_camelcounter_reset(void *phs)
-{
-  struct camelcounter_t * p_counter= ( struct camelcounter_t *) phs;
-  int i;
-
-  /* Erase Message Type count */
-  for(i=0;i<camel_MAX_NUM_OPR_CODES;i++) {
-    p_counter->camel_msg[i]=0;
-  }
-}
-
-
-/*
- * If there is a valid camel operation, increase the value in the array of counter
- */
-static int gtk_camelcounter_packet(void *phs,
-                                   packet_info *pinfo _U_,
-                                   epan_dissect_t *edt _U_,
-                                   const void *phi)
-{
-  struct camelcounter_t * p_counter =(struct camelcounter_t *)phs;
-  const struct camelsrt_info_t * pi=(const struct camelsrt_info_t *)phi;
-  if (pi->opcode != 255)
-    p_counter->camel_msg[pi->opcode]++;
-
-  return 1;
-}
-
-static void gtk_camelcounter_draw(void *phs)
-{
-  struct camelcounter_t *p_counter=(struct camelcounter_t *)phs;
-  int           i;
-  char          str[256];
-  gchar        *tmp_str;
-  GtkListStore *store;
-  GtkTreeIter   iter;
-
-  /* Now print Message and Reason Counter Table */
-  /* clear list before printing */
-  store = GTK_LIST_STORE(gtk_tree_view_get_model(p_counter->table));
-  gtk_list_store_clear(store);
-
-  for(i=0;i<camel_MAX_NUM_OPR_CODES;i++) {
-    /* Message counter */
-    if(p_counter->camel_msg[i]!=0) {
-      tmp_str = val_to_str_wmem(NULL, i,camel_opr_code_strings,"Unknown message (%d)");
-      g_snprintf(str, 256, "Request %s", tmp_str);
-      wmem_free(NULL, tmp_str);
-
-      gtk_list_store_append(store, &iter);
-      gtk_list_store_set(store, &iter,
-                         0, str,
-                         1, p_counter->camel_msg[i],
-                         -1);
-    }
-  } /* Message Type */
-}
-
-static void win_destroy_cb(GtkWindow *win _U_, gpointer data)
-{
-  struct camelcounter_t *hs=(struct camelcounter_t *)data;
-
-  remove_tap_listener(hs);
-
-  if(hs->filter){
-    g_free(hs->filter);
-    hs->filter=NULL;
-  }
-  g_free(hs);
-}
-
-static const stat_column titles[]={
-  {G_TYPE_STRING, TAP_ALIGN_LEFT, "Message Type or Reason"},
-  {G_TYPE_UINT, TAP_ALIGN_RIGHT, "Count" }
-};
-
-static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_)
-{
-  struct camelcounter_t *p_camelcounter;
-  const char *filter = NULL;
-  GString    *error_string;
-  GtkWidget  *bbox;
-  GtkWidget  *close_bt;
-
-  if(strncmp(opt_arg,"camel,counter,",14) == 0){
-    filter=opt_arg+14;
-  } else {
-    filter=NULL;
-  }
-
-  p_camelcounter=(struct camelcounter_t *)g_malloc(sizeof(struct camelcounter_t));
-  p_camelcounter->filter=g_strdup(filter);
-
-  gtk_camelcounter_reset(p_camelcounter);
-
-  /* transient_for top_level */
-  p_camelcounter->win=dlg_window_new("Wireshark: CAMEL counters");
-  gtk_window_set_destroy_with_parent (GTK_WINDOW(p_camelcounter->win), TRUE);
-
-  gtk_window_set_default_size(GTK_WINDOW(p_camelcounter->win), 500, 300);
-
-  p_camelcounter->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
-  gtk_container_set_border_width(GTK_CONTAINER(p_camelcounter->vbox), 12);
-
-  init_main_stat_window(p_camelcounter->win, p_camelcounter->vbox, "CAMEL Messages Counters", filter);
-
-  /* init a scrolled window*/
-  p_camelcounter->scrolled_window = scrolled_window_new(NULL, NULL);
-
-  p_camelcounter->table = create_stat_table(p_camelcounter->scrolled_window, p_camelcounter->vbox, 2, titles);
-
-  error_string=register_tap_listener("CAMEL", p_camelcounter, filter, 0,
-                                     gtk_camelcounter_reset,
-                                     gtk_camelcounter_packet,
-                                     gtk_camelcounter_draw);
-
-  if(error_string){
-    simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
-    g_string_free(error_string, TRUE);
-    g_free(p_camelcounter);
-    return;
-  }
-
-  /* Button row. */
-  bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-  gtk_box_pack_end(GTK_BOX(p_camelcounter->vbox), bbox, FALSE, FALSE, 0);
-
-  close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
-  window_set_cancel_button(p_camelcounter->win, close_bt, window_cancel_button_cb);
-
-  g_signal_connect(p_camelcounter->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
-  g_signal_connect(p_camelcounter->win, "destroy", G_CALLBACK(win_destroy_cb), p_camelcounter);
-
-  gtk_widget_show_all(p_camelcounter->win);
-  window_present(p_camelcounter->win);
-
-  cf_retap_packets(&cfile);
-  gdk_window_raise(gtk_widget_get_window(p_camelcounter->win));
-}
-
-static tap_param camel_counter_params[] = {
-  { PARAM_FILTER, "filter", "Filter", NULL, TRUE }
-};
-
-static tap_param_dlg camel_counter_dlg = {
-  "CAMEL Messages and Response Status",
-  "camel,counter",
-  gtk_camelcounter_init,
-  -1,
-  G_N_ELEMENTS(camel_counter_params),
-  camel_counter_params,
-  NULL
-};
-
-void  /* Next line mandatory */
-register_tap_listener_gtk_camelcounter(void)
-{
-  register_param_stat(&camel_counter_dlg, "CAMEL Messages and Response Status",
-                      REGISTER_STAT_GROUP_TELEPHONY_GSM);
-
-}
-
-/*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
- *
- * Local Variables:
- * c-basic-offset: 2
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * vi: set shiftwidth=2 tabstop=8 expandtab:
- * :indentSize=2:tabSize=8:noTabs=true:
- */
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index d0f874e78d..9bcf2b95d7 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -2000,6 +2000,9 @@ void MainWindow::addDynamicMenus()
             case REGISTER_STAT_GROUP_TELEPHONY_ANSI:
                 main_ui_->menuANSI->addAction(action);
                 break;
+            case REGISTER_STAT_GROUP_TELEPHONY_GSM:
+                main_ui_->menuGSM->addAction(action);
+                break;
             case REGISTER_TOOLS_GROUP_UNSORTED:
             {
                 // Allow the creation of submenus. Mimics the behavor of
diff --git a/ui/qt/main_window.ui b/ui/qt/main_window.ui
index 9211ed527c..0eb120af46 100644
--- a/ui/qt/main_window.ui
+++ b/ui/qt/main_window.ui
@@ -515,8 +515,15 @@
      </property>
      <addaction name="actionTelephonyANSIPlaceholder"/>
     </widget>
+    <widget class="QMenu" name="menuGSM">
+     <property name="title">
+      <string>GSM</string>
+     </property>
+     <addaction name="actionTelephonyANSIPlaceholder"/>
+    </widget>
     <addaction name="actionTelephonyVoipCalls"/>
     <addaction name="menuANSI"/>
+    <addaction name="menuGSM"/>
     <addaction name="actionTelephonyISUPMessages"/>
     <addaction name="menuRTP"/>
     <addaction name="menuRTSP"/>