From Shaun Jackman

The RDM protocol has been accepted as ANSI standard E1.20-2006. The following patch updates the decoder to that spec. 
At the same time it is promoted to a build-in dissector.

svn path=/trunk/; revision=19596

16 files changed, 278 insertions, 865 deletions

diff --git a/Makefile.am b/Makefile.am
index ef846fb7a4..bce61819ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -206,7 +206,6 @@ plugin_libs = \
 	plugins/opsi/opsi.la \
 	plugins/pcli/pcli.la \
 	plugins/profinet/profinet.la \
-	plugins/rdm/rdm.la \
 	plugins/rlm/rlm.la \
 	plugins/rtnet/rtnet.la \
 	plugins/rudp/rudp.la \
@@ -240,7 +239,6 @@ plugin_ldadd = \
 	"-dlopen" plugins/opsi/opsi.la \
 	"-dlopen" plugins/pcli/pcli.la \
 	"-dlopen" plugins/profinet/profinet.la \
-	"-dlopen" plugins/rdm/rdm.la \
 	"-dlopen" plugins/rlm/rlm.la \
 	"-dlopen" plugins/rtnet/rtnet.la \
 	"-dlopen" plugins/rudp/rudp.la \
diff --git a/configure.in b/configure.in
index ba5825eacd..889645a5de 100644
--- a/configure.in
+++ b/configure.in
@@ -1379,7 +1379,6 @@ AC_OUTPUT(
   plugins/opsi/Makefile
   plugins/pcli/Makefile
   plugins/profinet/Makefile
-  plugins/rdm/Makefile
   plugins/rlm/Makefile
   plugins/rtnet/Makefile
   plugins/rudp/Makefile
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 1dc736c9d6..f4187b45d4 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -547,6 +547,7 @@ DISSECTOR_SRC =	\
 	packet-radiotap.c	\
 	packet-ranap.c	\
 	packet-raw.c	\
+	packet-rdm.c	\
 	packet-rdt.c	\
 	packet-redback.c \
 	packet-retix-bpdu.c \
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
new file mode 100644
index 0000000000..bc2220e0d0
--- /dev/null
+++ b/epan/dissectors/packet-rdm.c
@@ -0,0 +1,277 @@
+/* packet-rdm.c
+ * RDM (Remote Device Management) packet disassembly.
+ *
+ * $Id$
+ *
+ * This dissector is written by
+ *
+ *  Shaun Jackman <sjackman@gmail.com>
+ *  Copyright 2006 Pathway Connectivity
+ *
+ *  Erwin Rol <erwin@erwinrol.com>
+ *  Copyright 2003 Erwin Rol
+ *
+ *  Wireshark - Network traffic analyzer
+ *  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., 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301, USA.
+ */
+/* 
+ * ANSI E1.20-2006, Entertainment Technology
+ * Remote Device Management over USITT DMX512, describes a method of
+ * bi-directional communications over a USITT DMX512/1990 data link
+ * between an entertainment lighting controller and one or more
+ * remotely controlled lighting devices. The protocol also is intended
+ * to work with the ANSI E1.11-2004 control protocol. It allows
+ * discovery of devices on a DMX512/E1.11 network and the remote
+ * setting of DMX starting addresses, as well as status and fault
+ * reporting back to the control console.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+#include <epan/packet.h>
+
+static int proto_rdm = -1;
+
+static int hf_rdm_start_code = -1;
+static int hf_rdm_sub_start_code = -1;
+static int hf_rdm_message_length = -1;
+static int hf_rdm_dest_uid = -1;
+static int hf_rdm_src_uid = -1;
+static int hf_rdm_transaction_number = -1;
+static int hf_rdm_response_type = -1;
+static int hf_rdm_message_count = -1;
+static int hf_rdm_sub_device = -1;
+static int hf_rdm_command_class = -1;
+static int hf_rdm_parameter_id = -1;
+static int hf_rdm_parameter_data_length = -1;
+static int hf_rdm_parameter_data = -1;
+static int hf_rdm_intron = -1;
+static int hf_rdm_checksum = -1;
+static int hf_rdm_trailer = -1;
+
+static int ett_rdm = -1;
+
+static guint16
+rdm_checksum(tvbuff_t *tvb, unsigned length)
+{
+	guint16 sum = 0;
+	unsigned i;
+	for (i = 0; i < length; i++)
+		sum += tvb_get_guint8(tvb, i);
+	return sum;
+}
+
+static void
+dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	if (check_col(pinfo->cinfo, COL_PROTOCOL))
+		col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDM");
+	if (check_col(pinfo->cinfo, COL_INFO))
+		col_clear(pinfo->cinfo, COL_INFO);
+
+	if (tree != NULL) {
+		unsigned message_length, checksum, checksum_shouldbe,
+				parameter_data_length, offset = 0;
+		proto_item *item;
+
+		proto_tree *ti = proto_tree_add_item(tree, proto_rdm, tvb,
+				offset, -1, FALSE);
+		proto_tree *rdm_tree = proto_item_add_subtree(ti, ett_rdm);
+
+		proto_tree_add_item(rdm_tree, hf_rdm_start_code, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_sub_start_code, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		message_length = tvb_get_guint8(tvb, offset);
+		proto_tree_add_item(rdm_tree, hf_rdm_message_length, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_dest_uid, tvb,
+				offset, 6, FALSE);
+		offset += 6;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_src_uid, tvb,
+				offset, 6, FALSE);
+		offset += 6;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_transaction_number, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_response_type, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_message_count, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_sub_device, tvb,
+				offset, 2, FALSE);
+		offset += 2;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_command_class, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		proto_tree_add_item(rdm_tree, hf_rdm_parameter_id, tvb,
+				offset, 2, FALSE);
+		offset += 2;
+
+		parameter_data_length = tvb_get_guint8(tvb, offset);
+		proto_tree_add_item(rdm_tree, hf_rdm_parameter_data_length, tvb,
+				offset, 1, FALSE);
+		offset++;
+
+		if (parameter_data_length > 0) {
+			proto_tree_add_item(rdm_tree, hf_rdm_parameter_data, tvb,
+					offset, parameter_data_length, FALSE);
+			offset += parameter_data_length;
+		}
+
+		if (offset < message_length) {
+			proto_tree_add_item(rdm_tree, hf_rdm_intron, tvb,
+					offset, message_length - offset, FALSE);
+			offset = message_length;
+		}
+
+		checksum_shouldbe = rdm_checksum(tvb, offset);
+		checksum = tvb_get_ntohs(tvb, offset);
+		item = proto_tree_add_item(rdm_tree, hf_rdm_checksum, tvb,
+				offset, 2, FALSE);
+		proto_item_append_text(item, checksum == checksum_shouldbe
+				? " [correct]"
+				: " [incorrect, should be 0x%04x]", checksum_shouldbe);
+		offset += 2;
+
+		if (offset < tvb_length(tvb))
+			proto_tree_add_item(rdm_tree, hf_rdm_trailer, tvb,
+					offset, -1, FALSE);
+	}
+}
+
+void
+proto_register_rdm(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_rdm_start_code,
+			{ "Start code", "rdm.sc",
+				FT_UINT8, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_sub_start_code,
+			{ "Sub-start code", "rdm.ssc",
+				FT_UINT8, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_message_length,
+			{ "Message length", "rdm.len",
+				FT_UINT8, BASE_DEC, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_dest_uid,
+			{ "Destination UID", "rdm.dst",
+				FT_BYTES, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_src_uid,
+			{ "Source UID", "rdm.src",
+				FT_BYTES, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_transaction_number,
+			{ "Transaction number", "rdm.tn",
+				FT_UINT8, BASE_DEC, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_response_type,
+			{ "Response type", "rdm.rt",
+				FT_UINT8, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_message_count,
+			{ "Message count", "rdm.mc",
+				FT_UINT8, BASE_DEC, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_sub_device,
+			{ "Sub-device", "rdm.sd",
+				FT_UINT16, BASE_DEC, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_command_class,
+			{ "Command class", "rdm.cc",
+				FT_UINT8, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_parameter_id,
+			{ "Parameter ID", "rdm.pid",
+				FT_UINT16, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_parameter_data_length,
+			{ "Parameter data length", "rdm.pdl",
+				FT_UINT8, BASE_DEC, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_parameter_data,
+			{ "Parameter data", "rdm.pd",
+				FT_BYTES, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_intron,
+			{ "Intron", "rdm.intron",
+				FT_BYTES, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_checksum,
+			{ "Checksum", "rdm.checksum",
+				FT_UINT16, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }},
+
+		{ &hf_rdm_trailer,
+			{ "Trailer", "rdm.trailer",
+				FT_BYTES, BASE_HEX, NULL, 0x0,
+				NULL, HFILL }}
+	};
+
+	static gint *ett[] = {
+		&ett_rdm
+	};
+
+	proto_rdm = proto_register_protocol("Remote Device Management",
+			"RDM", "rdm");
+	proto_register_field_array(proto_rdm, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+	register_dissector("rdm", dissect_rdm, proto_rdm);
+}
+
+void
+proto_reg_handoff_rdm(void)
+{
+	create_dissector_handle(dissect_rdm, proto_rdm);
+}
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 99e1e2d7e3..d4167f98d3 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -82,7 +82,6 @@ PLUGINS=../../plugins/acn/acn.dll \
 	../../plugins/mgcp/mgcp.dll \
 	../../plugins/opsi/opsi.dll \
 	../../plugins/pcli/pcli.dll \
-	../../plugins/rdm/rdm.dll \
 	../../plugins/rlm/rlm.dll \
 	../../plugins/rtnet/rtnet.dll \
 	../../plugins/rudp/rudp.dll \
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 9f0927b2b3..9ad7d9d54a 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -727,7 +727,6 @@ File "..\..\plugins\mgcp\mgcp.dll"
 File "..\..\plugins\opsi\opsi.dll"
 File "..\..\plugins\pcli\pcli.dll"
 File "..\..\plugins\profinet\profinet.dll"
-File "..\..\plugins\rdm\rdm.dll"
 File "..\..\plugins\rlm\rlm.dll"
 File "..\..\plugins\rtnet\rtnet.dll"
 File "..\..\plugins\rudp\rudp.dll"
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index a9962ea7b7..cd3cc95b9d 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -125,7 +125,6 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe
 	$(COPY) $(TOPDIR)\plugins\opsi\opsi.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\plugins\pcli\pcli.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\plugins\profinet\profinet.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-	$(COPY) $(TOPDIR)\plugins\rdm\rdm.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\plugins\rlm\rlm.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\plugins\rtnet\rtnet.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
 	$(COPY) $(TOPDIR)\plugins\rudp\rudp.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index da0b6d3043..3e19492704 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -40,7 +40,6 @@ SUBDIRS = \
 	opsi \
 	pcli \
 	profinet \
-	rdm \
 	rlm \
 	rtnet \
 	rudp \
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index b83d5d5c25..0fa2fc2348 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -26,7 +26,6 @@ all: \
 	opsi \
 	pcli \
 	profinet \
-	rdm \
 	rlm \
 	rtnet \
 	rudp \
@@ -127,11 +126,6 @@ profinet::
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
-rdm:: 
-	cd rdm
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-	cd ..
-
 rlm:: 
 	cd rlm
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
@@ -200,8 +194,6 @@ clean:
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../profinet
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-	cd ../rdm
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../rlm
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../rtnet
@@ -254,8 +246,6 @@ distclean: clean
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../profinet
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
-	cd ../rdm
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../rlm
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../rtnet
@@ -306,8 +296,6 @@ maintainer-clean: distclean
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../pcli
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-	cd ../rdm
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../rlm
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../rtnet
@@ -350,7 +338,6 @@ install-plugins:
 	xcopy opsi\*.dll $(VERSION) /d
 	xcopy pcli\*.dll $(VERSION) /d
 	xcopy profinet\*.dll $(VERSION) /d
-	xcopy rdm\*.dll $(VERSION) /d
 	xcopy rlm\*.dll $(VERSION) /d
 	xcopy rtnet\*.dll $(VERSION) /d
 	xcopy rudp\*.dll $(VERSION) /d
diff --git a/plugins/rdm/AUTHORS b/plugins/rdm/AUTHORS
deleted file mode 100644
index 2f7c1251c4..0000000000
--- a/plugins/rdm/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Author :
-Erwin Rol <erwin@erwinrol.com>
-
diff --git a/plugins/rdm/COPYING b/plugins/rdm/COPYING
deleted file mode 100644
index d60c31a97a..0000000000
--- a/plugins/rdm/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/plugins/rdm/Makefile.am b/plugins/rdm/Makefile.am
deleted file mode 100644
index fae59b5603..0000000000
--- a/plugins/rdm/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-# Makefile.am
-# Automake file for RDM 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
-
-plugindir = @plugindir@
-
-plugin_LTLIBRARIES = rdm.la
-rdm_la_SOURCES = \
-	plugin.c \
-	moduleinfo.h \
-	$(DISSECTOR_SRC) \
-	$(DISSECTOR_INCLUDES)
-rdm_la_LDFLAGS = -module -avoid-version
-rdm_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 = \
-	rdm \
-	*~
-
-MAINTAINERCLEANFILES = \
-	Makefile.in	\
-	plugin.c
-
-EXTRA_DIST = \
-	Makefile.common		\
-	Makefile.nmake
diff --git a/plugins/rdm/Makefile.common b/plugins/rdm/Makefile.common
deleted file mode 100644
index 7c61698bfc..0000000000
--- a/plugins/rdm/Makefile.common
+++ /dev/null
@@ -1,31 +0,0 @@
-# Makefile.common for RDM 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 = rdm
-
-# the dissector sources (without any helpers)
-DISSECTOR_SRC = \
-	packet-rdm.c
diff --git a/plugins/rdm/Makefile.nmake b/plugins/rdm/Makefile.nmake
deleted file mode 100644
index 0e4abf08c4..0000000000
--- a/plugins/rdm/Makefile.nmake
+++ /dev/null
@@ -1,79 +0,0 @@
-# Makefile.nmake
-# nmake file for RDM plugin
-#
-# $Id$
-#
-
-include ..\..\config.nmake
-
-############### no need to modify below this line #########
-
-include Makefile.common
-
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
-	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
-
-LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_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)
-
-OBJECTS=$(DISSECTOR_OBJECTS) plugin.obj
-
-rdm.dll rdm.exp rdm.lib : $(OBJECTS) $(LINK_PLUGIN_WITH) 
-	link -dll /out:rdm.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH)  \
-	$(GLIB_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)
-!IFDEF PYTHON
-	@echo Making plugin.c (using python)
-	@$(PYTHON) ../../tools/make-dissector-reg.py . plugin $(DISSECTOR_SRC)
-!ELSE
-	@echo Making plugin.c (using sh)
-	@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
-!ENDIF
-
-!ENDIF
-
-clean:
-	rm -f $(OBJECTS) rdm.dll rdm.exp rdm.lib *.pdb
-
-distclean: clean
-
-maintainer-clean: distclean
diff --git a/plugins/rdm/moduleinfo.h b/plugins/rdm/moduleinfo.h
deleted file mode 100644
index 42a6d07de1..0000000000
--- a/plugins/rdm/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 "rdm"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.1"
-
diff --git a/plugins/rdm/packet-rdm.c b/plugins/rdm/packet-rdm.c
deleted file mode 100644
index 1effef215b..0000000000
--- a/plugins/rdm/packet-rdm.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* packet-rdm.c
- * Routines for RDM packet disassembly
- *
- * $Id$
- *
- * Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.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.
- */
-
-/* Include files */
-
-#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/addr_resolv.h>
-#include <epan/etypes.h>
-#include <epan/strutil.h>
-
-/*
- * See http://www.esta.org/tsp/E1-20inst.htm
- *
- */
-
-void proto_reg_handoff_rdm(void);
-
-/* Define the rdm proto */
-static int proto_rdm = -1;
-
-/* Header */
-static int hf_rdm_sub_start_code = -1;
-static int hf_rdm_slot_count = -1;
-static int hf_rdm_dest_uid = -1;
-static int hf_rdm_src_uid = -1;
-static int hf_rdm_seq_nr = -1;
-static int hf_rdm_res_type = -1;
-static int hf_rdm_msg_count = -1;
-static int hf_rdm_sub_device = -1;
-static int hf_rdm_mdb = -1;
-static int hf_rdm_checksum = -1;
-
-/* Define the tree for rdm */
-static int ett_rdm = -1;
-
-static void
-dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-  gint offset = 0, start_offset,i;
-  guint16 checksum,calc_checksum;
-  gint mdb_size;
-  proto_tree *ti=NULL,*rdm_tree=NULL;
-  proto_item* item;
-  
-  /* Set the protocol column */
-  if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-    col_set_str(pinfo->cinfo,COL_PROTOCOL,"RDM");
-  }
-                                                                                                                                                                                                     
-  /* Clear out stuff in the info column */
-  if(check_col(pinfo->cinfo,COL_INFO)){
-    col_clear(pinfo->cinfo,COL_INFO);
-  }
-                                                                                                                                                                                                     
-  if (tree) {
-    ti = proto_tree_add_item(tree, proto_rdm, tvb, offset, -1, FALSE);
-    rdm_tree = proto_item_add_subtree(ti, ett_rdm);
-  }
-                                                                                                                                                                                                     
-  if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
-                    "RDM");
-  }
-                                                                                                                                                                                                     
-  if (tree)
-  {
-    start_offset = offset;
-  
-    proto_tree_add_item(rdm_tree, hf_rdm_sub_start_code, tvb,
-                        offset, 1, FALSE);
-    offset += 1;
-
-    mdb_size = tvb_get_guint8(tvb, offset) - 19;
-
-    if (mdb_size < 20) {
-      proto_tree_add_text(rdm_tree, tvb, offset, 1, "Invalid MDB size: %d", 
-			mdb_size + 19);
-      return;
-    }
-
-    proto_tree_add_item(rdm_tree, hf_rdm_slot_count, tvb,
-                        offset, 1, FALSE);
-    offset += 1;
-
-    proto_tree_add_item(rdm_tree, hf_rdm_dest_uid, tvb,
-                        offset, 6, FALSE);
-    offset += 6;
-
-    proto_tree_add_item(rdm_tree, hf_rdm_src_uid, tvb,
-                        offset, 6, FALSE);
-    offset += 6;
-
-    proto_tree_add_item(rdm_tree, hf_rdm_seq_nr, tvb,
-                        offset, 1, FALSE);
-    offset += 1;
-
-    proto_tree_add_item(rdm_tree, hf_rdm_res_type, tvb,
-                        offset, 1, FALSE);
-    offset += 1;
-
-    proto_tree_add_item(rdm_tree, hf_rdm_msg_count, tvb,
-                        offset, 1, FALSE);
-    offset += 1;
-
-    proto_tree_add_item(rdm_tree, hf_rdm_sub_device, tvb,
-                        offset, 1, FALSE);
-    offset += 1;
-
-    tvb_ensure_bytes_exist(tvb, offset, mdb_size);
-    proto_tree_add_item(rdm_tree, hf_rdm_mdb, tvb,
-                        offset, mdb_size, FALSE);
-    offset += mdb_size;
-
-    calc_checksum = 0x00f0;
-    for( i = start_offset; i < offset; i++)
-    {
-      calc_checksum += tvb_get_guint8( tvb, i );    
-    }
-
-    checksum = tvb_get_ntohs( tvb, offset );
-    item = proto_tree_add_item(rdm_tree, hf_rdm_checksum, tvb,
-                        offset, 2, FALSE);
-
-    if( calc_checksum != checksum )
-      proto_item_append_text( item, " ( INCORRECT should be 0x%04x )", calc_checksum );
-    else
-      proto_item_append_text( item, " ( CORRECT )" );
-  
-    offset += 2;
-  }
-}
-
-void
-proto_register_rdm(void) {
-  static hf_register_info hf[] = {
-    { &hf_rdm_sub_start_code,
-      { "Sub Start Code",
-        "rdm.sub_start_code",
-        FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Sub Start Code", HFILL }},
-        
-    { &hf_rdm_slot_count,
-      { "Slot Count",
-        "rdm.slot_count",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Slot Count", HFILL }},
-        
-   { &hf_rdm_dest_uid,
-      { "Dest. UID",
-        "rdm.dest_uid",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Dest. UID", HFILL }},        
-
-   { &hf_rdm_src_uid,
-      { "Source UID",
-        "rdm.src_uid",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Source UID", HFILL }}, 
-        
-    { &hf_rdm_seq_nr,
-      { "Sequence Number",
-        "rdm.seq_nr",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Sequence Number", HFILL }},
-
-    { &hf_rdm_res_type,
-      { "Response Type",
-        "rdm.res_type",
-        FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Response Type", HFILL }},
-
-    { &hf_rdm_msg_count,
-      { "Message Count",
-        "rdm.msg_count",
-        FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Message Count", HFILL }},
-
-    { &hf_rdm_sub_device,
-      { "Sub Device",
-        "rdm.sub_device",
-        FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Sub Device", HFILL }},
-        
-   { &hf_rdm_mdb,
-      { "MDB",
-        "rdm.mdb",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "MDB", HFILL }}, 
-
-    { &hf_rdm_checksum,
-      { "Checksum",
-        "rdm.checksum",
-        FT_UINT16, BASE_HEX, NULL, 0x0,
-        "Checksum", HFILL }}
-  };
-
-  static gint *ett[] = {
-    &ett_rdm,
-  };
-
-  proto_rdm = proto_register_protocol("RDM","RDM","rdm");
-
-  proto_register_field_array(proto_rdm,hf,array_length(hf));
-  proto_register_subtree_array(ett,array_length(ett));
-
-  register_dissector("rdm", dissect_rdm, proto_rdm);
-}
-
-/* The registration hand-off routing */
-
-void
-proto_reg_handoff_rdm(void) {
-  static int rdm_initialized = FALSE;
-  static dissector_handle_t rdm_handle;
-     
-  if(!rdm_initialized) {
-    rdm_handle = create_dissector_handle(dissect_rdm,proto_rdm);
-    rdm_initialized = TRUE;
-  } else {
-    dissector_delete("udp.port",0,rdm_handle);
-  }
-                           
-  dissector_add("udp.port",0,rdm_handle);
-}