From Mike Duigou:

 a patch which adds support for displaying jxta 
conversations and endpoints from the 'Statistics' menu. Also adds :

  - a generated field to Welcome messages to indicate whether this 
welcome is from the initiator or the receiver. You can filter on this 
field with 'jxta.welcome.initiator==[0|1]'

  - Marks the source and destination fields of message added in the last 
patch as generated fields. (Saw it being done for some other protocol).

  - Cleans up dissection of Message which used to assume it would 
dissected more than one set of hdr/message per tvbuff. Now it only 
attempts to dissect one.

- Uses GMemChunk for tap info and for conversation data rather than 
g_malloc() There's still a major leakage of g_malloc()ed the c-strings 
which are used in jxta addresses. Any suggestions for how these can be 
allocated such that they can be freed re-init is called would be 
appreciated. For address objects whose data ptr doesn't point into a 
tvbuff it's not clear what the lifecyle of an address object is.

  - Fixes a bug with filling in the of the transport layer conversation 
data. >= vs. >



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14558 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 46 insertions, 0 deletions

diff --git a/epan/dissectors/packet-jxta.h b/epan/dissectors/packet-jxta.h
new file mode 100644
index 0000000000..366460603c
--- /dev/null
+++ b/epan/dissectors/packet-jxta.h
@@ -0,0 +1,46 @@
+/* packet-jxta.h
+ * Routines for JXTA packet dissection
+ * Copyright 2004-05, Mike Duigou <bondolo@jxta.org>
+ * Heavily based on packet-jabber.c, which in turn is heavily based on 
+ * on packet-acap.c, which in turn is heavily based on 
+ * packet-imap.c, Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * Copied from packet-pop.c, packet-jabber.c, packet-udp.c
+ *
+ * JXTA specification from http://spec.jxta.org
+ *
+ * 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.
+ */
+
+#include <glib.h>
+
+#include <epan/packet.h>
+
+/**
+*   Stream Conversation data
+**/
+struct jxta_tap_header {
+    address src_address;
+    address dest_address;
+    guint32 size;
+};
+
+typedef struct jxta_tap_header jxta_tap_header;