added skeletal tacplus/xtacacs dissector

svn path=/trunk/; revision=1191

6 files changed, 166 insertions, 5 deletions

diff --git a/AUTHORS b/AUTHORS
index ed5b691ac1..968f807c8a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -156,6 +156,7 @@ Nathan Neulinger <nneul@umr.edu> {
 	802.1q VLAN support
 	Misc. RPC program dissectors
 	TNS/Oracle dissector
+	Tacacs+/XTacacs dissector
 }
 
 Tomislav Vujec <tvujec@carnet.hr> {
diff --git a/Makefile.am b/Makefile.am
index 1dc333d5a6..02c858454f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.122 1999/12/01 20:58:49 gram Exp $
+# $Id: Makefile.am,v 1.123 1999/12/03 21:50:28 nneul Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -128,6 +128,7 @@ DISSECTOR_SOURCES = \
 	packet-sscop.c \
 	packet-stat.c   \
 	packet-stat.h   \
+	packet-tacacs.c \
 	packet-tcp.c   \
 	packet-telnet.c\
 	packet-tftp.c  \
diff --git a/packet-tacacs.c b/packet-tacacs.c
new file mode 100644
index 0000000000..58391d8e17
--- /dev/null
+++ b/packet-tacacs.c
@@ -0,0 +1,152 @@
+/* packet-tacacs.c
+ * Routines for cisco tacacs/tacplus/AAA packet dissection
+ *
+ * $Id: packet-tacacs.c,v 1.1 1999/12/03 21:50:29 nneul Exp $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@unicom.net>
+ * Copyright 1998 Gerald Combs
+ *
+ * Copied from packet-tftp.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>
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
+#include <string.h>
+#include <glib.h>
+#include "packet.h"
+
+static int proto_tacacs = -1;
+static int hf_tacacs_request = -1;
+static int hf_tacacs_response = -1;
+static int hf_tacacs_version = -1;
+
+static gint ett_tacacs = -1;
+
+void
+dissect_tacacs(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+{
+	proto_tree      *tacacs_tree, *ti;
+
+	if (check_col(fd, COL_PROTOCOL))
+	col_add_str(fd, COL_PROTOCOL, "TACACS");
+
+	if (check_col(fd, COL_INFO))
+	{
+		col_add_fstr(fd, COL_INFO, "%s", 
+			(pi.match_port == pi.destport) ? "Request" : "Response");	  
+	}
+
+	if (tree) 
+	{
+		ti = proto_tree_add_item(tree, proto_tacacs, offset, END_OF_FRAME, NULL);
+		tacacs_tree = proto_item_add_subtree(ti, ett_tacacs);
+
+		proto_tree_add_item(tacacs_tree, hf_tacacs_version, 0, 0, "XTacacs");
+
+		if (pi.match_port == pi.destport)
+		{
+		        proto_tree_add_item_hidden(tacacs_tree, hf_tacacs_request,
+						   offset, END_OF_FRAME, TRUE);
+			proto_tree_add_text(tacacs_tree, offset, 
+				END_OF_FRAME, "Request: <opaque data>" );
+		}
+		else
+		{
+		        proto_tree_add_item_hidden(tacacs_tree, hf_tacacs_response,
+						   offset, END_OF_FRAME, TRUE);
+			proto_tree_add_text(tacacs_tree, offset, 
+				END_OF_FRAME, "Response: <opaque data>");
+		}
+	}
+}
+
+void
+dissect_tacplus(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+{
+	proto_tree      *tacacs_tree, *ti;
+
+	if (check_col(fd, COL_PROTOCOL))
+	col_add_str(fd, COL_PROTOCOL, "TACACS");
+
+	if (check_col(fd, COL_INFO))
+	{
+		col_add_fstr(fd, COL_INFO, "%s", 
+			(pi.match_port == pi.destport) ? "Request" : "Response");	  
+	}
+
+	if (tree) 
+	{
+		ti = proto_tree_add_item(tree, proto_tacacs, offset, END_OF_FRAME, NULL);
+		tacacs_tree = proto_item_add_subtree(ti, ett_tacacs);
+
+		proto_tree_add_item(tacacs_tree, hf_tacacs_version, 0, 0, "Tacacs+");
+
+		if (pi.match_port == pi.destport)
+		{
+		        proto_tree_add_item_hidden(tacacs_tree, hf_tacacs_request,
+						   offset, END_OF_FRAME, TRUE);
+			proto_tree_add_text(tacacs_tree, offset, 
+				END_OF_FRAME, "Request: <opaque data>" );
+		}
+		else
+		{
+		        proto_tree_add_item_hidden(tacacs_tree, hf_tacacs_response,
+						   offset, END_OF_FRAME, TRUE);
+			proto_tree_add_text(tacacs_tree, offset, 
+				END_OF_FRAME, "Response: <opaque data>");
+		}
+	}
+}
+
+void
+proto_register_tacacs(void)
+{
+	static hf_register_info hf[] = {
+	  { &hf_tacacs_version,
+	    { "Tacacs Version",           "tacacs.version",
+	      FT_STRING, BASE_NONE, NULL, 0x0,
+	      "xtacacs or tacplus" }},
+	  { &hf_tacacs_response,
+	    { "Response",           "tacacs.response",
+	      FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+	      "TRUE if TACACS response" }},
+	  { &hf_tacacs_request,
+	    { "Request",            "tacacs.request",
+	      FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+	      "TRUE if TACACS request" }}
+	};
+
+	static gint *ett[] = {
+		&ett_tacacs,
+	};
+	proto_tacacs = proto_register_protocol("TACACS", "tacacs");
+	proto_register_field_array(proto_tacacs, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+}
diff --git a/packet-tcp.c b/packet-tcp.c
index a23002899e..059605a5f2 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
 /* packet-tcp.c
  * Routines for TCP packet disassembly
  *
- * $Id: packet-tcp.c,v 1.48 1999/11/29 19:43:24 nneul Exp $
+ * $Id: packet-tcp.c,v 1.49 1999/12/03 21:50:29 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -90,6 +90,7 @@ static gint ett_tcp_option_sack = -1;
 #define TCP_PORT_TELNET   23
 #define TCP_PORT_SMTP     25
 #define TCP_PORT_HTTP     80
+#define TCP_PORT_TACACS   49
 #define TCP_PORT_POP      110
 #define TCP_PORT_NNTP     119
 #define TCP_PORT_NTP      123
@@ -523,6 +524,9 @@ dissect_tcp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
     else if (PORT_IS(TCP_PORT_BGP)) {
       pi.match_port = TCP_PORT_BGP;
       dissect_bgp(pd, offset, fd, tree);
+    } else if (PORT_IS(TCP_PORT_TACACS)) {
+      pi.match_port = TCP_PORT_TACACS;
+      dissect_tacplus(pd, offset, fd, tree);
     } else if (PORT_IS(TCP_PORT_MAPI)) {
       pi.match_port = TCP_PORT_MAPI;
       dissect_mapi(pd, offset, fd, tree);
diff --git a/packet-udp.c b/packet-udp.c
index 1577d5759e..f5e9151cee 100644
--- a/packet-udp.c
+++ b/packet-udp.c
@@ -1,7 +1,7 @@
 /* packet-udp.c
  * Routines for UDP packet disassembly
  *
- * $Id: packet-udp.c,v 1.38 1999/11/23 17:09:57 gram Exp $
+ * $Id: packet-udp.c,v 1.39 1999/12/03 21:50:30 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -64,6 +64,7 @@ typedef struct _e_udphdr {
 
 /* UDP Ports -> should go in packet-udp.h */
 
+#define UDP_PORT_TACACS  49
 #define UDP_PORT_DNS     53
 #define UDP_PORT_BOOTPS  67
 #define UDP_PORT_TFTP    69
@@ -177,7 +178,7 @@ void init_dissect_udp(void) {
   udp_hash_add(UDP_PORT_SAP, dissect_sap);
   udp_hash_add(UDP_PORT_HSRP, dissect_hsrp);
   udp_hash_add(UDP_PORT_PIM_RP_DISC, dissect_auto_rp);
-
+  udp_hash_add(UDP_PORT_TACACS, dissect_tacacs);
 }
 
 void
diff --git a/packet.h b/packet.h
index 2d51703ff5..896109a266 100644
--- a/packet.h
+++ b/packet.h
@@ -1,7 +1,7 @@
 /* packet.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet.h,v 1.154 1999/11/30 23:56:37 gram Exp $
+ * $Id: packet.h,v 1.155 1999/12/03 21:50:31 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -385,6 +385,8 @@ void dissect_sdp(const u_char *, int, frame_data *, proto_tree *);
 void dissect_sna(const u_char *, int, frame_data *, proto_tree *);
 void dissect_snmp(const u_char *, int, frame_data *, proto_tree *);
 void dissect_sscop(const u_char *, int, frame_data *, proto_tree *);
+void dissect_tacacs(const u_char *, int, frame_data *, proto_tree *);
+void dissect_tacplus(const u_char *, int, frame_data *, proto_tree *);
 void dissect_tcp(const u_char *, int, frame_data *, proto_tree *);
 void dissect_telnet(const u_char *, int, frame_data *, proto_tree *);
 void dissect_tftp(const u_char *, int, frame_data *, proto_tree *);