Convert BOOTP/DHCP tap stats to new "generic stat API".

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

2 files changed, 0 insertions, 204 deletions

diff --git a/ui/cli/Makefile.common b/ui/cli/Makefile.common
index 8cec7b13ab..54321001e1 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-bootpstat.c		\
 	tap-camelcounter.c	\
 	tap-camelsrt.c		\
 	tap-comparestat.c	\
diff --git a/ui/cli/tap-bootpstat.c b/ui/cli/tap-bootpstat.c
deleted file mode 100644
index 00ead042c9..0000000000
--- a/ui/cli/tap-bootpstat.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* tap-bootpstat.c
- * boop_stat   2003 Jean-Michel FAYARD
- *
- * 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_info.h"
-#include <epan/tap.h>
-#include <epan/stat_tap_ui.h>
-
-void register_tap_listener_dhcpstat(void);
-
-typedef const char *bootp_info_value_t;
-
-/* used to keep track of the statictics for an entire program interface */
-typedef struct _dhcp_stats_t {
-	char 		*filter;
-	GHashTable	*hash;
-	guint		 index;	/* Number of  to display */
-} dhcpstat_t;
-/* used to keep track of a single DHCP message type */
-typedef struct _dhcp_message_type_t {
-	const char	*name;
-	guint32		 packets;
-	dhcpstat_t	*sp;	/* entire program interface */
-} dhcp_message_type_t;
-
-
-/* Not used anywhere at this moment */
-/*
-static void
-dhcp_free_hash( gpointer key _U_ , gpointer value, gpointer user_data _U_ )
-{
-	g_free(value);
-}
-*/
-
-static void
-dhcp_reset_hash(gchar *key _U_ , dhcp_message_type_t *data, gpointer ptr _U_ )
-{
-	data->packets = 0;
-}
-
-/* Update the entry corresponding to the number of packets of a special DHCP Message Type
- * or create it if it don't exist.
- */
-static void
-dhcp_draw_message_type(gchar *key _U_, dhcp_message_type_t *data, gchar * format )
-{
-	if ((data == NULL) || (data->packets == 0))
-		return;
-	printf( format, data->name, data->packets);
-}
-static void
-dhcpstat_reset(void *psp)
-{
-	dhcpstat_t *sp = (dhcpstat_t *)psp;
-	g_hash_table_foreach( sp->hash, (GHFunc)dhcp_reset_hash, NULL);
-}
-static int
-dhcpstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri)
-{
-	dhcpstat_t *sp = (dhcpstat_t *)psp;
-	const bootp_info_value_t value = (const bootp_info_value_t)pri;
-	dhcp_message_type_t *sc;
-
-	if (sp == NULL)
-		return 0;
-	sc = (dhcp_message_type_t *)g_hash_table_lookup(
-			sp->hash,
-			value);
-	if (!sc) {
-		sc = g_new(dhcp_message_type_t, 1);
-		sc -> packets = 1;
-		sc -> name = value;
-		sc -> sp = sp;
-		g_hash_table_insert(
-				sp->hash,
-				(gpointer) value,
-				sc);
-	} else {
-		/*g_warning("sc(%s)->packets++", sc->name);*/
-		sc->packets++;
-	}
-	return 1;
-}
-
-
-static void
-dhcpstat_draw(void *psp)
-{
-	dhcpstat_t *sp = (dhcpstat_t *)psp;
-
-	printf("\n");
-	printf("===================================================================\n");
-
-	if (sp->filter == NULL)
-		printf("BOOTP Statistics\n");
-	else
-		printf("BOOTP Statistics with filter %s\n",  sp->filter);
-	printf("BOOTP Option 53: DHCP Messages Types:\n");
-	printf("DHCP Message Type      Packets nb\n" );
-	g_hash_table_foreach( sp->hash, (GHFunc) dhcp_draw_message_type,
-			(gpointer)"%23s %-9d\n" );
-	printf("===================================================================\n");
-
-}
-
-
-
-
-/* When called, this function will create a new instance of tap-boopstat.
- */
-static void
-dhcpstat_init(const char *opt_arg, void *userdata _U_)
-{
-	dhcpstat_t *sp;
-	const char	*filter = NULL;
-	GString		*error_string;
-
-	if (!strncmp (opt_arg, "bootp,stat,", 11)) {
-		filter = opt_arg+11;
-	} else {
-		filter = NULL;
-	}
-
-	sp = g_new(dhcpstat_t, 1);
-	sp->hash = g_hash_table_new( g_str_hash, g_str_equal);
-	if (filter) {
-		sp->filter = g_strdup(filter);
-	} else {
-		sp->filter = NULL;
-	}
-	sp->index = 0; 		/* Nothing to display yet */
-
-	error_string = register_tap_listener(
-			"bootp",
-			sp,
-			filter,
-			0,
-			dhcpstat_reset,
-			dhcpstat_packet,
-			dhcpstat_draw);
-	if (error_string) {
-		/* error, we failed to attach to the tap. clean up */
-		g_free(sp->filter);
-		g_free(sp);
-		fprintf(stderr, "tshark: Couldn't register dhcp,stat tap: %s\n",
-				error_string->str);
-		g_string_free(error_string, TRUE);
-		exit(1);
-	}
-}
-
-static stat_tap_ui dhcpstat_ui = {
-	REGISTER_STAT_GROUP_GENERIC,
-	NULL,
-	"bootp,stat",
-	dhcpstat_init,
-	0,
-	NULL
-};
-
-void
-register_tap_listener_dhcpstat(void)
-{
-	register_stat_tap_ui(&dhcpstat_ui, NULL);
-}
-
-/*
- * 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:
- */