[Jon Oberheide <jon@xxxxxxxxxxxxx>]

This patch provides initial support for the giFT Internet File Transfer
(http://www.giftproject.org) protocol dissector.  It is the protocol
used to communicate between the giFT server daemon and the giFT
frontends.  This dissector will be greatly improved once I get a bit of
free time.

The patch also reflects my change in email address.  :)

Regards,
Jon Oberheide

-- 
Jon Oberheide <jon@xxxxxxxxxxxxx>
GnuPG Key: 1024D/F47C17FE
Fingerprint: B716 DA66 8173 6EDD 28F6  F184 5842 1C89 F47C 17FE

diff -ur ethereal.old/AUTHORS ethereal.cvs/AUTHORS
--- ethereal.old/AUTHORS	2004-06-30 06:39:28.274042808 -0400
+++ ethereal.cvs/AUTHORS	2004-06-30 06:50:19.158093392 -0400
@@ -2153,6 +2153,10 @@
 	Serial Infrared support
 }
 
+Jon Oberheide           <jon [AT] oberheide.org> {
+	giFT support
+}
+
 And assorted fixes and enhancements by the people listed above and by:
 
 
@@ -2198,7 +2202,6 @@
 Bill Guyton             <guyton [AT] bguyton.com>
 Chernishov Yury         <Chernishov [AT] iskrauraltel.ru>
 Thomas Palmer           <Thomas.Palmer [AT] Gunter.AF.mil>
-Jon Oberheide           <jon [AT] focalhost.com>
 Clinton Work            <clinton [AT] scripty.com>
 Joe Marcus Clarke       <marcus [AT] marcuscom.com>
 Kendy Kutzner           <kutzner[AT]tm.uka.de>
diff -ur ethereal.old/epan/Makefile.common ethereal.cvs/epan/Makefile.common
--- ethereal.old/epan/Makefile.common	2004-06-30 06:39:28.041078224 -0400
+++ ethereal.cvs/epan/Makefile.common	2004-06-30 06:49:28.627775168 -0400
@@ -214,6 +214,7 @@
 	../packet-ftam.c	\
 	../packet-ftp.c	\
 	../packet-fw1.c	\
+	../packet-gift.c	\
 	../packet-giop.c	\
 	../packet-gmrp.c	\
 	../packet-gnutella.c	\
diff -uN ethereal.old/packet-gift.c ethereal.cvs/packet-gift.c
--- ethereal.old/packet-gift.c	1969-12-31 19:00:00.000000000 -0500
+++ ethereal.cvs/packet-gift.c	2004-06-30 07:13:50.492537944 -0400
@@ -0,0 +1,158 @@
+/* packet-gift.c
+ * Routines for giFT Internet File Transfer dissection
+ * Copyright 2000, Jon Oberheide <jon@xxxxxxxxxxxxx>
+ *
+ * $Id: packet-gift.c,v 1.97 2004/06/25 07:04:03 jmayer Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@xxxxxxxxxxxx>
+ * 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
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <epan/packet.h>
+#include <epan/strutil.h>
+
+#define TCP_PORT_GIFT 1213
+
+static int proto_gift = -1;
+static int hf_gift_response = -1;
+static int hf_gift_request = -1;
+
+static gint ett_gift = -1;
+static gint ett_gift_cmd = -1;
+
+static void
+dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	proto_item	*ti;
+	proto_tree	*gift_tree, *cmd_tree;
+	gboolean	is_request;
+	gint            offset = 0;
+	const guchar    *line;
+	gint            next_offset;
+	int             linelen;
+	int             tokenlen;
+	const guchar    *next_token;
+
+	/* set "Protocol" column text */
+	if (check_col(pinfo->cinfo, COL_PROTOCOL)) 
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "giFT");
+
+	/* determine whether it is a request to or response from the server */
+	if (pinfo->match_port == pinfo->destport)
+		is_request = TRUE;
+	else
+		is_request = FALSE;
+
+	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
+	line = tvb_get_ptr(tvb, offset, linelen);
+
+	/* clear the "Info" column */
+	if (check_col(pinfo->cinfo, COL_INFO)) 
+		col_clear(pinfo->cinfo, COL_INFO);
+
+	/* set "Info" column text */
+	if (check_col(pinfo->cinfo, COL_INFO)) 
+		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
+			     is_request ? "Request" : "Response",
+			     format_text(line, linelen));
+
+	/* if tree != NULL, build protocol tree */
+	if (tree) {
+		ti = proto_tree_add_item(tree, proto_gift, tvb, 0, -1, FALSE);
+		gift_tree = proto_item_add_subtree(ti, ett_gift);
+
+		if (is_request) {
+			proto_tree_add_boolean_hidden(gift_tree, hf_gift_request, tvb, 0, 0, TRUE);
+		} else {
+			proto_tree_add_boolean_hidden(gift_tree, hf_gift_response, tvb, 0, 0, TRUE);
+		}
+
+		ti = proto_tree_add_text(gift_tree, tvb, offset, next_offset - offset, "%s", 
+					 tvb_format_text(tvb, offset, next_offset - offset));
+		cmd_tree = proto_item_add_subtree(ti, ett_gift_cmd);
+
+		tokenlen = get_token_len(line, line + linelen, &next_token);
+		if (tokenlen != 0) {
+			if (is_request) {
+				proto_tree_add_text(cmd_tree, tvb, offset,
+						    tokenlen, "Request Command: %s",
+						    format_text(line, tokenlen));
+			} else {
+				proto_tree_add_text(cmd_tree, tvb, offset,
+						    tokenlen, "Response Command: %s",
+						    format_text(line, tokenlen));
+			}
+			offset += next_token - line;
+			linelen -= next_token - line;
+			line = next_token;
+		}
+
+		if (linelen != 0) {
+			if (is_request) {
+				proto_tree_add_text(cmd_tree, tvb, offset,
+						    linelen, "Request Arg: %s",
+						    format_text(line, linelen));
+			} else {
+				proto_tree_add_text(cmd_tree, tvb, offset,
+						    linelen, "Response Arg: %s",
+						    format_text(line, linelen));
+			}
+		}
+	}
+}
+
+void
+proto_register_gift(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_gift_response,
+			{ "Response", "gift.response", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if giFT response", HFILL }
+		},
+		{ &hf_gift_request,
+			{ "Request", "gift.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if giFT request", HFILL }
+		}
+	};
+
+	static gint *ett[] = {
+		&ett_gift,
+		&ett_gift_cmd,
+	};
+
+	proto_gift = proto_register_protocol("giFT Internet File Transfer",
+					     "giFT", "gift");
+
+	proto_register_field_array(proto_gift, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_gift(void)
+{
+	dissector_handle_t gift_handle;
+
+	gift_handle = create_dissector_handle(dissect_gift, proto_gift);
+	dissector_add("tcp.port", TCP_PORT_GIFT, gift_handle);
+}

Attachment: signature.asc
Description: This is a digitally signed message part