Use RTD functionality for H.225

This got missed in the initial refactoring.

Change-Id: I98dcc0816e065efab9b497f753c8d2d388349ff3
Reviewed-on: https://code.wireshark.org/review/9044
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 0 insertions, 346 deletions

diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c
deleted file mode 100644
index 7b7ebd7eb9..0000000000
--- a/ui/gtk/h225_ras_srt.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* h225_ras_srt.c
- * H.225 RAS Service Response Time statistics for Wireshar
- * Copyright 2003 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 <epan/packet.h>
-#include <epan/value_string.h>
-#include <epan/tap.h>
-#include <epan/dissectors/packet-h225.h>
-
-#include "epan/timestats.h"
-#include "ui/simple_dialog.h"
-
-#include "ui/gtk/gui_stat_util.h"
-#include "ui/gtk/dlg_utils.h"
-#include "ui/gtk/tap_param_dlg.h"
-#include "ui/gtk/gui_utils.h"
-#include "ui/gtk/main.h"
-
-
-void register_tap_listener_gtk_h225rassrt(void);
-static void gtk_h225rassrt_init(const char *opt_arg, void *userdata);
-
-static tap_param h225_rassrt_params[] = {
-	{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
-};
-
-static tap_param_dlg h225_rassrt_dlg = {
-	"H.225 RAS Service Response Time",
-	"h225,srt",
-	gtk_h225rassrt_init,
-	-1,
-	G_N_ELEMENTS(h225_rassrt_params),
-	h225_rassrt_params
-};
-
-/* following values represent the size of their valuestring arrays */
-#define NUM_RAS_STATS 7
-
-static const value_string ras_message_category[] = {
-	{  0,	"Gatekeeper    "},
-	{  1,	"Registration  "},
-	{  2,	"UnRegistration"},
-	{  3,	"Admission     "},
-	{  4,	"Bandwidth     "},
-	{  5,	"Disengage     "},
-	{  6,	"Location      "},
-	{  0, NULL }
-};
-
-typedef enum _ras_type {
-	RAS_REQUEST,
-	RAS_CONFIRM,
-	RAS_REJECT,
-	RAS_OTHER
-}ras_type;
-
-typedef enum _ras_category {
-	RAS_GATEKEEPER,
-	RAS_REGISTRATION,
-	RAS_UNREGISTRATION,
-	RAS_ADMISSION,
-	RAS_BANDWIDTH,
-	RAS_DISENGAGE,
-	RAS_LOCATION,
-	RAS_OTHERS
-}ras_category;
-
-/* Summary of response-time calculations*/
-typedef struct _h225_rtd_t {
-	guint32 open_req_num;
-	guint32 disc_rsp_num;
-	guint32 req_dup_num;
-	guint32 rsp_dup_num;
-	timestat_t stats;
-} h225_rtd_t;
-
-/* used to keep track of the statistics for an entire program interface */
-typedef struct _h225rassrt_t {
-	GtkWidget *win;
-	GtkWidget *vbox;
-	char *filter;
-	GtkWidget *scrolled_window;
-	GtkTreeView *table;
-	h225_rtd_t ras_rtd[NUM_RAS_STATS];
-} h225rassrt_t;
-
-
-static void
-h225rassrt_reset(void *phs)
-{
-	h225rassrt_t *hs=(h225rassrt_t *)phs;
-	int i;
-
-	for(i=0;i<NUM_RAS_STATS;i++) {
-		hs->ras_rtd[i].stats.num = 0;
-		hs->ras_rtd[i].stats.min_num = 0;
-		hs->ras_rtd[i].stats.max_num = 0;
-		hs->ras_rtd[i].stats.min.secs = 0;
-		hs->ras_rtd[i].stats.min.nsecs = 0;
-		hs->ras_rtd[i].stats.max.secs = 0;
-		hs->ras_rtd[i].stats.max.nsecs = 0;
-		hs->ras_rtd[i].stats.tot.secs = 0;
-		hs->ras_rtd[i].stats.tot.nsecs = 0;
-		hs->ras_rtd[i].open_req_num = 0;
-		hs->ras_rtd[i].disc_rsp_num = 0;
-		hs->ras_rtd[i].req_dup_num = 0;
-		hs->ras_rtd[i].rsp_dup_num = 0;
-	}
-
-}
-
-
-static int
-h225rassrt_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi)
-{
-	h225rassrt_t *hs=(h225rassrt_t *)phs;
-	const h225_packet_info *pi=(const h225_packet_info *)phi;
-
-	ras_type rasmsg_type = RAS_OTHER;
-	ras_category rascategory = RAS_OTHERS;
-
-	if (pi->msg_type != H225_RAS || pi->msg_tag == -1) {
-		/* No RAS Message or uninitialized msg_tag -> return */
-		return 0;
-	}
-
-	if (pi->msg_tag < 21) {
-		/* */
-		rascategory = (ras_category)(pi->msg_tag / 3);
-		rasmsg_type = (ras_type)(pi->msg_tag % 3);
-	}
-	else {
-		/* No SRT yet (ToDo) */
-		return 0;
-	}
-
-	switch(rasmsg_type) {
-
-	case RAS_REQUEST:
-		if(pi->is_duplicate){
-			hs->ras_rtd[rascategory].req_dup_num++;
-		}
-		else {
-			hs->ras_rtd[rascategory].open_req_num++;
-		}
-		break;
-
-	case RAS_CONFIRM:
-		/* no break - delay stats are identical for Confirm and Reject  */
-	case RAS_REJECT:
-		if(pi->is_duplicate){
-			/* Duplicate is ignored */
-			hs->ras_rtd[rascategory].rsp_dup_num++;
-		}
-		else if (!pi->request_available) {
-			/* no request was seen, ignore response  */
-			hs->ras_rtd[rascategory].disc_rsp_num++;
-		}
-		else {
-			hs->ras_rtd[rascategory].open_req_num--;
-			time_stat_update(&(hs->ras_rtd[rascategory].stats),&(pi->delta_time), pinfo);
-		}
-		break;
-
-	default:
-		return 0;
-	}
-	return 1;
-}
-
-static void
-h225rassrt_draw(void *phs)
-{
-	h225rassrt_t *hs=(h225rassrt_t *)phs;
-	int i;
-	char str[3][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(hs->table));
- 	gtk_list_store_clear(store);
-
-	for(i=0;i<NUM_RAS_STATS;i++) {
-		/* nothing seen, nothing to do */
-		if(hs->ras_rtd[i].stats.num==0){
-			continue;
-		}
-		g_snprintf(str[0], sizeof(char[256]),
-				"%8.2f msec", nstime_to_msec(&(hs->ras_rtd[i].stats.min)));
-		g_snprintf(str[1], sizeof(char[256]),
-				"%8.2f msec", nstime_to_msec(&(hs->ras_rtd[i].stats.max)));
-		g_snprintf(str[2], sizeof(char[256]),
-				"%8.2f msec", get_average(&(hs->ras_rtd[i].stats.tot), hs->ras_rtd[i].stats.num));
-		tmp_str = val_to_str_wmem(NULL,i,ras_message_category,"Other (%d)");
-
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter,
-			0, tmp_str,
-			1, hs->ras_rtd[i].stats.num,
-			2, str[0],
-			3, str[1],
-			4, str[2],
-			5, hs->ras_rtd[i].stats.min_num,
-			6, hs->ras_rtd[i].stats.max_num,
-			7, hs->ras_rtd[i].open_req_num,
-			8, hs->ras_rtd[i].disc_rsp_num,
-			9, hs->ras_rtd[i].req_dup_num,
-			10, hs->ras_rtd[i].rsp_dup_num,
-			-1);
-		wmem_free(NULL, tmp_str);
-	}
-}
-
-static void
-win_destroy_cb(GtkWindow *win _U_, gpointer data)
-{
-	h225rassrt_t *hs=(h225rassrt_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, LEFT, "RAS-Type" },
-	{G_TYPE_UINT, RIGHT,   "Measurements" },
-	{G_TYPE_STRING, RIGHT, "Min RTT" },
-	{G_TYPE_STRING, RIGHT, "Max RTT" },
-	{G_TYPE_STRING, RIGHT, "Avg RTT" },
-	{G_TYPE_UINT, RIGHT,  "Min in Frame" },
-	{G_TYPE_UINT, RIGHT,  "Max in Frame" },
-	{G_TYPE_UINT, RIGHT,  "Open Requests" },
-	{G_TYPE_UINT, RIGHT,  "Discarded Responses" },
-	{G_TYPE_UINT, RIGHT,  "Repeated Requests" },
-	{G_TYPE_UINT, RIGHT,  "Repeated Responses"}
-};
-
-static void
-gtk_h225rassrt_init(const char *opt_arg, void *userdata _U_)
-{
-	h225rassrt_t *hs;
-	GString *error_string;
-	GtkWidget *bbox;
-	GtkWidget *close_bt;
-
-	hs=(h225rassrt_t *)g_malloc(sizeof(h225rassrt_t));
-
-	if(strncmp(opt_arg,"h225,srt,",9) == 0){
-		hs->filter=g_strdup(opt_arg+9);
-	} else {
-		hs->filter=NULL;
-	}
-
-	h225rassrt_reset(hs);
-
-	hs->win = dlg_window_new("h225-ras-srt");  /* transient_for top_level */
-	gtk_window_set_destroy_with_parent (GTK_WINDOW(hs->win), TRUE);
-	gtk_window_set_default_size(GTK_WINDOW(hs->win), 600, 300);
-
-	hs->vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
-	gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12);
-
-	init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", hs->filter);
-
-	/* init a scrolled window*/
-	hs->scrolled_window = scrolled_window_new(NULL, NULL);
-
-	hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 11, titles);
-
-	error_string=register_tap_listener("h225", hs, hs->filter, 0, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw);
-	if(error_string){
-		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
-		g_string_free(error_string, TRUE);
-		g_free(hs->filter);
-		g_free(hs);
-		return;
-	}
-
-	/* Button row. */
-	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-	gtk_box_pack_end(GTK_BOX(hs->vbox), bbox, FALSE, FALSE, 0);
-
-	close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
-	window_set_cancel_button(hs->win, close_bt, window_cancel_button_cb);
-
-	g_signal_connect(hs->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
-	g_signal_connect(hs->win, "destroy", G_CALLBACK(win_destroy_cb), hs);
-
-	gtk_widget_show_all(hs->win);
-	window_present(hs->win);
-
-	cf_retap_packets(&cfile);
-	gdk_window_raise(gtk_widget_get_window(hs->win));
-}
-
-void
-register_tap_listener_gtk_h225rassrt(void)
-{
-	register_param_stat(&h225_rassrt_dlg, "H.225 RAS",
-	    REGISTER_STAT_GROUP_RESPONSE_TIME);
-}
-
-/*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
- *
- * Local variables:
- * c-basic-offset: 8
- * tab-width: 8
- * indent-tabs-mode: t
- * End:
- *
- * vi: set shiftwidth=8 tabstop=8 noexpandtab:
- * :indentSize=8:tabSize=8:noTabs=false:
- */