[Brad Hards <bhards@xxxxxxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

G'day,

I was looking at ACAP (RFC2244), and did a 15 minute hack to the IMAP 
dissector to provide a dissector for ACAP (which is essentially the same 
protocol on a different port, at the level that Ethereal currently cares). I 
then did some testing.

Patch is attached. Sorry for the two parts - if someone can tell me how to 
make cvs diff to the right magic to add a new file without access to the 
repository, I'll redo it.

Brad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE+gBfKW6pHgIdAuOMRAk9jAJ49Coxpad7ZLvaIS3VeWG/HubCvlACgnqff
OSiedR+n0AcJ6SLU/YBQ2Ss=
=1/L5
-----END PGP SIGNATURE-----

? autom4te-2.5x.cache
? cvs.diff
? packet-acap.c
? epan/autom4te-2.5x.cache
? wiretap/autom4te-2.5x.cache
Index: Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/Makefile.am,v
retrieving revision 1.568
diff -u -3 -p -r1.568 Makefile.am
--- Makefile.am	23 Mar 2003 19:32:17 -0000	1.568
+++ Makefile.am	25 Mar 2003 08:58:58 -0000
@@ -85,6 +85,7 @@ diameter_DATA = dictionary.dtd dictionar
 
 DISSECTOR_SRC = \
 	packet-aarp.c  \
+	packet-acap.c	\
 	packet-afp.c   \
 	packet-afs.c   \
 	packet-aim.c   \
Index: Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/Makefile.nmake,v
retrieving revision 1.288
diff -u -3 -p -r1.288 Makefile.nmake
--- Makefile.nmake	23 Mar 2003 19:32:19 -0000	1.288
+++ Makefile.nmake	25 Mar 2003 08:58:58 -0000
@@ -26,6 +26,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
 DISSECTOR_SRC = \
 	packet-aarp.c  \
+	packet-acap.c  \
 	packet-afp.c   \
 	packet-afs.c   \
 	packet-aim.c   \

/* packet-acap.c
 * Routines for ACAP packet dissection
 * Copyright 2003, Brad Hards <bradh@xxxxxxxxxxxxx>
 * Heavily based in packet-imap.c, Copyright 1999, Richard Sharpe <rsharpe@xxxxxxxxxx>
 *
 * $Id: packet-imap.c,v 1.22 2002/08/28 21:00:17 jmayer Exp $
 *
 * Ethereal - Network traffic analyzer
 * By Gerald Combs <gerald@xxxxxxxxxxxx>
 * Copyright 1998 Gerald Combs
 *
 * Copied from packet-imap.c
 *
 * 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 <string.h>
#include <glib.h>
#include <epan/packet.h>
#include <epan/strutil.h>

static int proto_acap = -1;
static int hf_acap_response = -1;
static int hf_acap_request = -1;

static gint ett_acap = -1;

#define TCP_PORT_ACAP			674

static void
dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
        gboolean        is_request;
        proto_tree      *acap_tree, *ti;
	gint		offset = 0;
	const guchar	*line;
	gint		next_offset;
	int		linelen;
	int		tokenlen;
	const guchar	*next_token;

	if (check_col(pinfo->cinfo, COL_PROTOCOL))
		col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACAP");

	/*
	 * Find the end of the first line.
	 *
	 * Note that "tvb_find_line_end()" will return a value that is
	 * not longer than what's in the buffer, so the "tvb_get_ptr()"
	 * call won't throw an exception.
	 */
	linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
	line = tvb_get_ptr(tvb, offset, linelen);

	if (pinfo->match_port == pinfo->destport)
		is_request = TRUE;
	else
		is_request = FALSE;

	if (check_col(pinfo->cinfo, COL_INFO)) {
		/*
		 * Put the first line from the buffer into the summary
		 * (but leave out the line terminator).
		 */
		col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
		    is_request ? "Request" : "Response",
		    format_text(line, linelen));
	}

	if (tree) {
		ti = proto_tree_add_item(tree, proto_acap, tvb, offset, -1,
		    FALSE);
		acap_tree = proto_item_add_subtree(ti, ett_acap);

		if (is_request) {
			proto_tree_add_boolean_hidden(acap_tree,
			    hf_acap_request, tvb, 0, 0, TRUE);
		} else {
			proto_tree_add_boolean_hidden(acap_tree,
			    hf_acap_response, tvb, 0, 0, TRUE);
		}

		/*
		 * Show the first line as tags + requests or replies.
		 */

		/*
		 * Extract the first token, and, if there is a first
		 * token, add it as the request or reply tag.
		 */
		tokenlen = get_token_len(line, line + linelen, &next_token);
		if (tokenlen != 0) {
			if (is_request) {
				proto_tree_add_text(acap_tree, tvb, offset,
				    tokenlen, "Request Tag: %s",
				    format_text(line, tokenlen));
			} else {
				proto_tree_add_text(acap_tree, tvb, offset,
				    tokenlen, "Response Tag: %s",
				    format_text(line, tokenlen));
			}
			offset += next_token - line;
			linelen -= next_token - line;
			line = next_token;
		}

		/*
		 * Add the rest of the line as request or reply data.
		 */
		if (linelen != 0) {
			if (is_request) {
				proto_tree_add_text(acap_tree, tvb, offset,
				    linelen, "Request: %s",
				    format_text(line, linelen));
			} else {
				proto_tree_add_text(acap_tree, tvb, offset,
				    linelen, "Response: %s",
				    format_text(line, linelen));
			}
		}

		/*
		 * XXX - show the rest of the frame; this requires that
		 * we handle literals, quoted strings, continuation
		 * responses, etc..
		 *
		 * This involves a state machine, and attaching
		 * state information to the packets.
		 */
	}
}

void
proto_register_acap(void)
{
  static hf_register_info hf[] = {
    { &hf_acap_response,
      { "Response",           "acap.response",
	FT_BOOLEAN, BASE_NONE, NULL, 0x0,
      	"TRUE if ACAP response", HFILL }},

    { &hf_acap_request,
      { "Request",            "acap.request",
	FT_BOOLEAN, BASE_NONE, NULL, 0x0,
      	"TRUE if ACAP request", HFILL }}
  };
  static gint *ett[] = {
    &ett_acap,
  };

  proto_acap = proto_register_protocol("Application Configuration Access Protocol",
				       "ACAP", "acap");
  proto_register_field_array(proto_acap, hf, array_length(hf));
  proto_register_subtree_array(ett, array_length(ett));
}

void
proto_reg_handoff_acap(void)
{
  dissector_handle_t acap_handle;

  acap_handle = create_dissector_handle(dissect_acap, proto_acap);
  dissector_add("tcp.port", TCP_PORT_ACAP, acap_handle);
}