expanded portmap dissector to process some of the procedure calls

svn path=/trunk/; revision=1003

1 files changed, 117 insertions, 8 deletions

diff --git a/packet-portmap.c b/packet-portmap.c
index b0f343ff28..fb00ef1fde 100644
--- a/packet-portmap.c
+++ b/packet-portmap.c
@@ -1,7 +1,7 @@
 /* packet-portmap.c
  * Routines for portmap dissection
  *
- * $Id: packet-portmap.c,v 1.2 1999/11/10 21:05:09 nneul Exp $
+ * $Id: packet-portmap.c,v 1.3 1999/11/10 22:43:53 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -38,6 +38,90 @@
 #include "packet-portmap.h"
 
 static int proto_portmap = -1;
+static int hf_portmap_proto = -1;
+static int hf_portmap_prog = -1;
+static int hf_portmap_proc = -1;
+static int hf_portmap_version = -1;
+static int hf_portmap_port = -1;
+
+/* Dissect a getport call */
+int dissect_getport_call(const u_char *pd, int offset, frame_data *fd,
+	proto_tree *tree)
+{
+	guint32 proto;
+	if ( !BYTES_ARE_IN_FRAME(offset, 12)) return offset;
+
+	if ( tree )
+	{
+		proto_tree_add_item(tree, hf_portmap_prog,
+			offset, 4, pntohl(&pd[offset+0]));
+		proto_tree_add_item(tree, hf_portmap_version,
+			offset+4, 4, pntohl(&pd[offset+4]));
+
+		proto = pntohl(&pd[offset+8]);
+		proto_tree_add_item_format(tree, hf_portmap_proto,
+			offset+8, 4, proto, "Proto: %s (%d)", ipprotostr(proto), proto);
+	}
+	
+	return offset+12;
+}
+
+int dissect_getport_reply(const u_char *pd, int offset, frame_data *fd,
+	proto_tree *tree)
+{
+    return offset;
+}
+
+/* Dissect a 'set' call */
+int dissect_set_call(const u_char *pd, int offset, frame_data *fd,
+	proto_tree *tree)
+{
+	guint32 proto;
+	if ( !BYTES_ARE_IN_FRAME(offset, 16)) return offset;
+
+	if ( tree )
+	{
+		proto_tree_add_item(tree, hf_portmap_prog,
+			offset, 4, pntohl(&pd[offset+0]));
+		proto_tree_add_item(tree, hf_portmap_version,
+			offset+4, 4, pntohl(&pd[offset+4]));
+
+		proto = pntohl(&pd[offset+8]);
+		proto_tree_add_item_format(tree, hf_portmap_proto,
+			offset+8, 4, proto, "Proto: %s (%d)", ipprotostr(proto), proto);
+
+		proto_tree_add_item(tree, hf_portmap_port,
+			offset+12, 4, pntohl(&pd[offset+12]));
+	}
+	
+	return offset+16;
+}
+
+/* Dissect a 'unset' call */
+int dissect_unset_call(const u_char *pd, int offset, frame_data *fd,
+	proto_tree *tree)
+{
+	guint32 proto;
+	if ( !BYTES_ARE_IN_FRAME(offset, 16)) return offset;
+
+	if ( tree )
+	{
+		proto_tree_add_item(tree, hf_portmap_prog,
+			offset, 4, pntohl(&pd[offset+0]));
+		proto_tree_add_item(tree, hf_portmap_version,
+			offset+4, 4, pntohl(&pd[offset+4]));
+
+		proto = pntohl(&pd[offset+8]);
+		proto_tree_add_item(tree, hf_portmap_proto,
+			offset+8, 4, proto);
+
+		proto_tree_add_item(tree, hf_portmap_port,
+			offset+12, 4, pntohl(&pd[offset+12]));
+	}
+	
+	return offset+16;
+}
+
 
 /* proc number, "proc name", dissect_request, dissect_reply */
 /* NULL as function pointer means: take the generic one. */
@@ -53,13 +137,19 @@ const vsff portmap1_proc[] = {
 /* end of Portmap version 1 */
 
 const vsff portmap2_proc[] = {
-	{ PORTMAPPROC_NULL,	"NULL",		NULL,				NULL },
-	{ PORTMAPPROC_SET,	"SET",		NULL,				NULL },
-	{ PORTMAPPROC_UNSET,	"UNSET",		NULL,				NULL },
-	{ PORTMAPPROC_GETPORT,	"GETPORT",		NULL,				NULL },
-	{ PORTMAPPROC_DUMP,	"DUMP",		NULL,				NULL },
-	{ PORTMAPPROC_CALLIT,	"CALLIT",		NULL,				NULL },
-    { 0,    NULL,       NULL,               NULL }
+	{ PORTMAPPROC_NULL, "NULL",
+		NULL, NULL },
+	{ PORTMAPPROC_SET, "SET",
+		dissect_set_call, NULL },
+	{ PORTMAPPROC_UNSET, "UNSET",
+		dissect_unset_call, NULL },
+	{ PORTMAPPROC_GETPORT,	"GETPORT",
+		dissect_getport_call, dissect_getport_reply },
+	{ PORTMAPPROC_DUMP, "DUMP",
+		NULL, NULL },
+	{ PORTMAPPROC_CALLIT, "CALLIT",
+		NULL, NULL },
+    { 0, NULL, NULL, NULL }
 };
 /* end of Portmap version 2 */
 
@@ -67,7 +157,26 @@ const vsff portmap2_proc[] = {
 void
 proto_register_portmap(void)
 {
+	static hf_register_info hf[] = {
+		{ &hf_portmap_prog, {
+			"Program", "portmap.prog", FT_UINT32, BASE_DEC,
+			NULL, 0, "Program" }},
+		{ &hf_portmap_port, {
+			"Port", "portmap.port", FT_UINT32, BASE_DEC,
+			NULL, 0, "Port" }},
+		{ &hf_portmap_proc, {
+			"Procedure", "portmap.proc", FT_UINT32, BASE_DEC,
+			NULL, 0, "Procedure" }},
+		{ &hf_portmap_proto, {
+			"Protocol", "portmap.proto", FT_UINT32, BASE_DEC,
+			NULL, 0, "Protocol" }},
+		{ &hf_portmap_version, {
+			"Version", "portmap.version", FT_UINT32, BASE_DEC,
+			NULL, 0, "Version" }},
+	};
+
 	proto_portmap = proto_register_protocol("Portmap", "portmap");
+	proto_register_field_array(proto_portmap, hf, array_length(hf));
 
 	/* Register the protocol as RPC */
 	rpc_init_prog(proto_portmap, PORTMAP_PROGRAM, ETT_PORTMAP);