Add an ifdef and "dont apply patch twice".

svn path=/trunk/; revision=14563

3 files changed, 5 insertions, 187 deletions

diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c
index be5d064d4c..c8835a73b4 100644
--- a/gtk/conversations_jxta.c
+++ b/gtk/conversations_jxta.c
@@ -2,7 +2,7 @@
  * conversations_jxta  copyright (c) 2005 Mike Duigou <bondolo@jxta.org>
  * copied from conversations_sctp.c
  * 
- * $Id:$
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -93,98 +93,4 @@ register_tap_listener_jxta_conversation(void)
 
     register_conversation_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_conversation_packet);
 }
-/* conversations_jxta.c
- * conversations_jxta  copyright (c) 2005 Mike Duigou <bondolo@jxta.org>
- * copied from conversations_sctp.c
- * 
- * $Id:$
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
-#include "tap_menu.h"
-#include <epan/tap.h>
-#include "../register.h"
-#include "conversations_table.h"
-#include <epan/dissectors/packet-jxta.h>
-
-
-static int
-jxta_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
-{
-	const jxta_tap_header *jxtahdr = (const jxta_tap_header *) vip;
-
-	add_conversation_table_data((conversations_table *)pct, 
-		&jxtahdr->src_address, 
-		&jxtahdr->dest_address, 
-		0, 
-		0, 
-		1, 
-		jxtahdr->size, 
-		SAT_NONE, 
-		PT_NONE);
-
-
-	return 1;
-}
-
-static void
-jxta_conversation_init(char *optarg)
-{
-	char *filter=NULL;
-
-	if(!strncmp(optarg,"conv,jxta,",10)){
-		filter=optarg+10;
-	} else {
-		filter=NULL;
-	}
-
-	init_conversation_table(TRUE, "JXTA", "jxta", filter, jxta_conversation_packet);
-
-}
-
-
-static void
-jxta_conversation_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-	jxta_conversation_init("conv,jxta");
-}
-
-
-void
-register_tap_listener_jxta_conversation(void)
-{
-	register_tap_listener_cmd_arg("conv,jxta", jxta_conversation_init);
-
-	register_tap_menu_item("JXTA", REGISTER_TAP_GROUP_CONVERSATION_LIST,
-	    jxta_conversation_cb, NULL, NULL, NULL);
-
-    register_conversation_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_conversation_packet);
-}
diff --git a/gtk/conversations_table.h b/gtk/conversations_table.h
index 7ee2aadcd1..057f66b688 100644
--- a/gtk/conversations_table.h
+++ b/gtk/conversations_table.h
@@ -22,7 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
+#ifndef __CONVERSATIONS_TABLE_H__
+#define __CONVERSATIONS_TABLE_H__
 #include "sat.h"
 
 /** @file
@@ -101,3 +102,5 @@ extern void init_conversation_notebook_cb(GtkWidget *widget, gpointer data);
  */
 extern void add_conversation_table_data(conversations_table *ct, const address *src, const address *dst, 
                         guint32 src_port, guint32 dst_port, int num_frames, int num_bytes, SAT_E sat, int port_type);
+#endif /* __CONVERSATIONS_TABLE_H__ */
+
diff --git a/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c
index c20103bfde..07a27cbfc4 100644
--- a/gtk/hostlist_jxta.c
+++ b/gtk/hostlist_jxta.c
@@ -89,94 +89,3 @@ register_tap_listener_jxta_hostlist(void)
 
 	register_hostlist_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_hostlist_packet);
 }
-/* hostlist_jxta.c   2005 Mike Duigou
- * modified from hostlist_eth.c   2004 Ian Schorr
- *
- * $Id$
- *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#include <gtk/gtk.h>
-#include <string.h>
-#include "epan/packet.h"
-#include "tap_menu.h"
-#include <epan/tap.h>
-#include "../register.h"
-#include "hostlist_table.h"
-#include <epan/dissectors/packet-jxta.h>
-
-
-static int
-jxta_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip)
-{
-	hostlist_table *hosts = (hostlist_table *) pit;
-	volatile const jxta_tap_header *jxtahdr = vip;
-
-	/* Take two "add" passes per packet, adding for each direction, ensures that all
-	packets are counted properly (even if address is sending to itself) 
-	XXX - this could probably be done more efficiently inside hostlist_table */
-	add_hostlist_table_data(hosts, &jxtahdr->src_address, 0, TRUE, 1, jxtahdr->size, SAT_NONE, PT_NONE);
-	add_hostlist_table_data(hosts, &jxtahdr->dest_address, 0, FALSE, 1, jxtahdr->size, SAT_NONE, PT_NONE);
-
-        hosts = jxtahdr;
-	return 1;
-}
-
-static void
-gtk_jxta_hostlist_init(char *optarg)
-{
-	char *filter=NULL;
-
-	if(!strncmp(optarg,"hosts,jxta,",11)){
-		filter=optarg+11;
-	} else {
-		filter=NULL;
-	}
-
-	init_hostlist_table(TRUE, "JXTA", "jxta", filter, jxta_hostlist_packet);
-
-}
-
-
-static void
-gtk_jxta_hostlist_cb(GtkWidget *w _U_, gpointer d _U_)
-{
-	gtk_jxta_hostlist_init("hosts,jxta");
-}
-
-
-void
-register_tap_listener_jxta_hostlist(void)
-{
-	register_tap_listener_cmd_arg("hosts,jxta", gtk_jxta_hostlist_init);
-
-	register_tap_menu_item("JXTA", REGISTER_TAP_GROUP_ENDPOINT_LIST,
-	    gtk_jxta_hostlist_cb, NULL, NULL, NULL);
-
-	register_hostlist_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_hostlist_packet);
-}