new acn dissector from Bill Florac

svn path=/trunk/; revision=19830

11 files changed, 0 insertions, 1864 deletions

diff --git a/plugins/acn/AUTHORS b/plugins/acn/AUTHORS
deleted file mode 100644
index 2f7c1251c4..0000000000
--- a/plugins/acn/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Author :
-Erwin Rol <erwin@erwinrol.com>
-
diff --git a/plugins/acn/COPYING b/plugins/acn/COPYING
deleted file mode 100644
index d60c31a97a..0000000000
--- a/plugins/acn/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/acn/ChangeLog b/plugins/acn/ChangeLog
deleted file mode 100644
index 7511f461eb..0000000000
--- a/plugins/acn/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-$Id$
- 
diff --git a/plugins/acn/INSTALL b/plugins/acn/INSTALL
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/acn/INSTALL
+++ /dev/null
diff --git a/plugins/acn/Makefile.am b/plugins/acn/Makefile.am
deleted file mode 100644
index 0455dbaf02..0000000000
--- a/plugins/acn/Makefile.am
+++ /dev/null
@@ -1,119 +0,0 @@
-# Makefile.am
-# Automake file for ACN 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 = acn.la
-acn_la_SOURCES = \
-	plugin.c \
-	moduleinfo.h \
-	$(DISSECTOR_SRC) \
-	$(DISSECTOR_INCLUDES)
-acn_la_LDFLAGS = -module -avoid-version
-acn_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 = \
-	acn \
-	*~
-
-MAINTAINERCLEANFILES = \
-	Makefile.in	\
-	plugin.c
-
-EXTRA_DIST = \
-	Makefile.common		\
-	Makefile.nmake
-
diff --git a/plugins/acn/Makefile.common b/plugins/acn/Makefile.common
deleted file mode 100644
index dbf9cf175e..0000000000
--- a/plugins/acn/Makefile.common
+++ /dev/null
@@ -1,35 +0,0 @@
-# Makefile.common for ACN 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 = acn
-
-# the dissector sources (without any helpers)
-DISSECTOR_SRC = \
-	packet-acn.c
-
-# corresponding headers
-DISSECTOR_INCLUDES =	\
-	acn.h
diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake
deleted file mode 100644
index d6b75a6f84..0000000000
--- a/plugins/acn/Makefile.nmake
+++ /dev/null
@@ -1,82 +0,0 @@
-# Makefile.nmake
-# nmake file for 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)
-
-DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
-
-OBJECTS = $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) plugin.obj
-
-$(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
-	link -dll /out:$(PLUGIN_NAME).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) $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp \
-	    $(PLUGIN_NAME).lib *.pdb
-
-distclean: clean
-
-maintainer-clean: distclean
diff --git a/plugins/acn/NEWS b/plugins/acn/NEWS
deleted file mode 100644
index e69de29bb2..0000000000
--- a/plugins/acn/NEWS
+++ /dev/null
diff --git a/plugins/acn/acn.h b/plugins/acn/acn.h
deleted file mode 100644
index 47866682a1..0000000000
--- a/plugins/acn/acn.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef __ACN_H__
-#define __ACN_H__
-
-#define ACN_PDU_MIN_SIZE	2
-
-#define ACN_PDU_DES		0xC0
-#define ACN_PDU_DES_SAME	0x00
-#define ACN_PDU_DES_PS		0x40
-#define ACN_PDU_DES_CID		0x80
-#define ACN_PDU_DES_ALL		0xC0
-
-#define ACN_PDU_SRC		0x30
-#define ACN_PDU_SRC_SAME	0x00
-#define ACN_PDU_SRC_PS		0x10
-#define ACN_PDU_SRC_CID		0x20
-#define ACN_PDU_SRC_UM		0x30
-
-#define ACN_PDU_FLAG_P		0x08
-#define ACN_PDU_FLAG_T		0x04
-#define ACN_PDU_FLAG_RES	0x02
-#define ACN_PDU_FLAG_Z		0x01
-
-typedef struct acn_pdu_history_s 
-{
-	guint8 source_type;
-	union {
-		guint16 ps;
-		guint8 cid[16];
-	} source;
-
-	guint8 destination_type;
-	union {
-		guint16 ps;
-		guint8 cid[16];	
-	} destination;
-	
-	guint16 protocol;
-	guint16 type;
-} acn_pdu_history_t;
-
-
-#define ACN_PDU_PROTO_UNKNOWN	0
-#define ACN_PDU_PROTO_SDT	1
-#define ACN_PDU_PROTO_DMP	2
-
-#define ACN_PDU_TYPE_UNKNOWN	0
-
-/* SDT */
-#define ACN_SDT_TYPE_UNKNOWN		0
-#define ACN_SDT_TYPE_RELSEQDATA		1
-#define ACN_SDT_TYPE_UNRELSEQDATA	2
-#define ACN_SDT_TYPE_UNSEQDATA		3
-#define ACN_SDT_TYPE_JOIN		4
-#define ACN_SDT_TYPE_TRANSFER		5
-#define ACN_SDT_TYPE_JOINREF		6
-#define ACN_SDT_TYPE_JOINACC		7
-#define ACN_SDT_TYPE_LEAVEREQ		8
-#define ACN_SDT_TYPE_LEAVE		9
-#define ACN_SDT_TYPE_LEAVING		10
-#define ACN_SDT_TYPE_NAKUPON		11
-#define ACN_SDT_TYPE_NAKUPOFF		12
-#define ACN_SDT_TYPE_NAKDOWNON		13
-#define ACN_SDT_TYPE_NAKDOWNOFF		14
-#define ACN_SDT_TYPE_REPLOSTSEQON	15
-#define ACN_SDT_TYPE_REPLOSTSEQOFF	16
-#define ACN_SDT_TYPE_SESSEXPIRY		17
-#define ACN_SDT_TYPE_MAK		18
-#define ACN_SDT_TYPE_ACK		19
-#define ACN_SDT_TYPE_NAK		20
-#define ACN_SDT_TYPE_SEQLOST		21
-#define ACN_SDT_TYPE_NAKPARAMS		22
-
-
-#define ACN_SDT_ADDR_NULL 0
-#define ACN_SDT_ADDR_IPV4 1
-#define ACN_SDT_ADDR_IPV6 2
-
-/* DMP */
-#define ACN_DMP_TYPE_UNKNOWN	0
-
-#endif /* !__ACN_H__ */
diff --git a/plugins/acn/moduleinfo.h b/plugins/acn/moduleinfo.h
deleted file mode 100644
index d800851877..0000000000
--- a/plugins/acn/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 "acn"
-
-
-#ifdef VERSION
-#undef VERSION
-#endif
-
-/* Version number of package */
-#define VERSION "0.0.1"
-
diff --git a/plugins/acn/packet-acn.c b/plugins/acn/packet-acn.c
deleted file mode 100644
index 9fcea45853..0000000000
--- a/plugins/acn/packet-acn.c
+++ /dev/null
@@ -1,1185 +0,0 @@
-/* packet-acn.c
- * Routines for ACN 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/prefs.h>
-#include <epan/strutil.h>
-
-#include "acn.h"
-
-/*
- * See
- *
- *	http://www.esta.org/tsp/E1-17inst.htm
- */
-
-static const value_string acn_proto_vals[] = {
-	{ ACN_PDU_PROTO_UNKNOWN,	"Unknown"},
-	{ ACN_PDU_PROTO_SDT,		"SDT" },
-	{ ACN_PDU_PROTO_DMP,		"DMP" },
-	{ 0,				NULL }
-};
-
-static const value_string acn_sdt_type_vals[] = {
-	{ ACN_SDT_TYPE_UNKNOWN,		"Unknown"},
-	{ ACN_SDT_TYPE_RELSEQDATA,	"RELSEQDATA"},
-	{ ACN_SDT_TYPE_UNRELSEQDATA,	"UNRELSEQDATA"},
-	{ ACN_SDT_TYPE_UNSEQDATA,	"UNSEQDATA"},
-	{ ACN_SDT_TYPE_JOIN,		"JOIN"},
-	{ ACN_SDT_TYPE_TRANSFER,	"TRANSFER"},
-	{ ACN_SDT_TYPE_JOINREF,		"JOINREF"},
-	{ ACN_SDT_TYPE_JOINACC,		"JOINACC"},
-	{ ACN_SDT_TYPE_LEAVEREQ,	"LEAVEREQ"},
-	{ ACN_SDT_TYPE_LEAVE,		"LEAVE"},
-	{ ACN_SDT_TYPE_LEAVING,		"LEAVING"},
-	{ ACN_SDT_TYPE_NAKUPON,		"NAKUPON"},
-	{ ACN_SDT_TYPE_NAKUPOFF,	"NAKUPOFF"},
-	{ ACN_SDT_TYPE_NAKDOWNON,	"NAKDOWNON"},
-	{ ACN_SDT_TYPE_NAKDOWNOFF,	"NAKDOWNOFF"},
-	{ ACN_SDT_TYPE_REPLOSTSEQON,	"REPLOSTSEQON"},
-	{ ACN_SDT_TYPE_REPLOSTSEQOFF,	"REPLOSTSEQOFF"},
-	{ ACN_SDT_TYPE_SESSEXPIRY,	"SESEXPIRY"},
-	{ ACN_SDT_TYPE_MAK,		"MAK"},
-	{ ACN_SDT_TYPE_ACK,		"ACK"},
-	{ ACN_SDT_TYPE_NAK,		"NAK"},
-	{ ACN_SDT_TYPE_SEQLOST,		"SEQLOST"},
-	{ ACN_SDT_TYPE_NAKPARAMS,	"NAKPARAMS"},
-	{ 0,				NULL }
-};
-
-static const value_string acn_dmp_type_vals[] = {
-	{ ACN_DMP_TYPE_UNKNOWN,		"Unknown"},
-	{ 0,				NULL }
-};
-
-
-static const value_string acn_sdt_address_type_vals[] = {
-	{ ACN_SDT_ADDR_NULL,		"Unspecified"},
-	{ ACN_SDT_ADDR_IPV4,		"IP version 4"},
-	{ ACN_SDT_ADDR_IPV6,		"IP version 6"},
-	{ 0,				NULL }
-};
-
-static const value_string acn_sdt_des_flag_vals[] = {
-	{ 0,				"Default"},
-	{ 1,				"Protocol Specific"},
-	{ 2,				"CID"},
-	{ 3,				"All"}, 
-	{ 0,				NULL }
-};
-
-static const value_string acn_sdt_src_flag_vals[] = {
-	{ 0,				"Default"},
-	{ 1,				"Protocol Specific"},
-	{ 2,				"CID"},
-	{ 3,				"Unspecified"}, 
-	{ 0,				NULL }
-};
-
-
-void proto_reg_handoff_acn(void);
-
-/* Define the acn proto */
-static int proto_acn = -1;
-
-/* Define the tree for acn */
-static int ett_acn = -1;
-
-/* PDU */
-static int hf_acn_pdu = -1;
-
-static int hf_acn_pdu_flags = -1;
-
-static int hf_acn_pdu_des = -1;
-static int hf_acn_pdu_src = -1;
-static int hf_acn_pdu_flag_p = -1;
-static int hf_acn_pdu_flag_t = -1;
-static int hf_acn_pdu_flag_res = -1;
-static int hf_acn_pdu_flag_z = -1;
-static int hf_acn_pdu_length = -1;
-
-/* PDU optional */
-static int hf_acn_pdu_ext_length_16 = -1;
-static int hf_acn_pdu_ext_length_32 = -1;
-static int hf_acn_pdu_source_ps = -1;
-static int hf_acn_pdu_source_cid = -1;
-static int hf_acn_pdu_destination_ps = -1;
-static int hf_acn_pdu_destination_cid = -1;
-static int hf_acn_pdu_protocol = -1;
-static int hf_acn_pdu_type = -1;
-static int hf_acn_pdu_type_sdt = -1;
-static int hf_acn_pdu_type_dmp = -1;
-static int hf_acn_pdu_data = -1;
-static int hf_acn_pdu_unknown_data = -1;
-
-static int hf_acn_pdu_padding = -1;
-
-/* SDT */
-static int hf_acn_sdt_session_nr = -1;
-static int hf_acn_sdt_tot_seq_nr = -1;
-static int hf_acn_sdt_rel_seq_nr = -1;
-static int hf_acn_sdt_unavailable_wrappers = -1;
-static int hf_acn_sdt_refuse_code = -1;
-static int hf_acn_sdt_last_rel_seq = -1;
-static int hf_acn_sdt_new_rel_seq = -1;
-static int hf_acn_sdt_last_rel_wrapper = -1;
-static int hf_acn_sdt_nr_lost_wrappers = -1;
-static int hf_acn_sdt_session_exp_time = -1;
-static int hf_acn_sdt_upstream_address_type = -1;
-static int hf_acn_sdt_upstream_ipv4_address = -1;
-static int hf_acn_sdt_upstream_ipv6_address = -1;
-static int hf_acn_sdt_upstream_port = -1;
-static int hf_acn_sdt_downstream_address_type = -1;
-static int hf_acn_sdt_downstream_ipv4_address = -1;
-static int hf_acn_sdt_downstream_ipv6_address = -1;
-static int hf_acn_sdt_downstream_port = -1;
-
-static int hf_acn_sdt_flags = -1;
-static int hf_acn_sdt_flag_u = -1;
-static int hf_acn_sdt_flag_d = -1;
-static int hf_acn_sdt_flag_l = -1;
-
-static int hf_acn_sdt_mid = -1;
-static int hf_acn_sdt_nak_holdoff_interval = -1;
-static int hf_acn_sdt_nak_modulus = -1;
-static int hf_acn_sdt_max_nak_wait_time = -1;
-static int hf_acn_sdt_leader_cid = -1;
-static int hf_acn_sdt_member_cid = -1;
-static int hf_acn_sdt_ack_threshold = -1;
-
-/*
- * Here are the global variables associated with the preferences
- * for acn
- */
-
-static guint global_udp_port_acn = 0;
-static guint udp_port_acn = 0;
-
-/* A static handle for the ip dissector */
-static dissector_handle_t ip_handle;
-
-static guint dissect_pdu(tvbuff_t *tvb, guint offset, proto_tree *tree, acn_pdu_history_t* parent_hist, guint max_size);
-static guint dissect_sdt(tvbuff_t *tvb, guint offset, proto_tree *tree, acn_pdu_history_t* parent_hist, guint max_size);
-static guint dissect_dmp(tvbuff_t *tvb, guint offset, proto_tree *tree, acn_pdu_history_t* parent_hist, guint max_size);
-
-static guint 
-dissect_sdt(tvbuff_t *tvb, guint offset, proto_tree *tree, acn_pdu_history_t* parent_hist, guint max_size)
-{
-	proto_tree *flags_tree, *flags_item;
-	guint start_offset = offset;
-	acn_pdu_history_t hist;
-	guint size = 0;
-	guint flags;
-	guint type;
-	guint count;
-
-	hist = *parent_hist;
-
-	switch( parent_hist->type )
-	{
-		case ACN_SDT_TYPE_UNKNOWN:
-			break;
-
-		case ACN_SDT_TYPE_RELSEQDATA:
-		case ACN_SDT_TYPE_UNRELSEQDATA:
-			proto_tree_add_item(tree, hf_acn_sdt_session_nr, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_tot_seq_nr, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			proto_tree_add_item(tree, hf_acn_sdt_rel_seq_nr, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			proto_tree_add_item(tree, hf_acn_sdt_unavailable_wrappers, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			max_size = max_size - (offset - start_offset);
-			while( max_size >= ACN_PDU_MIN_SIZE) {
-				size = dissect_pdu( tvb, offset, tree, &hist, max_size);
-				offset += size;
-				max_size -= size;
-			}
-			
-			size = offset - start_offset;
-
-			break;
-
-		case ACN_SDT_TYPE_UNSEQDATA:
-			proto_tree_add_item(tree, hf_acn_sdt_session_nr, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			max_size = max_size - (offset - start_offset);
-			while( max_size >= ACN_PDU_MIN_SIZE) {
-				size = dissect_pdu( tvb, offset, tree, &hist, max_size);
-				offset += size;
-				max_size -= size;
-			}
-			
-			size = offset - start_offset;
-
-			break;
-			
-		case ACN_SDT_TYPE_JOIN:
-			proto_tree_add_item(tree, hf_acn_sdt_session_nr, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			flags = tvb_get_guint8(tvb, offset);
-			flags_item = proto_tree_add_uint(tree, hf_acn_sdt_flags, tvb,
-							offset, 1, flags);
-
-			flags_tree=proto_item_add_subtree(flags_item, ett_acn);
-			proto_tree_add_item(flags_tree, hf_acn_sdt_flag_u, tvb, offset, 1, FALSE);
-			proto_tree_add_item(flags_tree, hf_acn_sdt_flag_d, tvb, offset, 1, FALSE);
-			proto_tree_add_item(flags_tree, hf_acn_sdt_flag_l, tvb, offset, 1, FALSE);
-			offset += 1;
-
-			type = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_acn_sdt_upstream_address_type, tvb,
-					    offset, 1, FALSE);
-			offset += 1;
-			
-			switch( type )
-			{
-				default:
-				case ACN_SDT_ADDR_NULL:
-					break;
-					
-				case ACN_SDT_ADDR_IPV4:
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-				
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv4_address, tvb,
-								offset, 4, FALSE);
-					offset += 4;
-				
-					break;
-					
-				case ACN_SDT_ADDR_IPV6:
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv6_address, tvb,
-								offset, 16, FALSE);
-					offset += 16;
-				
-					break;		
-			}
-			
-			flags = tvb_get_guint8(tvb, offset);
-			flags_item = proto_tree_add_uint(tree, hf_acn_sdt_flags, tvb,
-							offset, 1, flags);
-
-			flags_tree=proto_item_add_subtree(flags_item, ett_acn);
-			offset += 1;
-
-			type = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_acn_sdt_downstream_address_type, tvb,
-					    offset, 1, FALSE);
-			offset += 1;
-			
-			switch( type )
-			{
-				default:
-				case ACN_SDT_ADDR_NULL:
-					break;
-					
-				case ACN_SDT_ADDR_IPV4:
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_ipv4_address, tvb,
-								offset, 4, FALSE);
-					offset += 4;
-				
-				
-					break;
-					
-				case ACN_SDT_ADDR_IPV6:
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_ipv6_address, tvb,
-								offset, 16, FALSE);
-					offset += 16;
-				
-					break;		
-			}
-			
-							
-			proto_tree_add_item(tree, hf_acn_sdt_mid, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_tot_seq_nr, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			proto_tree_add_item(tree, hf_acn_sdt_rel_seq_nr, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_session_exp_time, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_nak_holdoff_interval, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_nak_modulus, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_max_nak_wait_time, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-					
-			size = offset - start_offset;
-
-			break;
-
-		case ACN_SDT_TYPE_TRANSFER:
-			proto_tree_add_item(tree, hf_acn_sdt_leader_cid, tvb,
-						offset, 16, FALSE);
-			offset += 16;
-
-			proto_tree_add_item(tree, hf_acn_sdt_session_nr, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			flags = tvb_get_guint8(tvb, offset);
-			flags_item = proto_tree_add_uint(tree, hf_acn_sdt_flags, tvb,
-							offset, 1, flags);
-
-			flags_tree=proto_item_add_subtree(flags_item, ett_acn);
-			proto_tree_add_item(flags_tree, hf_acn_sdt_flag_u, tvb, offset, 1, FALSE);
-			proto_tree_add_item(flags_tree, hf_acn_sdt_flag_d, tvb, offset, 1, FALSE);
-			proto_tree_add_item(flags_tree, hf_acn_sdt_flag_l, tvb, offset, 1, FALSE);
-			offset += 1;
-
-			type = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_acn_sdt_upstream_address_type, tvb,
-					    offset, 1, FALSE);
-			offset += 1;
-			
-			switch( type )
-			{
-				default:
-				case ACN_SDT_ADDR_NULL:
-					break;
-					
-				case ACN_SDT_ADDR_IPV4:
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv4_address, tvb,
-								offset, 4, FALSE);
-					offset += 4;
-				
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-				
-					break;
-					
-				case ACN_SDT_ADDR_IPV6:
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv6_address, tvb,
-								offset, 16, FALSE);
-					offset += 16;
-				
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-					break;		
-			}
-			
-			flags = tvb_get_guint8(tvb, offset);
-			flags_item = proto_tree_add_uint(tree, hf_acn_sdt_flags, tvb,
-							offset, 1, flags);
-
-			flags_tree=proto_item_add_subtree(flags_item, ett_acn);
-			offset += 1;
-
-			type = tvb_get_guint8(tvb, offset);
-			proto_tree_add_item(tree, hf_acn_sdt_downstream_address_type, tvb,
-					    offset, 1, FALSE);
-			offset += 1;
-			
-			switch( type )
-			{
-				default:
-				case ACN_SDT_ADDR_NULL:
-					break;
-					
-				case ACN_SDT_ADDR_IPV4:
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_ipv4_address, tvb,
-								offset, 4, FALSE);
-					offset += 4;
-				
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-				
-					break;
-					
-				case ACN_SDT_ADDR_IPV6:
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_ipv6_address, tvb,
-								offset, 16, FALSE);
-					offset += 16;
-				
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
-					break;		
-			}
-			
-							
-			proto_tree_add_item(tree, hf_acn_sdt_mid, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_tot_seq_nr, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			proto_tree_add_item(tree, hf_acn_sdt_rel_seq_nr, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_session_exp_time, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_nak_holdoff_interval, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_nak_modulus, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_max_nak_wait_time, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			/* CID+MID list */
-			count = (max_size - (offset - start_offset)) / 18;
-			while( count > 0) {
-				proto_tree_add_item(tree, hf_acn_sdt_member_cid, tvb,
-							offset, 16, FALSE);
-				offset += 16;
-
-				proto_tree_add_item(tree, hf_acn_sdt_mid, tvb,
-							offset, 2, FALSE);
-				offset += 2;
-
-				count--;
-			}
-			
-			size = offset - start_offset;
-
-			break;
-
-		case ACN_SDT_TYPE_JOINREF:
-			proto_tree_add_item(tree, hf_acn_sdt_session_nr, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_refuse_code, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			size = offset - start_offset;
-			break;
-
-		case ACN_SDT_TYPE_JOINACC:
-		case ACN_SDT_TYPE_ACK:
-			proto_tree_add_item(tree, hf_acn_sdt_last_rel_seq, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			size = offset - start_offset;
-			break;
-
-		case ACN_SDT_TYPE_LEAVING:
-			proto_tree_add_item(tree, hf_acn_sdt_last_rel_wrapper, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			size = offset - start_offset;
-			break;
-
-
-		case ACN_SDT_TYPE_SESSEXPIRY:
-			proto_tree_add_item(tree, hf_acn_sdt_session_exp_time, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			size = offset - start_offset;
-			break;
-
-		case ACN_SDT_TYPE_MAK:
-			proto_tree_add_item(tree, hf_acn_sdt_ack_threshold, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			count = (max_size - (offset - start_offset)) / 2;
-			while( count > 0) {
-				proto_tree_add_item(tree, hf_acn_sdt_mid, tvb,
-							offset, 2, FALSE);
-				offset += 2;
-
-				count--;
-			}
-			
-			size = offset - start_offset;
-			break;
-			
-		case ACN_SDT_TYPE_NAK:				
-			proto_tree_add_item(tree, hf_acn_sdt_session_nr, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_mid, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			proto_tree_add_item(tree, hf_acn_sdt_last_rel_seq, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			proto_tree_add_item(tree, hf_acn_sdt_nr_lost_wrappers, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			size = offset - start_offset;
-			break;
-			
-		case ACN_SDT_TYPE_SEQLOST:
-			proto_tree_add_item(tree, hf_acn_sdt_last_rel_seq, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-
-			proto_tree_add_item(tree, hf_acn_sdt_new_rel_seq, tvb,
-						offset, 4, FALSE);
-			offset += 4;
-			size = offset - start_offset;
-			break;
-
-		case ACN_SDT_TYPE_NAKPARAMS:
-			proto_tree_add_item(tree, hf_acn_sdt_nak_holdoff_interval, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_nak_modulus, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-			
-			proto_tree_add_item(tree, hf_acn_sdt_max_nak_wait_time, tvb,
-						offset, 2, FALSE);
-			offset += 2;
-
-			size = offset - start_offset;
-			break;
-
-		case ACN_SDT_TYPE_LEAVEREQ:
-		case ACN_SDT_TYPE_LEAVE:
-		case ACN_SDT_TYPE_NAKUPON:
-		case ACN_SDT_TYPE_NAKUPOFF:
-		case ACN_SDT_TYPE_NAKDOWNON:
-		case ACN_SDT_TYPE_NAKDOWNOFF:
-		case ACN_SDT_TYPE_REPLOSTSEQON:
-		case ACN_SDT_TYPE_REPLOSTSEQOFF:
-			/* no data */
-			size = offset - start_offset;
-			break;
-
-		default:
-			break;
-	}
-	
-	return size;
-}
-
-static guint 
-dissect_dmp(tvbuff_t *tvb _U_, guint offset _U_, proto_tree *tree _U_, acn_pdu_history_t* parent_hist _U_, guint max_size _U_)
-{
-	return 0;
-}
-
-static guint 
-dissect_pdu(tvbuff_t *tvb, guint offset, proto_tree *tree, acn_pdu_history_t* parent_hist, guint max_size)
-{
-	guint size,data_size;
-	guint8 flags;
-	guint src,des;
-	proto_tree *ti, *si, *flags_tree, *flags_item, *data_tree, *data_item;
-	guint start_offset = offset;
-	acn_pdu_history_t hist = *parent_hist;
-	
-
-	ti = proto_tree_add_item(tree,
-				hf_acn_pdu,
-				tvb,
-				offset,
-				0,
-				FALSE);
- 
-	si = proto_item_add_subtree(ti, ett_acn);
- 
-	flags = tvb_get_guint8(tvb, offset);
-	flags_item = proto_tree_add_uint(si, hf_acn_pdu_flags, tvb,
-					offset, 1, flags);
-
-	flags_tree=proto_item_add_subtree(flags_item, ett_acn);
-	
-	proto_tree_add_item(flags_tree, hf_acn_pdu_des, tvb, offset, 1, FALSE);
-	proto_tree_add_item(flags_tree, hf_acn_pdu_src, tvb, offset, 1, FALSE);
-	proto_tree_add_item(flags_tree, hf_acn_pdu_flag_p, tvb, offset, 1, FALSE);
-	proto_tree_add_item(flags_tree, hf_acn_pdu_flag_t, tvb, offset, 1, FALSE);
-	proto_tree_add_item(flags_tree, hf_acn_pdu_flag_res, tvb, offset, 1, FALSE);
-	proto_tree_add_item(flags_tree, hf_acn_pdu_flag_z, tvb, offset, 1, FALSE);
-
-	offset += 1;
-
-	size = tvb_get_guint8(tvb, offset);	
-	proto_tree_add_uint(si, hf_acn_pdu_length, tvb,
-	                          offset, 1, size);
-	offset += 1;
-	
-
-	if( size == 0 ){
-		size = tvb_get_ntohs(tvb, offset);
-		proto_tree_add_uint(si, hf_acn_pdu_ext_length_16, tvb,
-					offset, 2, size);	
-		offset += 2;	
-	} else if( size == 1 ){
-		size = tvb_get_ntohl( tvb, offset);
-		proto_tree_add_uint(si, hf_acn_pdu_ext_length_32, tvb,
-					offset, 4, size);	
-		offset += 4;
-	}
-	
-	if(size > max_size )
-		size = max_size;
-
-	switch( flags & ACN_PDU_DES )
-	{	
-		case ACN_PDU_DES_SAME:
-			break;
-			
-		case ACN_PDU_DES_PS:
-			hist.destination_type = ACN_PDU_DES_PS;
-			des = tvb_get_ntohs(tvb, offset);
-			hist.destination.ps = des;
-			proto_tree_add_uint(si, hf_acn_pdu_destination_ps, tvb,
-						offset, 2, des);	
-			offset += 2;
-			break;
-			
-		case ACN_PDU_DES_CID:
-			hist.destination_type = ACN_PDU_DES_CID;
-			tvb_memcpy(tvb, hist.destination.cid, offset, 16 );
-			proto_tree_add_item(si, hf_acn_pdu_destination_cid, tvb,
-						offset, 16, FALSE);
-			offset += 16;
-			break;
-			
-		case ACN_PDU_DES_ALL:
-			hist.destination_type = ACN_PDU_DES_ALL;
-			break;	
-	} 
-
-
-	switch( flags & ACN_PDU_SRC )
-	{
-		case ACN_PDU_SRC_SAME:
-			break;
-			
-		case ACN_PDU_SRC_PS:
-			hist.source_type = ACN_PDU_SRC_PS;
-			src = tvb_get_ntohs(tvb, offset);
-			hist.source.ps = src;
-			proto_tree_add_uint(si, hf_acn_pdu_source_ps, tvb,
-						offset, 2, src);
-			offset += 2;
-			break;
-			
-		case ACN_PDU_SRC_CID:
-			hist.source_type = ACN_PDU_SRC_CID;
-			tvb_memcpy(tvb, hist.source.cid, offset, 16 );
-			proto_tree_add_item(si, hf_acn_pdu_source_cid, tvb,
-						offset, 16, FALSE);
-			offset += 16;
-			break;
-			
-		case ACN_PDU_SRC_UM:
-			hist.source_type = ACN_PDU_SRC_UM;
-			break;	
-	} 
-
-
-
-	if( flags & ACN_PDU_FLAG_P )
-	{
-		hist.protocol = tvb_get_ntohs( tvb, offset );
-		proto_tree_add_item(si, hf_acn_pdu_protocol, tvb,
-					offset, 2, FALSE );
-		offset += 2;
-	}
-
-	if( flags & ACN_PDU_FLAG_T )
-	{
-		hist.type = tvb_get_ntohs( tvb, offset );
-	
-		switch( hist.protocol ) { 
-			case ACN_PDU_PROTO_SDT:
-				proto_tree_add_item(si, hf_acn_pdu_type_sdt, tvb,
-						offset, 2, FALSE );
-				break;
-
-			case ACN_PDU_PROTO_DMP:
-				proto_tree_add_item(si, hf_acn_pdu_type_dmp, tvb,
-						offset, 2, FALSE );
-				break;
-				
-			default:
-				proto_tree_add_item(si, hf_acn_pdu_type, tvb,
-						offset, 2, FALSE );
-				break;	
-	
-	
-	
-		}
-		
-		offset += 2;
-	}
-
-	if( flags & ACN_PDU_FLAG_Z )
-	{
-		data_size = size - (offset - start_offset);
-
-
-		data_item = proto_tree_add_item(si, hf_acn_pdu_data, tvb,
-						offset, data_size, FALSE);
-
-		data_tree=proto_item_add_subtree(data_item, ett_acn);
-
-
-		switch( hist.protocol ) {
-			case ACN_PDU_PROTO_SDT:
-				dissect_sdt( tvb, offset, data_tree, &hist, data_size);
-				break;
-			
-			case ACN_PDU_PROTO_DMP:
-				dissect_dmp( tvb, offset, data_tree, &hist, data_size);	
-				break;
-	
-			default:
-				proto_tree_add_item(si, hf_acn_pdu_unknown_data, tvb,
-							offset, data_size, FALSE );
-				break;	
-		}
-
-		offset += data_size;
-	}
-
-	if( size & 0x00000001 )
-	{
-	
-		proto_tree_add_item(si, hf_acn_pdu_padding, tvb,
-					offset, 1, TRUE );
-		
-		size += 1;
-		offset += 1;
-	}
-
-	proto_item_set_len(si, size);
-
-	return size;
-}
-
-static void
-dissect_acn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
-	gint offset = 0;
-	guint size,max_size;
-	acn_pdu_history_t hist;
-
-	/* Set the protocol column */
-	if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-		col_set_str(pinfo->cinfo,COL_PROTOCOL,"ACN");
-	}
-
-	/* Clear out stuff in the info column */
-	if(check_col(pinfo->cinfo,COL_INFO)){
-		col_clear(pinfo->cinfo,COL_INFO);
-	}
-
-	if (tree) 
-	{
-		/* history default values */
-		hist.destination_type = ACN_PDU_DES_ALL; 
-		hist.source_type = ACN_PDU_SRC_UM;
-		hist.protocol = ACN_PDU_PROTO_UNKNOWN;
-		hist.type = ACN_PDU_TYPE_UNKNOWN;
-		
-		max_size = tvb_reported_length_remaining(tvb, offset);
-		
-		while( max_size >= ACN_PDU_MIN_SIZE) {
-			size = dissect_pdu( tvb, offset, tree, &hist, max_size);
-			offset += size;
-			max_size -= size;
-		}
-	}
-}
-
-void
-proto_register_acn(void) {
-  static hf_register_info hf[] = {
-	/* PDU */
-	{ &hf_acn_pdu,
-	    { "ACN PDU", "acn.pdu",
-		FT_NONE, BASE_NONE, NULL, 0,
-		"ACN PDU", HFILL }},
-
-	{ &hf_acn_pdu_flags,
-	    { "Flags","acn.pdu.flags",
-		FT_UINT8, BASE_HEX, NULL, 0x0,
-		"Flags", HFILL }},
-
-	{ &hf_acn_pdu_des,
-	    { "des","acn.pdu.des",
-		FT_UINT8, BASE_HEX, VALS( acn_sdt_des_flag_vals ), 0xC0,
-		"des", HFILL }},
-
-	{ &hf_acn_pdu_src,
-	    { "src","acn.pdu.src",
-		FT_UINT8, BASE_HEX, VALS( acn_sdt_src_flag_vals ), 0x30,
-		"src", HFILL }},
-
-	{ &hf_acn_pdu_flag_p,
-	    { "P","acn.pdu.flag_p",
-		FT_UINT8, BASE_HEX, NULL, 0x08,
-		"P", HFILL }},
-
-	{ &hf_acn_pdu_flag_t,
-	    { "T","acn.pdu.flag_t",
-		FT_UINT8, BASE_HEX, NULL, 0x04,
-		"T", HFILL }},
-
-	{ &hf_acn_pdu_flag_z,
-	    { "Z","acn.pdu.flag_z",
-		FT_UINT8, BASE_HEX, NULL, 0x01,
-		"Z", HFILL }},
-
-	{ &hf_acn_pdu_flag_res,
-	    { "res","acn.pdu.flag_res",
-		FT_UINT8, BASE_HEX, NULL, 0x02,
-		"res", HFILL }},
-
-	{ &hf_acn_pdu_length,
-	    { "Length","acn.pdu.length",
-		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Length", HFILL }},
-
-	{ &hf_acn_pdu_ext_length_16,
-	    { "Ext Length 16bit","acn.pdu.ext_length_16",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Ext Length 16bit", HFILL }},
-
-	{ &hf_acn_pdu_ext_length_32,
-	    { "Ext Length 32bit","acn.pdu.ext_length_32",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"Ext Length 32bit", HFILL }},
-
-	{ &hf_acn_pdu_source_ps,
-	    { "Source PS","acn.pdu.source_ps",
-		FT_UINT16, BASE_HEX, NULL, 0x0,
-		"Source PS", HFILL }},
-
-	{ &hf_acn_pdu_source_cid,
-	    { "Source CID","acn.pdu.source_cid",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"Source CID", HFILL }},
-
-	{ &hf_acn_pdu_destination_ps,
-	    { "Destination PS","acn.pdu.destination_ps",
-		FT_UINT16, BASE_HEX, NULL, 0x0,
-		"Destination PS", HFILL }},
-
-	{ &hf_acn_pdu_destination_cid,
-	    { "Destination CID","acn.pdu.destination_cid",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"Destination CID", HFILL }},
-
-	{ &hf_acn_pdu_protocol,
-	    { "Protocol","acn.pdu.protocol",
-		FT_UINT16, BASE_HEX, VALS(acn_proto_vals), 0x0,
-		"Protocol", HFILL }},
-
-	{ &hf_acn_pdu_type,
-	    { "Type","acn.pdu.type",
-		FT_UINT16, BASE_HEX, NULL, 0x0,
-		"Type", HFILL }},
-
-	{ &hf_acn_pdu_type_sdt,
-	    { "SDT Type","acn.pdu.type_sdt",
-		FT_UINT16, BASE_HEX, VALS(acn_sdt_type_vals), 0x0,
-		"SDT Type", HFILL }},
-
-	{ &hf_acn_pdu_type_dmp,
-	    { "DMP Type","acn.pdu.type_dmp",
-		FT_UINT16, BASE_HEX, VALS(acn_dmp_type_vals), 0x0,
-		"DMP Type", HFILL }},
-		
-	{ &hf_acn_pdu_data,
-	    { "Data","acn.pdu.data",
-		FT_NONE, BASE_HEX, NULL, 0x0,
-		"Data", HFILL }},
-
-	{ &hf_acn_pdu_unknown_data,
-	    { "Unknown Data","acn.pdu.unknown_data",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"Unknown Data", HFILL }},
-
-	{ &hf_acn_pdu_padding,
-	    { "Padding","acn.pdu.padding",
-		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Padding", HFILL }},
-
-	{ &hf_acn_sdt_session_nr,
-	    { "SDT Session Nr","acn.sdt.session_nr",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Session Nr", HFILL }},
-
-	{ &hf_acn_sdt_tot_seq_nr,
-	    { "SDT Total Sequence Nr","acn.sdt.tot_seq_nr",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT Total Sequence Nr", HFILL }},
-
-	{ &hf_acn_sdt_rel_seq_nr,
-	    { "SDT Rel Seq Nr","acn.sdt.rel_seq_nr",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT Rel Sequence Nr", HFILL }},
-
-	{ &hf_acn_sdt_unavailable_wrappers,
-	    { "SDT Unavailable Wrappers","acn.sdt.unavailable_wrappers",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT Unavailable Wrappers", HFILL }},
-		
-	{ &hf_acn_sdt_refuse_code,
-	    { "SDT Refuse code","acn.sdt.refuse_code",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Refuse Code", HFILL }},
-
-	{ &hf_acn_sdt_last_rel_seq,
-	    { "SDT Last reliable seq nr","acn.sdt.last_rel_seq",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT Last reliable seq nr", HFILL }},
-
-	{ &hf_acn_sdt_new_rel_seq,
-	    { "SDT reliable seq nr to continue with","acn.sdt.new_rel_seq",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT reliable seq nr to continue with", HFILL }},
-
-	{ &hf_acn_sdt_last_rel_wrapper,
-	    { "SDT Last reliable Wrapper","acn.sdt.last_rel_wrapper",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT Last reliable Wrapper", HFILL }},
-
-	{ &hf_acn_sdt_nr_lost_wrappers,
-	    { "SDT Nr of lost Wrappers","acn.sdt.nr_lost_wrappers",
-		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"SDT Nr of lost  Wrappers", HFILL }},
-
-	{ &hf_acn_sdt_session_exp_time,
-	    { "SDT Session expire time","acn.sdt.session_exp_time",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Session expire time", HFILL }},
-		
-	{ &hf_acn_sdt_flags,
-	    { "SDT Flags","acn.sdt.flags",
-		FT_UINT8, BASE_HEX, NULL, 0x0,
-		"SDT Flags", HFILL }},
-
-	{ &hf_acn_sdt_flag_u,
-	    { "U","acn.sdt.flag_u",
-		FT_UINT8, BASE_HEX, NULL, 0x80,
-		"U", HFILL }},
-
-	{ &hf_acn_sdt_flag_d,
-	    { "D","acn.sdt.flag_d",
-		FT_UINT8, BASE_HEX, NULL, 0x40,
-		"D", HFILL }},
-
-	{ &hf_acn_sdt_flag_l,
-	    { "L","acn.sdt.flag_l",
-		FT_UINT8, BASE_HEX, NULL, 0x20,
-		"L", HFILL }},
-
-	{ &hf_acn_sdt_upstream_address_type,
-	    { "SDT Upstream address type","acn.sdt.upstream_address_type",
-		FT_UINT8, BASE_HEX, VALS(acn_sdt_address_type_vals), 0x0,
-		"SDT Upstream address type", HFILL }},
-
-	{ &hf_acn_sdt_downstream_address_type,
-	    { "SDT Downstream address type","acn.sdt.downstream_address_type",
-		FT_UINT8, BASE_HEX, VALS(acn_sdt_address_type_vals), 0x0,
-		"SDT Downstream address type", HFILL }},
-
-	{ &hf_acn_sdt_upstream_port,
-	    { "SDT Upstream Port","acn.sdt.upstream_port",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Upstream Port", HFILL }},
-
-	{ &hf_acn_sdt_downstream_port,
-	    { "SDT Donwstream Port","acn.sdt.downstream_port",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Downstream Port", HFILL }},
-
-	{ &hf_acn_sdt_downstream_ipv4_address,
-	    { "SDT Donwstream IPv4 Address","acn.sdt.downstream_ipv4_address",
-		FT_IPv4, BASE_DEC, NULL, 0x0,
-		"SDT Downstream IPv4 Address", HFILL }},
-
-	{ &hf_acn_sdt_upstream_ipv4_address,
-	    { "SDT Upstream IPv4 Address","acn.sdt.upstream_ipv4_address",
-		FT_IPv4, BASE_DEC, NULL, 0x0,
-		"SDT Upstream IPv4 Address", HFILL }},
-
-	{ &hf_acn_sdt_downstream_ipv6_address,
-	    { "SDT Donwstream IPv6 Address","acn.sdt.downstream_ipv6_address",
-		FT_IPv6, BASE_DEC, NULL, 0x0,
-		"SDT Downstream IPv6 Address", HFILL }},
-
-	{ &hf_acn_sdt_upstream_ipv6_address,
-	    { "SDT Upstream IPv6 Address","acn.sdt.upstream_ipv6_address",
-		FT_IPv6, BASE_DEC, NULL, 0x0,
-		"SDT Upstream IPv6 Address", HFILL }},
-
-	{ &hf_acn_sdt_mid,
-	    { "SDT Member ID","acn.sdt.mid",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Member ID", HFILL }},
-
-	{ &hf_acn_sdt_nak_holdoff_interval,
-	    { "SDT NAK holdoff interval","acn.sdt.nak_holdoff_interval",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT NAK holdoff interval", HFILL }},
-
-	{ &hf_acn_sdt_nak_modulus,
-	    { "SDT NAK modulus","acn.sdt.nak_modulus",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT NAK modulus", HFILL }},
-
-	{ &hf_acn_sdt_max_nak_wait_time,
-	    { "SDT Max. NAK wait time","acn.sdt.max_nak_wait_time",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT Max. NAK wait time ", HFILL }},
-
-	{ &hf_acn_sdt_ack_threshold,
-	    { "SDT ACK threshold","acn.sdt.ack_threshold",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"SDT ACK threshold", HFILL }},
-
-	{ &hf_acn_sdt_member_cid,
-	    { "SDT Memebr CID","acn.sdt.member_cid",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"SDT Member CID", HFILL }},
-
-	{ &hf_acn_sdt_leader_cid,
-	    { "SDT Leader CID","acn.sdt.leader_cid",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"SDT Leader CID", HFILL }}
-
-  };
-
-  static gint *ett[] = {
-    &ett_acn,
-  };
-
-  module_t *acn_module;
-
-  proto_acn = proto_register_protocol("ACN",
-				      "ACN","acn");
-  proto_register_field_array(proto_acn,hf,array_length(hf));
-  proto_register_subtree_array(ett,array_length(ett));
-
-  acn_module = prefs_register_protocol(proto_acn,
-				       proto_reg_handoff_acn);
-#if 0
-  prefs_register_uint_preference(artnet_module, "udp_port",
-				 "ARTNET UDP Port",
-				 "The UDP port on which "
-				 "Art-Net "
-				 "packets will be sent",
-				 10,&global_udp_port_artnet);
-#endif
-}
-
-/* The registration hand-off routing */
-
-void
-proto_reg_handoff_acn(void) {
-  static int acn_initialized = FALSE;
-  static dissector_handle_t acn_handle;
-
-  ip_handle = find_dissector("ip");
-
-  if(!acn_initialized) {
-    acn_handle = create_dissector_handle(dissect_acn,proto_acn);
-    acn_initialized = TRUE;
-  } else {
-    dissector_delete("udp.port",udp_port_acn,acn_handle);
-  }
-
-  udp_port_acn = global_udp_port_acn;
-  
-  dissector_add("udp.port",global_udp_port_acn,acn_handle);
-}