Incorporate plugin dissector into build in collection.

svn path=/trunk/; revision=27506

10 files changed, 0 insertions, 1470 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ad7f9c02f3..4763c0a869 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,7 +23,6 @@
 
 -include Custom.make
 SUBDIRS = $(_CUSTOM_SUBDIRS_) \
-	agentx \
 	asn1 \
 	docsis \
 	ethercat \
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index bcd606c161..25ba725df2 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -30,9 +30,6 @@ checkapi:
         $(MAKE) -f Makefile.nmake PLUGIN_TARGET=checkapi process-plugins 
 
 process-plugins:
-	cd agentx
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
-	cd ..
 	cd asn1
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
 	cd ..
@@ -88,7 +85,6 @@ process-plugins:
 install-plugins:
 !IFDEF ENABLE_LIBWIRESHARK
 	cd..
-	xcopy plugins\agentx\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy plugins\asn1\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy plugins\docsis\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
 	xcopy plugins\ethercat\*.dll $(INSTALL_DIR)\plugins\$(VERSION) /d
diff --git a/plugins/agentx/AUTHORS b/plugins/agentx/AUTHORS
deleted file mode 100644
index 1368ca6057..0000000000
--- a/plugins/agentx/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Author :
-Oleg Terletsky <oleg.terletsky@comverse.com>
diff --git a/plugins/agentx/Makefile.am b/plugins/agentx/Makefile.am
deleted file mode 100644
index 995adfb34b..0000000000
--- a/plugins/agentx/Makefile.am
+++ /dev/null
@@ -1,128 +0,0 @@
-# Makefile.am
-# Automake file for AgentX plugin
-#
-# $Id$
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# 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.
-#
-
-INCLUDES = -I$(top_srcdir) -I$(includedir)
-
-include Makefile.common
-
-if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS = -Werror
-endif
-
-plugindir = @plugindir@
-
-plugin_LTLIBRARIES = agentx.la
-agentx_la_SOURCES = \
-	plugin.c \
-	moduleinfo.h \
-	$(DISSECTOR_SRC) \
-	$(DISSECTOR_SUPPORT_SRC) \
-	$(DISSECTOR_INCLUDES)
-agentx_la_LDFLAGS = -module -avoid-version
-agentx_la_LIBADD = @PLUGIN_LIBS@
-
-# Libs must be cleared, or else libtool won't create a shared module.
-# If your module needs to be linked against any particular libraries,
-# add them here.
-LIBS =
-
-#
-# Build plugin.c, which contains the plugin version[] string, a
-# function plugin_register() that calls the register routines for all
-# protocols, and a function plugin_reg_handoff() that calls the handoff
-# registration routines for all protocols.
-#
-# We do this by scanning sources.  If that turns out to be too slow,
-# maybe we could just require every .o file to have an register routine
-# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
-#
-# Formatting conventions:  The name of the proto_register_* routines an
-# proto_reg_handoff_* routines must start in column zero, or must be
-# preceded only by "void " starting in column zero, and must not be
-# inside #if.
-#
-# DISSECTOR_SRC is assumed to have all the files that need to be scanned.
-#
-# For some unknown reason, having a big "for" loop in the Makefile
-# to scan all the files doesn't work with some "make"s; they seem to
-# pass only the first few names in the list to the shell, for some
-# reason.
-#
-# Therefore, we have a script to generate the plugin.c file.
-# The shell script runs slowly, as multiple greps and seds are run
-# for each input file; this is especially slow on Windows.  Therefore,
-# if Python is present (as indicated by PYTHON being defined), we run
-# a faster Python script to do that work instead.
-#
-# The first argument is the directory in which the source files live.
-# The second argument is "plugin", to indicate that we should build
-# a plugin.c file for a plugin.
-# All subsequent arguments are the files to scan.
-#
-plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
-    $(top_srcdir)/tools/make-dissector-reg.py
-	@if test -n "$(PYTHON)"; then \
-		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
-		    plugin $(DISSECTOR_SRC) ; \
-	else \
-		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
-		    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
-	fi
-
-#
-# Currently plugin.c can be included in the distribution because
-# we always build all protocol dissectors. We used to have to check
-# whether or not to build the snmp dissector. If we again need to
-# variably build something, making plugin.c non-portable, uncomment
-# the dist-hook line below.
-#
-# Oh, yuk.  We don't want to include "plugin.c" in the distribution, as
-# its contents depend on the configuration, and therefore we want it
-# to be built when the first "make" is done; however, Automake insists
-# on putting *all* source into the distribution.
-#
-# We work around this by having a "dist-hook" rule that deletes
-# "plugin.c", so that "dist" won't pick it up.
-#
-#dist-hook:
-#	@rm -f $(distdir)/plugin.c
-
-CLEANFILES = \
-	agentx \
-	*~
-
-MAINTAINERCLEANFILES = \
-	Makefile.in	\
-	plugin.c
-
-EXTRA_DIST = \
-	Makefile.common		\
-	Makefile.nmake		\
-	moduleinfo.nmake	\
-	plugin.rc.in
-
-checkapi:
-	$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/agentx/Makefile.common b/plugins/agentx/Makefile.common
deleted file mode 100644
index b86e0e2a6f..0000000000
--- a/plugins/agentx/Makefile.common
+++ /dev/null
@@ -1,39 +0,0 @@
-# Makefile.common for AgentX plugin
-#     Contains the stuff from Makefile.am and Makefile.nmake that is
-#     a) common to both files and
-#     b) portable between both files
-#
-# $Id$
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# 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.
-
-# the name of the plugin
-PLUGIN_NAME = agentx
-
-# the dissector sources (without any helpers)
-DISSECTOR_SRC = \
-	packet-agentx.c
-
-# corresponding headers
-DISSECTOR_INCLUDES =
-
-# Dissector helpers. They're included in the source files in this
-# directory, but they're not dissectors themselves, i.e. they're not
-# used to generate "plugin.c".
-DISSECTOR_SUPPORT_SRC =
diff --git a/plugins/agentx/Makefile.nmake b/plugins/agentx/Makefile.nmake
deleted file mode 100644
index acc863edc3..0000000000
--- a/plugins/agentx/Makefile.nmake
+++ /dev/null
@@ -1,106 +0,0 @@
-# Makefile.nmake
-# nmake file for Wireshark plugin
-#
-# $Id$
-#
-
-include ..\..\config.nmake
-include moduleinfo.nmake
-
-include Makefile.common
-
-CFLAGS=/WX /DHAVE_CONFIG_H /I../.. $(GLIB_CFLAGS) \
-	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
-
-.c.obj::
-	$(CC) $(CFLAGS) -Fd.\ -c $<
-
-LDFLAGS = $(PLUGIN_LDFLAGS)
-
-!IFDEF ENABLE_LIBWIRESHARK
-LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
-CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
-
-DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
-
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-
-OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj
-
-RESOURCE=$(PLUGIN_NAME).res
-
-all: $(PLUGIN_NAME).dll
-
-$(PLUGIN_NAME).rc : moduleinfo.nmake
-	sed -e s/@PLUGIN_NAME@/$(PLUGIN_NAME)/ \
-	-e s/@RC_MODULE_VERSION@/$(RC_MODULE_VERSION)/ \
-	-e s/@RC_VERSION@/$(RC_VERSION)/ \
-	-e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \
-	-e s/@PACKAGE@/$(PACKAGE)/ \
-	-e s/@VERSION@/$(VERSION)/ \
-	-e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \
-	< plugin.rc.in > $@
-
-$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
-	link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
-	$(GLIB_LIBS) $(RESOURCE)
-!IF $(MSC_VER_REQUIRED) >= 1400
-	mt.exe -nologo -manifest "$(PLUGIN_NAME).dll.manifest" -outputresource:$(PLUGIN_NAME).dll;2
-!ENDIF
-
-#
-# Build plugin.c, which contains the plugin version[] string, a
-# function plugin_register() that calls the register routines for all
-# protocols, and a function plugin_reg_handoff() that calls the handoff
-# registration routines for all protocols.
-#
-# We do this by scanning sources.  If that turns out to be too slow,
-# maybe we could just require every .o file to have an register routine
-# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
-#
-# Formatting conventions:  The name of the proto_register_* routines an
-# proto_reg_handoff_* routines must start in column zero, or must be
-# preceded only by "void " starting in column zero, and must not be
-# inside #if.
-#
-# DISSECTOR_SRC is assumed to have all the files that need to be scanned.
-#
-# For some unknown reason, having a big "for" loop in the Makefile
-# to scan all the files doesn't work with some "make"s; they seem to
-# pass only the first few names in the list to the shell, for some
-# reason.
-#
-# Therefore, we have a script to generate the plugin.c file.
-# The shell script runs slowly, as multiple greps and seds are run
-# for each input file; this is especially slow on Windows.  Therefore,
-# if Python is present (as indicated by PYTHON being defined), we run
-# a faster Python script to do that work instead.
-#
-# The first argument is the directory in which the source files live.
-# The second argument is "plugin", to indicate that we should build
-# a plugin.c file for a plugin.
-# All subsequent arguments are the files to scan.
-#
-!IFDEF PYTHON
-plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg.py
-	@echo Making plugin.c (using python)
-	@$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC)
-!ELSE
-plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg
-	@echo Making plugin.c (using sh)
-	@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
-!ENDIF
-
-!ENDIF
-
-clean:
-	rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \
-	    $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \
-	    $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc
-
-distclean: clean
-
-maintainer-clean: distclean
-
-checkapi:
-	$(PERL) ../../tools/checkAPIs.pl -g abort -g termoutput $(DISSECTOR_SRC)
diff --git a/plugins/agentx/moduleinfo.h b/plugins/agentx/moduleinfo.h
deleted file mode 100644
index c1418ebebf..0000000000
--- a/plugins/agentx/moduleinfo.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Included *after* config.h, in order to re-define these macros */
-
-#ifdef PACKAGE
-#undef PACKAGE
-#endif
-
-/* Name of package */
-#define PACKAGE "agentx"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.1"
-
diff --git a/plugins/agentx/moduleinfo.nmake b/plugins/agentx/moduleinfo.nmake
deleted file mode 100644
index e98a6ef9ba..0000000000
--- a/plugins/agentx/moduleinfo.nmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# $Id$
-#
-
-# The name
-PACKAGE=agentx
-
-# The version
-MODULE_VERSION_MAJOR=0
-MODULE_VERSION_MINOR=0
-MODULE_VERSION_MICRO=1
-MODULE_VERSION_EXTRA=0
-
-#
-# The RC_VERSION should be comma-separated, not dot-separated, 
-# as per Graham Bloice's message in
-#
-#	http://www.ethereal.com/lists/ethereal-dev/200303/msg00283.html
-#
-# "The RC_VERSION variable in config.nmake should be comma separated. 
-# This allows the resources to be built correctly and the version
-# number to be correctly displayed in the explorer properties dialog
-# for the executables, and XP's tooltip, rather than 0.0.0.0."
-#
-
-MODULE_VERSION=$(MODULE_VERSION_MAJOR).$(MODULE_VERSION_MINOR).$(MODULE_VERSION_MICRO).$(MODULE_VERSION_EXTRA)
-RC_MODULE_VERSION=$(MODULE_VERSION_MAJOR),$(MODULE_VERSION_MINOR),$(MODULE_VERSION_MICRO),$(MODULE_VERSION_EXTRA)
-
diff --git a/plugins/agentx/packet-agentx.c b/plugins/agentx/packet-agentx.c
deleted file mode 100644
index 079afbc5c5..0000000000
--- a/plugins/agentx/packet-agentx.c
+++ /dev/null
@@ -1,1111 +0,0 @@
-/* packet-agentx.c
- * Routines for Agent Extensibility (AgentX) Protocol disassembly
- * RFC 2257
- *
- * $Id$
- *
- * Copyright (c) 2005 by Oleg Terletsky <oleg.terletsky@comverse.com>
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1999 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 <ctype.h>
-#include <time.h>
-#include <string.h>
-#include <glib.h>
-
-#include <epan/packet.h>
-#include <epan/prefs.h>
-
-#include <epan/dissectors/packet-tcp.h>
-
-static guint global_agentx_tcp_port = 705;
-
-void proto_reg_handoff_agentx(void);
-
-
-/* Define the agentx proto */
-static int proto_agentx = -1;
-
-
-static int hf_version = -1;
-static int hf_type   = -1;
-static int hf_flags  = -1;
-static int hf_session_id = -1;
-static int hf_trans_id = -1;
-static int hf_packet_id = -1;
-static int hf_payload_len = -1;
-static int hf_ostring_len = -1;
-static int hf_ostring  = -1;
-static int hf_oid_sub = -1;
-static int hf_oid_prefix = -1;
-static int hf_oid_include = -1;
-static int hf_oid_str = -1;
-static int hf_resp_uptime = -1;
-static int hf_resp_error = -1;
-static int hf_resp_index = -1;
-static int hf_vtag = -1;
-static int hf_val32 = -1;
-static int hf_val64 = -1;
-static int hf_open_timeout = -1;
-static int hf_close_reason = -1;
-static int hf_reg_timeout = -1;
-static int hf_reg_prio = -1;
-static int hf_reg_rsid = -1;
-static int hf_reg_ubound = -1;
-static int hf_unreg_timeout = -1;
-static int hf_unreg_prio = -1;
-static int hf_unreg_rsid = -1;
-static int hf_unreg_ubound = -1;
-static int hf_gbulk_nrepeat = -1;
-static int hf_gbulk_mrepeat = -1;
-
-
-static gint ett_agentx = -1;
-static gint ett_pdu_hdr = -1;
-static gint ett_get = -1;
-static gint ett_getnext = -1;
-static gint ett_search_range = -1;
-static gint ett_obj_ident = -1;
-static gint ett_response = -1;
-static gint ett_valrep = -1;
-static gint ett_open = -1;
-static gint ett_close = -1;
-static gint ett_register = -1;
-static gint ett_unregister = -1;
-static gint ett_getbulk = -1;
-static gint ett_testset = -1;
-static gint ett_commitset = -1;
-static gint ett_undoset = -1;
-static gint ett_cleanupset = -1;
-static gint ett_notify = -1;
-static gint ett_ping = -1;
-static gint ett_idxalloc = -1;
-static gint ett_idxdalloc = -1;
-static gint ett_addcap = -1;
-static gint ett_remcap = -1;
-
-
-#define 	AGENTX_OPEN_PDU 		1
-#define         AGENTX_CLOSE_PDU   		2
-#define         AGENTX_REGISTER_PDU		3
-#define         AGENTX_UNREGISTER_PDU 		4
-#define         AGENTX_GET_PDU			5
-#define         AGENTX_GETNEXT_PDU		6
-#define         AGENTX_GETBULK_PDU		7
-#define         AGENTX_TESTSET_PDU		8
-#define         AGENTX_COMMITSET_PDU		9
-#define         AGENTX_UNDOSET_PDU		10
-#define         AGENTX_CLEANUPSET_PDU		11
-#define         AGENTX_NOTIFY_PDU		12
-#define         AGENTX_PING_PDU			13
-#define         AGENTX_INDEX_ALLOC_PDU		14
-#define         AGENTX_INDEX_DEALLOC_PDU	15
-#define         AGENTX_ADD_AGENT_CAPS_PDU	16
-#define         AGENTX_REM_AGENT_CAPS_PDU	17
-#define         AGENTX_RESPONSE_PDU		18
-
-
-static const value_string type_values [] = {
-	{ AGENTX_OPEN_PDU, 		"Open-PDU" },
-        { AGENTX_CLOSE_PDU, 		"Close-PDU" },
-        { AGENTX_REGISTER_PDU, 		"Register-PDU" },
-        { AGENTX_UNREGISTER_PDU, 	"Unregister-PDU" },
-        { AGENTX_GET_PDU, 		"Get-PDU" },
-        { AGENTX_GETNEXT_PDU, 		"GetNext-PDU" },
-        { AGENTX_GETBULK_PDU, 		"GetBulk-PDU" },
-        { AGENTX_TESTSET_PDU, 		"TestSet-PDU" },
-        { AGENTX_COMMITSET_PDU, 	"CommitSet-PDU" },
-        { AGENTX_UNDOSET_PDU, 		"UndoSet-PDU" },
-        { AGENTX_CLEANUPSET_PDU, 	"CleanupSet-PDU" },
-        { AGENTX_NOTIFY_PDU, 		"Notify-PDU" },
-        { AGENTX_PING_PDU, 		"Ping-PDU" },
-        { AGENTX_INDEX_ALLOC_PDU, 	"IndexAllocate-PDU" },
-        { AGENTX_INDEX_DEALLOC_PDU, 	"IndexDeallocate-PDU" },
-        { AGENTX_ADD_AGENT_CAPS_PDU, 	"AddAgentCaps-PDU" },
-        { AGENTX_REM_AGENT_CAPS_PDU, 	"RemoveAgentCaps-PDU" },
-        { AGENTX_RESPONSE_PDU, 		"Response-PDU" },
-        { 0, NULL }
-};
-
-
-/* VarBind types */
-
-#define VB_INT		2
-#define VB_OSTR		4
-#define VB_NULL		5
-#define VB_OID		6
-#define VB_IPADDR	64
-#define VB_COUNTER32	65
-#define VB_GAUGE32	66
-#define VB_TIMETICK	67
-#define VB_OPAQUE	68
-#define VB_COUNTER64	70
-#define VB_NOSUCHOBJ	128
-#define VB_NOSUCHINST	129
-#define VB_ENDOFMIB	130
-
-
-static const value_string vtag_values [] = {
-	{ VB_INT,		"Integer" },
- 	{ VB_OSTR,		"Octet String" },
- 	{ VB_NULL,		"Null" },
- 	{ VB_OID,		"Object Identifier" },
- 	{ VB_IPADDR,		"IpAddress" },
- 	{ VB_COUNTER32,		"Counter32" },
- 	{ VB_GAUGE32,		"Gauge32" },
- 	{ VB_TIMETICK,		"TimeTicks" },
- 	{ VB_OPAQUE,		"Opaque" },
- 	{ VB_COUNTER64,		"Counter64" },
- 	{ VB_NOSUCHOBJ,		"noSuchObject" },
- 	{ VB_NOSUCHINST,	"noSuchInstance" },
-	{ VB_ENDOFMIB,		"endOfMibView" },
-	{ 0, NULL }
-};
-
-
-/* Close reasons */
-#define CREASON_OTHER 		1
-#define CREASON_PARSE_ERROR 	2
-#define CREASON_PROTOCOL_ERROR 	3
-#define CREASON_TIMEOUTS 	4
-#define CREASON_SHUTDOWN 	5
-#define CREASON_BY_MANAGER 	6
-
-
-static const value_string close_reasons[] = {
-	{ CREASON_OTHER, 		"reasonOther" },
-	{ CREASON_PARSE_ERROR, 		"reasonParseError" },
-	{ CREASON_PROTOCOL_ERROR, 	"reasonProtocolError" },
-	{ CREASON_TIMEOUTS, 		"reasonTimeouts" },
-	{ CREASON_SHUTDOWN , 		"reasonShutdown" },
-	{ CREASON_BY_MANAGER, 		"reasonByManager" },
-	{ 0, NULL }
-};
-
-
-/* Response errors */
-#define AGENTX_NO_ERROR		0
-#define AGENTX_TOO_BIG		1
-#define AGENTX_NO_SUCH_NAME	2
-#define AGENTX_BAD_VALUE	3
-#define AGENTX_READ_ONLY	4
-#define AGENTX_GEN_ERROR	5
-#define AGENTX_NO_ACCESS	6
-#define AGENTX_WRONG_TYPE	7
-#define AGENTX_WRONG_LEN	8
-#define AGENTX_WRONG_ENCODE	9
-#define AGENTX_WRONG_VALUE	10
-#define AGENTX_NO_CREATION	11
-#define AGENTX_INCONSIST_VALUE	12
-#define AGENTX_RES_UNAVAIL	13
-#define AGENTX_COMMIT_FAILED	14
-#define AGENTX_UNDO_FAILED	15
-#define AGENTX_AUTH_ERROR	16
-#define AGENTX_NOTWRITABLE	17
-#define AGENTX_INCONSIS_NAME	18
-#define AGENTX_OPEN_FAILED	256
-#define AGENTX_NOT_OPEN		257
-#define AGENTX_IDX_WRONT_TYPE	258
-#define AGENTX_IDX_ALREAY_ALLOC	259
-#define AGENTX_IDX_NONEAVAIL	260
-#define AGENTX_IDX_NOTALLOC	261
-#define AGENTX_UNSUPP_CONTEXT	262
-#define AGENTX_DUP_REGISTR	263
-#define AGENTX_UNKNOWN_REG	264
-#define AGENTX_UNKNOWN_CAPS	265
-
-
-static const value_string resp_errors[] = {
-  { AGENTX_NO_ERROR, 		"noError" },
-  { AGENTX_TOO_BIG,		"tooBig" },
-  { AGENTX_NO_SUCH_NAME,	"noSuchName" },
-  { AGENTX_BAD_VALUE,		"badValue" },
-  { AGENTX_READ_ONLY,		"readOnly" },
-  { AGENTX_GEN_ERROR,		"genErr" },
-  { AGENTX_NO_ACCESS,		"noAccess" },
-  { AGENTX_WRONG_TYPE, 		"wrongType" },
-  { AGENTX_WRONG_LEN, 		"wrongLength" },
-  { AGENTX_WRONG_ENCODE, 	"wrongEncoding" },
-  { AGENTX_WRONG_VALUE, 	"wrongValue" },
-  { AGENTX_NO_CREATION, 	"noCreation" },
-  { AGENTX_INCONSIST_VALUE, 	"inconsistentValue" },
-  { AGENTX_RES_UNAVAIL, 	"resourceUnavailable" },
-  { AGENTX_COMMIT_FAILED, 	"commitFailed" },
-  { AGENTX_UNDO_FAILED ,	"undoFailed" },
-  { AGENTX_AUTH_ERROR, 		"authorizationError" },
-  { AGENTX_NOTWRITABLE, 	"notWritable" },
-  { AGENTX_INCONSIS_NAME, 	"inconsistentName" },
-  { AGENTX_OPEN_FAILED, 	"openFailed" },
-  { AGENTX_NOT_OPEN, 		"notOpen" },
-  { AGENTX_IDX_WRONT_TYPE, 	"indexWrongType" },
-  { AGENTX_IDX_ALREAY_ALLOC, 	"indexAlreadyAllocated" },
-  { AGENTX_IDX_NONEAVAIL, 	"indexNoneAvailable" },
-  { AGENTX_IDX_NOTALLOC, 	"indexNotAllocated" },
-  { AGENTX_UNSUPP_CONTEXT, 	"unsupportedContext" },
-  { AGENTX_DUP_REGISTR, 	"duplicateRegistration" },
-  { AGENTX_UNKNOWN_REG, 	"unknownRegistration" },
-  { AGENTX_UNKNOWN_CAPS, 	"unknownAgentCaps" },
-  { 0, NULL }
-};
-
-
-
-
-/* PDU Header flags */
-
-#define INSTANCE_REGISTRATION 	0
-#define NEW_INDEX 		0x1
-#define ANY_INDEX		0x2
-#define NON_DEFAULT_CONTEXT	0x4
-#define NETWORK_BYTE_ORDER	0x8
-
-#define PDU_HDR_LEN	20
-#define PADDING(x) ((((x) + 3) >> 2) << 2)
-
-#define NORLEL(flags,var,tvb,offset) \
-	var = (flags & NETWORK_BYTE_ORDER) ? \
-		tvb_get_ntohl(tvb, offset) : \
-		tvb_get_letohl(tvb, offset)
-#define NORLES(flags,var,tvb,offset) \
-	var = (flags & NETWORK_BYTE_ORDER) ? \
-		tvb_get_ntohs(tvb, offset) : \
-		tvb_get_letohs(tvb, offset)
-
-static int dissect_octet_string(tvbuff_t *tvb, proto_tree *tree, int offset, char flags)
-{
-	guint32 n_oct, p_noct;
-	char context[1024];
-
-	NORLEL(flags, n_oct, tvb, offset);
-
-	p_noct = PADDING(n_oct);
-	if (n_oct >= 1024)
-		THROW(ReportedBoundsError);
-	tvb_get_nstringz(tvb, offset + 4, n_oct, context);
-	context[n_oct]='\0';
-
-	proto_tree_add_uint(tree,hf_ostring_len,tvb,offset,4,n_oct);
-	proto_tree_add_string(tree, hf_ostring, tvb, offset + 4, n_oct, context);
-	return p_noct + 4;
-
-}
-
-/* XXX - Is there a particular reason we're not using oid_encoded2string() here? */
-static int convert_oid_to_str(guint32 *oid, int len, char* str, int slen, char prefix)
-{
-	int i, tlen = 0;
-	if(!oid) return 0;
-	if(!str) return 0;
-	if(!len) return 0;
-	if(!slen) return 0;
-	if(slen < len) return 0;
-
-	if(prefix) {
-		tlen += g_snprintf(str,slen,".1.3.6.1.%d",prefix);
-	}
-
-	for(i=0; i < len && tlen < slen; i++) {
-		tlen += g_snprintf(str+tlen,slen-tlen,".%d",oid[i]);
-	}
-	return tlen;
-}
-
-static int dissect_object_id(tvbuff_t *tvb, proto_tree *tree, int offset, char flags)
-{
-	guint8 n_subid;
-	guint8 prefix;
-	guint8 include;
-	proto_item* item;
-	proto_tree* subtree;
-	guint32 oid[2048];
-	char str_oid[2048];
-	int i, slen;
-
-	memset(oid, '\0', sizeof(oid));
-	memset(str_oid, '\0', sizeof(str_oid));
-
-	n_subid = tvb_get_guint8(tvb, offset);
-	prefix = tvb_get_guint8(tvb, offset + 1);
-	include = tvb_get_guint8(tvb,offset + 2);
-	tvb_get_guint8(tvb, offset + 3);
-
-	for(i=0; i<n_subid; i++) {
-		NORLEL(flags, oid[i], tvb, (offset+4) + (i*4));
-	}
-
-	if(!(slen = convert_oid_to_str(&oid[0], n_subid, &str_oid[0], 2048, prefix)))
-		return offset;
-
-
-	if(tree) {
-		item = proto_tree_add_text(tree,tvb,offset,n_subid + 4 ,
-				"Object Identifier: (%s) %s",(include) ? "Start" : "End" , str_oid);
-		subtree = proto_item_add_subtree(item, ett_obj_ident);
-	} else return offset;
-
-	proto_tree_add_uint(subtree, hf_oid_sub, tvb, offset, 1, n_subid);
-	proto_tree_add_uint(subtree, hf_oid_prefix, tvb, offset + 1, 1, prefix);
-	proto_tree_add_uint(subtree, hf_oid_include, tvb, offset + 2, 1, include);
-	proto_tree_add_string(subtree,hf_oid_str, tvb, offset + 4, slen, str_oid);
-
-	return 4 + (n_subid * 4);
-}
-
-static int dissect_search_range(tvbuff_t *tvb, proto_tree *tree, int offset, char flags)
-{
-
-	offset += dissect_object_id(tvb, tree, offset, flags);
-	offset += dissect_object_id(tvb, tree, offset, flags);
-
-	return offset;
-}
-
-static int dissect_val64(tvbuff_t *tvb, proto_tree *tree, int offset, char flags)
-{
-	gboolean little_endian = !(flags & NETWORK_BYTE_ORDER);
-
-	proto_tree_add_item(tree, hf_val64, tvb, offset, 8, little_endian);
-
-	return 8;
-}
-
-static int dissect_val32(tvbuff_t *tvb, proto_tree *tree, int offset, char flags)
-{
-	gboolean little_endian = !(flags & NETWORK_BYTE_ORDER);
-
-	proto_tree_add_item(tree, hf_val32, tvb, offset, 4, little_endian);
-
-	return 4;
-}
-
-static int dissect_varbind(tvbuff_t *tvb, proto_tree *tree, int offset, int len, char flags)
-{
-	guint16 vtag;
-	int tlen;
-	proto_item* item;
-	proto_tree* subtree;
-
-	NORLES(flags, vtag, tvb, offset);
-	/* 2 reserved bytes after this */
-
-	if(tree) {
-		item = proto_tree_add_text(tree,tvb, offset, len, "Value Representation");
-		subtree = proto_item_add_subtree(item, ett_valrep);
-	} else return len;
-
-	proto_tree_add_uint(subtree, hf_vtag, tvb, offset, 2, vtag);
-	tlen = dissect_object_id(tvb, subtree, offset + 4, flags);
-
-	switch(vtag)
-	{
-     		case  VB_OID:
-			tlen += dissect_object_id(tvb, subtree, offset + tlen + 4, flags);
-		break;
-
-     		case  VB_OPAQUE:
-     		case  VB_OSTR:
-     		case  VB_IPADDR:
-			tlen += dissect_octet_string(tvb, subtree,offset + tlen + 4,flags);
-		break;
-
-     		case  VB_TIMETICK:
-     		case  VB_COUNTER32:
-     		case  VB_INT:
-    		case  VB_GAUGE32:
-			tlen += dissect_val32(tvb, subtree,offset + tlen + 4, flags);
-		break;
-
-     		case  VB_COUNTER64:
-			tlen += dissect_val64(tvb, subtree,offset + tlen + 4, flags);
-		break;
-
-     		case  VB_NULL:
-     		case  VB_NOSUCHOBJ:
-     		case  VB_NOSUCHINST:
-     		case  VB_ENDOFMIB:
-		break;
-	}
-	return tlen + 4;
-}
-
-static void dissect_response_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-	gboolean little_endian = !(flags & NETWORK_BYTE_ORDER);
-	guint32 r_uptime;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Response-PDU");
-	subtree = proto_item_add_subtree(item, ett_response);
-
-	r_uptime = little_endian ? \
-	    tvb_get_letohl(tvb, offset) : tvb_get_ntohl(tvb, offset);
-
-	proto_tree_add_uint_format(subtree, hf_resp_uptime, tvb, offset, 4, r_uptime,
-			"sysUptime: %s", time_msecs_to_str(r_uptime));
-	proto_tree_add_item(subtree, hf_resp_error,  tvb, offset + 4, 2, little_endian);
-	proto_tree_add_item(subtree, hf_resp_index,  tvb, offset + 6, 2, little_endian);
-	offset += 8;
-
-	while(len > offset) {
-		offset += dissect_varbind(tvb, subtree, offset, len, flags);
-	}
-}
-
-static void dissect_getnext_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-	proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "GetNext-PDU");
-	subtree = proto_item_add_subtree(item, ett_getnext);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-		/* show context */
-		offset += dissect_octet_string(tvb, subtree, offset, flags);
-	}
-
-	while(len > offset) {
-		offset += dissect_search_range(tvb, subtree, offset, flags);
-	}
-}
-
-static void dissect_get_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Get-PDU");
-	subtree = proto_item_add_subtree(item, ett_get);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	while(len >= offset) {
-                offset += dissect_search_range(tvb, subtree, offset, flags);
-		offset += 4; /* skip 0 end dword */
-        }
-}
-
-static void dissect_getbulk_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-	gboolean little_endian = !(flags & NETWORK_BYTE_ORDER);
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "GetBulk-PDU");
-	subtree = proto_item_add_subtree(item, ett_getbulk);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	proto_tree_add_item(subtree, hf_gbulk_nrepeat,  tvb, offset, 2, little_endian);
-	proto_tree_add_item(subtree, hf_gbulk_mrepeat,  tvb, offset + 2, 2, little_endian);
-	offset+=4;
-
-	while(len >= offset) {
-                offset += dissect_search_range(tvb, subtree, offset, flags);
-	}
-}
-
-static void dissect_open_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-	proto_tree* subtree;
-	guint8 timeout;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Open-PDU");
-	subtree = proto_item_add_subtree(item, ett_open);
-
-	timeout = tvb_get_guint8(tvb, offset);
-	tvb_get_ntoh24(tvb, offset + 1);
-
-	proto_tree_add_uint(subtree, hf_open_timeout, tvb, offset, 1, timeout);
-	offset+=4;
-
-	/* Search Range */
-	offset += dissect_object_id(tvb, subtree, offset, flags);
-
-	/* Octet string */
-	offset += dissect_octet_string(tvb, subtree, offset, flags);
-}
-
-static void dissect_close_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len)
-{
-	proto_item* item;
-        proto_tree* subtree;
-	guint8 reason;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Close-PDU");
-	subtree = proto_item_add_subtree(item, ett_close);
-
-	reason = tvb_get_guint8(tvb, offset);
-	tvb_get_ntoh24(tvb, offset + 1);
-
-	proto_tree_add_uint(subtree, hf_close_reason, tvb, offset, 1, reason);
-	offset+=4;
-}
-
-
-static void dissect_register_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-	gboolean little_endian = !(flags & NETWORK_BYTE_ORDER);
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Register-PDU");
-	subtree = proto_item_add_subtree(item, ett_register);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	proto_tree_add_item(subtree, hf_reg_timeout, tvb, offset, 1, FALSE);
-	proto_tree_add_item(subtree, hf_reg_prio, tvb, offset+1, 1, FALSE);
-	proto_tree_add_item(subtree, hf_reg_rsid, tvb, offset+2, 1, FALSE);
-	offset+=4;
-
-	/* Region */
-
-	offset += dissect_object_id(tvb, subtree, offset, flags);
-
-	if(len > offset) {
-		/* Upper bound (opt) */
-		proto_tree_add_item(subtree, hf_reg_ubound, tvb, offset, 4, little_endian);
-		offset += 4;
-	}
-}
-
-
-static void dissect_unregister_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-	gboolean little_endian = !(flags & NETWORK_BYTE_ORDER);
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Unregister-PDU");
-	subtree = proto_item_add_subtree(item, ett_unregister);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-        proto_tree_add_item(subtree, hf_unreg_timeout, tvb, offset, 1, FALSE);
-        proto_tree_add_item(subtree, hf_unreg_prio, tvb, offset+1, 1, FALSE);
-        proto_tree_add_item(subtree, hf_unreg_rsid, tvb, offset+2, 1, FALSE);
-        offset+=4;
-
-        /* Region */
-        offset += dissect_object_id(tvb, subtree, offset, flags);
-
-        if(len > offset) {
-	        /* Upper bound (opt) */
-                proto_tree_add_item(subtree, hf_unreg_ubound, tvb, offset, 4, little_endian);
-                offset += 4;
-        }
-}
-
-static void dissect_testset_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Testset-PDU");
-	subtree = proto_item_add_subtree(item, ett_testset);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	while(len > offset) {
-		offset += dissect_varbind(tvb, subtree, offset, len, flags);
-	}
-}
-
-static void dissect_notify_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Notify-PDU");
-	subtree = proto_item_add_subtree(item, ett_notify);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	while(len > offset) {
-                offset += dissect_varbind(tvb, subtree, offset, len, flags);
-        }
-}
-
-static void dissect_ping_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "Ping-PDU");
-	subtree = proto_item_add_subtree(item, ett_ping);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-}
-
-static void dissect_idx_alloc_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "IndexAllocate-PDU");
-	subtree = proto_item_add_subtree(item, ett_idxalloc);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	while(len > offset) {
-		offset += dissect_varbind(tvb, subtree, offset, len, flags);
-	}
-}
-
-
-static void dissect_idx_dealloc_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-        proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "IndexDeallocate-PDU");
-	subtree = proto_item_add_subtree(item, ett_idxdalloc);
-
-        if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-        while(len > offset) {
-                offset += dissect_varbind(tvb, subtree, offset, len, flags);
-        }
-}
-
-static void dissect_add_caps_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-	proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "AddAgentCaps-PDU");
-	subtree = proto_item_add_subtree(item, ett_addcap);
-
-	if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-	offset += dissect_object_id(tvb, subtree, offset, flags);
-
-	offset += dissect_octet_string(tvb, subtree, offset, flags);
-}
-
-static void dissect_rem_caps_pdu(tvbuff_t *tvb, proto_tree *tree,int offset,int len, char flags)
-{
-        proto_item* item;
-        proto_tree* subtree;
-
-	item = proto_tree_add_text(tree, tvb, offset, len, "RemoveAgentCaps-PDU");
-	subtree = proto_item_add_subtree(item, ett_remcap);
-
-        if(flags & NON_DEFAULT_CONTEXT) {
-                /* show context */
-                offset += dissect_octet_string(tvb, subtree, offset, flags);
-        }
-
-        offset += dissect_object_id(tvb, subtree, offset, flags);
-}
-
-
-static guint get_agentx_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
-{
-	guint8  flags;
-	guint32 plen;
-
-	/*
-	 * Get the payload length.
-	 */
-	flags = tvb_get_guint8(tvb, offset + 2);
-	NORLEL(flags, plen, tvb, offset + 16);
-
-	/*
-	 * Arbitrarily limit it to 2^24, so we don't have to worry about
-	 * overflow.
-	 */
-	if (plen > 0xFFFFFF)
-		plen = 0xFFFFFF;
-
-	/*
-	 * That length doesn't include the header; add that in.
-	 */
-	return plen + 20;
-}
-
-static void dissect_agentx_pdu(tvbuff_t *tvb, packet_info *pinfo,
-    proto_tree *tree)
-{
-	int offset = 0;
-	proto_tree* agentx_tree ,*pdu_hdr_tree;
-	proto_item* pdu_item , *t_item;
-	guint8 version;
-	guint8 type;
-	guint8 flags;
-	guint32 session_id;
-	guint32 trans_id;
-	guint32 packet_id;
-	guint32 payload_len;
-
-	version = tvb_get_guint8(tvb,0); offset+=1;
-	type = tvb_get_guint8(tvb,1); offset+=1;
-	flags = tvb_get_guint8(tvb,2); offset+=1;
-	/* skip reserved byte */
-	offset+=1;
-
-	NORLEL(flags, session_id, tvb, 4); offset+=4;
-	NORLEL(flags, trans_id, tvb, 8); offset+=4;
-	NORLEL(flags, packet_id, tvb, 12); offset+=4;
-	NORLEL(flags, payload_len, tvb, 16); offset+=4;
-
-        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-                col_set_str(pinfo->cinfo, COL_PROTOCOL, "AgentX");
-
-        if (check_col(pinfo->cinfo, COL_INFO))
-                col_add_fstr(pinfo->cinfo, COL_INFO, "%s: sid=%d, tid=%d, packid=%d, plen=%d",
-			val_to_str(type,type_values,"unknown"),
-			session_id,trans_id,packet_id,payload_len);
-
-
-	if(!tree)
-		return;
-
-	/*t_item = proto_tree_add_item(tree, proto_agentx, tvb, 0, -1, FALSE);*/
-	t_item = proto_tree_add_protocol_format(tree, proto_agentx, tvb, 0, -1,
-                "Agent Extensibility (AgentX) Protocol: %s, sid=%d, tid=%d, packid=%d, plen=%d",
-			val_to_str(type,type_values,"unknown"),
-			session_id,trans_id,packet_id,payload_len);
-	agentx_tree = proto_item_add_subtree(t_item, ett_agentx);
-
-	pdu_item = proto_tree_add_text(agentx_tree, tvb, 0, 5, "PDU Header: Type[%u], len=%d, sid=%d, tid=%d, packid=%d",
-			(char)type,payload_len,session_id,trans_id,packet_id);
-
-	pdu_hdr_tree = proto_item_add_subtree(pdu_item, ett_pdu_hdr);
-
-	proto_tree_add_uint(pdu_hdr_tree,hf_version,tvb,0,1,version);
-	proto_tree_add_uint(pdu_hdr_tree,hf_type,tvb,1,1,type);
-	proto_tree_add_uint(pdu_hdr_tree,hf_flags,tvb,2,1,flags);
-	proto_tree_add_uint(pdu_hdr_tree,hf_session_id,tvb,4,4,session_id);
-	proto_tree_add_uint(pdu_hdr_tree,hf_trans_id,tvb,8,4,trans_id);
-	proto_tree_add_uint(pdu_hdr_tree,hf_packet_id,tvb,12,4,packet_id);
-	proto_tree_add_uint(pdu_hdr_tree,hf_payload_len,tvb,16,4,payload_len);
-
-	switch(type) {
-		case AGENTX_OPEN_PDU:
-		dissect_open_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_CLOSE_PDU:
-		dissect_close_pdu(tvb, pdu_hdr_tree, offset,payload_len);
-		break;
-
-        	case AGENTX_REGISTER_PDU:
-		dissect_register_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_UNREGISTER_PDU:
-		dissect_unregister_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_GET_PDU:
-		dissect_get_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_GETNEXT_PDU:
-		dissect_getnext_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-       	 	case AGENTX_GETBULK_PDU:
-		dissect_getbulk_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_TESTSET_PDU:
-		dissect_testset_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_COMMITSET_PDU:
-        	case AGENTX_UNDOSET_PDU:
-        	case AGENTX_CLEANUPSET_PDU:
-			/* there is no parameters */
-		break;
-
-        	case AGENTX_NOTIFY_PDU:
-		dissect_notify_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_PING_PDU:
-		dissect_ping_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_INDEX_ALLOC_PDU:
-		dissect_idx_alloc_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_INDEX_DEALLOC_PDU:
-		dissect_idx_dealloc_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_ADD_AGENT_CAPS_PDU:
-		dissect_add_caps_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_REM_AGENT_CAPS_PDU:
-		dissect_rem_caps_pdu(tvb, pdu_hdr_tree, offset,payload_len,flags);
-		break;
-
-        	case AGENTX_RESPONSE_PDU:
-		dissect_response_pdu(tvb, pdu_hdr_tree, offset, payload_len, flags);
-		break;
-	}
-}
-
-static void dissect_agentx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 20, get_agentx_pdu_len,
-	    dissect_agentx_pdu);
-}
-
-void
-proto_register_agentx(void)
-{
-  static hf_register_info hf[] = {
-
-    { &hf_version,
-      { "Version        ", "agentx.version", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "header version", HFILL }},
-
-    { &hf_type,
-      { "Type           ", "agentx.type", FT_UINT8, BASE_DEC, VALS(type_values), 0x0,
-        "header type", HFILL }},
-
-    { &hf_flags,
-      { "Flags          ", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "header type", HFILL }},
-
-    { &hf_session_id,
-      { "sessionID      ", "agentx.session_id", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Session ID", HFILL }},
-
-    { &hf_trans_id,
-      { "TransactionID  ", "agentx.transaction_id", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Transaction ID", HFILL }},
-
-    { &hf_packet_id,
-      { "PacketID       ", "agentx.packet_id", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Packet ID", HFILL }},
-
-    { &hf_payload_len,
-      { "Payload length ", "agentx.payload_len", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Payload length", HFILL }},
-
-    { &hf_ostring,
-      { "Octet String", "agentx.ostring", FT_STRING, BASE_NONE, NULL, 0x0,
-        "Octet String", HFILL }},
-
-    { &hf_ostring_len,
-      { "OString len", "agentx.ostring_len", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Octet String Length", HFILL }},
-
-    { &hf_oid_sub,
-      { "Number subids ", "agentx.n_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Number subids", HFILL }},
-
-    { &hf_oid_prefix,
-      { "OID prefix    ", "agentx.oid_prefix", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "OID prefix", HFILL }},
-
-    { &hf_oid_include,
-      { "OID include   ", "agentx.oid_include", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "OID include", HFILL }},
-
-    { &hf_oid_str,
-      { "OID", "agentx.oid", FT_STRING, BASE_DEC, NULL, 0x0,
-        "OID", HFILL }},
-
-    { &hf_resp_uptime,
-      { "sysUpTime", "agentx.r.uptime", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "sysUpTime", HFILL }},
-
-    { &hf_resp_error,
-      { "Resp. error", "agentx.r.error", FT_UINT16, BASE_DEC, VALS(resp_errors), 0x0,
-        "response error", HFILL }},
-
-    { &hf_resp_index,
-      { "Resp. index", "agentx.r.index", FT_UINT16, BASE_DEC, NULL, 0x0,
-        "response index", HFILL }},
-
-    { &hf_vtag,
-      { "Variable type", "agentx.v.tag", FT_UINT16, BASE_DEC, VALS(vtag_values), 0x0,
-        "vtag", HFILL }},
-
-    { &hf_val32,
-      { "Value(32)", "agentx.v.val32", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "val32", HFILL }},
-
-    { &hf_val64,
-      { "Value(64)", "agentx.v.val64", FT_UINT64, BASE_DEC, NULL, 0x0,
-        "val64", HFILL }},
-
-    { &hf_open_timeout,
-      { "Timeout", "agentx.o.timeout", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "open timeout", HFILL }},
-
-    { &hf_close_reason,
-      { "Reason", "agentx.c.reason", FT_UINT8, BASE_DEC, VALS(close_reasons), 0x0,
-        "close reason", HFILL }},
-
-    { &hf_reg_timeout,
-      { "Timeout", "agentx.r.timeout", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Register timeout", HFILL }},
-
-    { &hf_reg_prio,
-      { "Priority", "agentx.r.priority", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Register Priority", HFILL }},
-
-    { &hf_reg_rsid,
-      { "Range_subid", "agentx.r.range_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Register range_subid", HFILL }},
-
-    { &hf_reg_ubound,
-      { "Upper bound", "agentx.r.upper_bound", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Register upper bound", HFILL }},
-
-    { &hf_unreg_timeout,
-      { "Timeout", "agentx.u.timeout", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Unregister timeout", HFILL }},
-
-    { &hf_unreg_prio,
-      { "Priority", "agentx.u.priority", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Unegister Priority", HFILL }},
-
-    { &hf_unreg_rsid,
-      { "Range_subid", "agentx.u.range_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Unegister range_subid", HFILL }},
-
-    { &hf_unreg_ubound,
-      { "Upper bound", "agentx.u.upper_bound", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Register upper bound", HFILL }},
-
-    { &hf_gbulk_nrepeat,
-      { "Repeaters", "agentx.gb.nrepeat", FT_UINT16, BASE_DEC, NULL, 0x0,
-        "getBulk Num. repeaters", HFILL }},
-
-    { &hf_gbulk_mrepeat,
-      { "Max Repetition", "agentx.gb.mrepeat", FT_UINT16, BASE_DEC, NULL, 0x0,
-        "getBulk Max repetition", HFILL }},
-
-
-    /* Add more fields here */
-
-  };
-
-  static gint *ett[] = {
-	&ett_agentx,
-	&ett_pdu_hdr,
-	&ett_get,
-	&ett_getnext,
-	&ett_search_range,
-	&ett_obj_ident,
-	&ett_response,
-	&ett_valrep,
-	&ett_open,
-	&ett_close,
-	&ett_register,
-	&ett_unregister,
-	&ett_getbulk,
-	&ett_testset,
- 	&ett_commitset,
-	&ett_undoset,
- 	&ett_cleanupset,
- 	&ett_notify,
- 	&ett_ping,
- 	&ett_idxalloc,
- 	&ett_idxdalloc,
- 	&ett_addcap,
- 	&ett_remcap,
-  };
-
-
-  module_t *agentx_module;
-
-  proto_agentx = proto_register_protocol("AgentX",
-				       "AgentX", "agentx");
-
-  proto_register_field_array(proto_agentx, hf, array_length(hf));
-  proto_register_subtree_array(ett, array_length(ett));
-
-  agentx_module = prefs_register_protocol(proto_agentx, proto_reg_handoff_agentx);
-
-  prefs_register_uint_preference(agentx_module, "tcp.agentx_port",
-				 "AgentX listener TCP Port",
-				 "Set the TCP port for AgentX"
-				 "(if other than the default of 705)",
-				 10, &global_agentx_tcp_port);
-}
-
-/* The registration hand-off routine */
-void
-proto_reg_handoff_agentx(void)
-{
-	static gboolean agentx_prefs_initialized = FALSE;
-	static dissector_handle_t agentx_handle;
-	static guint agentx_tcp_port;
-
-	if(!agentx_prefs_initialized) {
-                agentx_handle = create_dissector_handle(dissect_agentx, proto_agentx);
-                agentx_prefs_initialized = TRUE;
-        }
-        else {
-                dissector_delete("tcp.port", agentx_tcp_port, agentx_handle);
-        }
-
-        agentx_tcp_port = global_agentx_tcp_port;
-	dissector_add("tcp.port", agentx_tcp_port, agentx_handle);
-}
diff --git a/plugins/agentx/plugin.rc.in b/plugins/agentx/plugin.rc.in
deleted file mode 100644
index 568dc07b49..0000000000
--- a/plugins/agentx/plugin.rc.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "winver.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @RC_MODULE_VERSION@
- PRODUCTVERSION @RC_VERSION@
- FILEFLAGSMASK 0x0L
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
-            VALUE "FileDescription", "@PACKAGE@ dissector\0"
-            VALUE "FileVersion", "@MODULE_VERSION@\0"
-            VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0"
-            VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
-            VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0"
-            VALUE "ProductName", "Wireshark\0"
-            VALUE "ProductVersion", "@VERSION@\0"
-            VALUE "Comments", "Build with @MSVC_VARIANT@\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END