From Erwin Rol: ArtNET support.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 21 Apr 2003 21:28:39 +0000 (21:28 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 21 Apr 2003 21:28:39 +0000 (21:28 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7518 f5534014-38df-0310-8fa8-9805f1628bb7

18 files changed:
AUTHORS
Makefile.am
configure.in
doc/ethereal.pod.template
packaging/nsis/Makefile.nmake
packaging/nsis/ethereal.nsi
plugins/Makefile.am
plugins/Makefile.nmake
plugins/artnet/AUTHORS [new file with mode: 0644]
plugins/artnet/COPYING [new file with mode: 0644]
plugins/artnet/ChangeLog [new file with mode: 0644]
plugins/artnet/INSTALL [new file with mode: 0644]
plugins/artnet/Makefile.am [new file with mode: 0644]
plugins/artnet/Makefile.nmake [new file with mode: 0644]
plugins/artnet/NEWS [new file with mode: 0644]
plugins/artnet/moduleinfo.h [new file with mode: 0644]
plugins/artnet/packet-artnet.c [new file with mode: 0644]
prefs.c

diff --git a/AUTHORS b/AUTHORS
index bce17b6a03eec15abe9700cdcd161c004dfafe3a..52ad8e7da9723eb5850c2672e83d13c05ef977dc 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1668,6 +1668,10 @@ Stephen Shelley <steve.shelley [AT] attbi.com> {
            codes for Modbus/TCP
 }
 
+Erwin Rol <erwin [AT] muffin.org> {
+       ArtNET support
+}
+
 And assorted fixes and enhancements by the people listed above and by:
 
        Pavel Roskin <proski [AT] gnu.org>
index e3ab400cfcb78e6903c1611dd76c16bd19191674..38601d05363aed6206590d942d7df58e430d6131 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.574 2003/04/16 07:24:03 guy Exp $
+# $Id: Makefile.am,v 1.575 2003/04/21 21:28:31 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -418,6 +418,7 @@ DISSECTOR_SRC = \
 
 if HAVE_PLUGINS
 plugin_libs = \
+       plugins/artnet/artnet.la \
        plugins/docsis/docsis.la \
        plugins/giop/cosnaming.la \
        plugins/giop/coseventcomm.la \
@@ -428,6 +429,7 @@ plugin_libs = \
 
 if ENABLE_STATIC
 plugin_ldadd = \
+       plugins/artnet/packet-artnet-static.o \
        plugins/docsis/packet-bpkmattr-static.o \
        plugins/docsis/packet-bpkmreq-static.o \
        plugins/docsis/packet-bpkmrsp-static.o \
@@ -459,6 +461,7 @@ plugin_ldadd = \
        plugins/pcli/packet-pcli-static.o
 
 plugin_src = \
+       plugins/artnet/packet-artnet.c \
        plugins/docsis/packet-bpkmattr.c \
        plugins/docsis/packet-bpkmreq.c \
        plugins/docsis/packet-bpkmrsp.c \
@@ -492,6 +495,7 @@ plugin_src = \
 else           # ENABLE_STATIC
 plugin_ldadd = \
        "-dlopen" self  \
+       "-dlopen" plugins/artnet/artnet.la \
        "-dlopen" plugins/docsis/docsis.la \
        "-dlopen" plugins/giop/cosnaming.la \
        "-dlopen" plugins/giop/coseventcomm.la \
index d04baf90cb4c3cd70896391c0b21fbb4a3ee2f9c..9e4246387a90a670886a79d1d611f013c6d4459e 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.203 2003/03/25 23:35:30 guy Exp $
+# $Id: configure.in,v 1.204 2003/04/21 21:28:31 guy Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -765,6 +765,7 @@ AC_OUTPUT(
   packaging/svr4/checkinstall
   packaging/svr4/pkginfo
   plugins/Makefile
+  plugins/artnet/Makefile
   plugins/docsis/Makefile
   plugins/giop/Makefile
   plugins/gryphon/Makefile
index 3615435425ec2d859209154138bb87a9fb2c36cd..5bfdbafccd0e92423481ffbc47bcfee8127bdc9c 100644 (file)
@@ -1731,6 +1731,7 @@ B<http://www.ethereal.com>.
   Georgi Guninski          <guninski [AT] guninski.com>
   Jason Copenhaver         <jcopenha [AT] typedef.org>
   Eric Perie               <eric.perie [AT] colubris.com>
+  Erwin Rol                <erwin [AT] muffin.org>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
index 02230bbb4bbc3c847ed2b72e6536781de0bc2870..385d1d0e0185422a8e3c674b66ea9501b86c4abb 100644 (file)
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.16 2003/04/18 04:46:38 guy Exp $
+# $Id: Makefile.nmake,v 1.17 2003/04/21 21:28:35 guy Exp $
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
 # It was originally written for the Winamp package, but various
@@ -22,7 +22,8 @@ DOC=../../doc/ethereal.html           \
        ../../README.win32
 GPL=GPL.txt
 
-PLUGINS=../../plugins/docsis/docsis.dll \
+PLUGINS=../../plugins/artnet/artnet.dll \
+       ../../plugins/docsis/docsis.dll \
        ../../plugins/giop/coseventcomm.dll \
        ../../plugins/giop/cosnaming.dll \
        ../../plugins/gryphon/gryphon.dll \
index cbc6782e3dea425f88112ea9978fa92b88624bb5..0bc2f95d4afd64a1151392b53a5dfc3ff4c5a2e8 100644 (file)
@@ -1,7 +1,7 @@
 ;
 ; ethereal.nsi
 ;
-; $Id: ethereal.nsi,v 1.11 2003/04/18 04:46:38 guy Exp $
+; $Id: ethereal.nsi,v 1.12 2003/04/21 21:28:36 guy Exp $
 
 ; ============================================================================
 ; Header configuration
@@ -140,6 +140,7 @@ SectionEnd
 Section "Plugins"
 ;-------------------------------------------
 SetOutPath $INSTDIR\plugins\${VERSION}
+File "..\..\plugins\artnet\artnet.dll"
 File "..\..\plugins\docsis\docsis.dll"
 File "..\..\plugins\giop\coseventcomm.dll"
 File "..\..\plugins\giop\cosnaming.dll"
index 058097e9a127cd4416f951f53f91388476307729..d3ff9279a20ed29cade21cde26a7ea5068514ad2 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.13 2003/01/14 23:53:38 guy Exp $
+# $Id: Makefile.am,v 1.14 2003/04/21 21:28:37 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SUBDIRS = docsis giop gryphon megaco mgcp pcli
+SUBDIRS = artnet docsis giop gryphon megaco mgcp pcli
 
 plugindir = @plugindir@
 
index a6184a197533c4353ec9f611590de2e485f6ca7d..25665e1d7ab9e95adce72aad4640f77bee468887 100644 (file)
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.16 2003/01/14 23:53:38 guy Exp $
+# $Id: Makefile.nmake,v 1.17 2003/04/21 21:28:37 guy Exp $
 #
 
 include ..\config.nmake
@@ -13,7 +13,12 @@ CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \
 
 OBJECTS=plugin_api.obj 
 
-all: plugin_api.obj docsis giop gryphon megaco mgcp pcli
+all: plugin_api.obj artnet docsis giop gryphon megaco mgcp pcli
+
+artnet:: 
+       cd artnet
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+       cd ..
 
 docsis::
        cd docsis
@@ -47,7 +52,9 @@ pcli::
 
 clean:
        rm -f plugin_api.obj $(PDB_FILE)
-       cd docsis
+       cd artnet
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ../docsis
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../giop
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
diff --git a/plugins/artnet/AUTHORS b/plugins/artnet/AUTHORS
new file mode 100644 (file)
index 0000000..463448f
--- /dev/null
@@ -0,0 +1,3 @@
+Author :
+Erwin Rol <erwin@muffin.org>
+
diff --git a/plugins/artnet/COPYING b/plugins/artnet/COPYING
new file mode 100644 (file)
index 0000000..d60c31a
--- /dev/null
@@ -0,0 +1,340 @@
+                   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.
+\f
+                   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.)
+\f
+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.
+\f
+  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.
+\f
+  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
+\f
+           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/artnet/ChangeLog b/plugins/artnet/ChangeLog
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/plugins/artnet/INSTALL b/plugins/artnet/INSTALL
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am
new file mode 100644 (file)
index 0000000..f75e9dd
--- /dev/null
@@ -0,0 +1,49 @@
+# Makefile.am
+# Automake file for Ethereal/ArtNET
+#
+# $Id: Makefile.am,v 1.1 2003/04/21 21:28:39 guy Exp $
+#
+# Ethereal - Network traffic analyzer
+# By Steve Limkemann <stevelim@dgtech.com>
+# Copyright 1998 Steve Limkemann
+#
+# 
+# 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)
+
+plugindir = @plugindir@
+
+plugin_LTLIBRARIES = artnet.la
+artnet_la_SOURCES = packet-artnet.c moduleinfo.h
+artnet_la_LDFLAGS = -module -avoid-version
+
+# 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 =
+
+artnet_la_DEPENDENCIES = packet-artnet-static.o
+
+packet-artnet-static.o:        packet-artnet.c moduleinfo.h
+       $(LTCOMPILE) -c -o packet-artnet-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-artnet.c 
+
+CLEANFILES = \
+       artnet \
+       *~
+
+EXTRA_DIST = \
+       Makefile.nmake
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
new file mode 100644 (file)
index 0000000..7400cba
--- /dev/null
@@ -0,0 +1,21 @@
+#
+# $Id: Makefile.nmake,v 1.1 2003/04/21 21:28:39 guy Exp $
+#
+
+include ..\..\config.nmake
+
+############### no need to modify below this line #########
+
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
+       /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
+       /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+       /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+
+OBJECTS=packet-artnet.obj 
+
+artnet.dll artnet.exp artnet.lib : packet-artnet.obj ..\plugin_api.obj
+       link -dll /out:artnet.dll packet-artnet.obj ..\plugin_api.obj \
+       $(GLIB_DIR)\glib-$(GLIB_VERSION).lib
+
+clean:
+       rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
diff --git a/plugins/artnet/NEWS b/plugins/artnet/NEWS
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/plugins/artnet/moduleinfo.h b/plugins/artnet/moduleinfo.h
new file mode 100644 (file)
index 0000000..c8ab9ac
--- /dev/null
@@ -0,0 +1,17 @@
+/* Included *after* config.h, in order to re-define these macros */
+
+#ifdef PACKAGE
+#undef PACKAGE
+#endif
+
+/* Name of package */
+#define PACKAGE "artnet"
+
+
+#ifdef VERSION
+#undef VERSION
+#endif
+
+/* Version number of package */
+#define VERSION "0.0.1"
+
diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c
new file mode 100644 (file)
index 0000000..a061c1b
--- /dev/null
@@ -0,0 +1,2077 @@
+/* packet-artnet.c
+ * Routines for ArtNET packet disassembly
+ *
+ * $Id: packet-artnet.c,v 1.1 2003/04/21 21:28:39 guy Exp $
+ *
+ * Copyright (c) 2003 by Erwin Rol <erwin@muffin.org>
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * 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 "plugins/plugin_api.h"
+
+#include "moduleinfo.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <gmodule.h>
+#include <ctype.h>
+#include <time.h>
+#include <string.h>
+#include <epan/packet.h>
+#include <epan/resolv.h>
+#include "prefs.h"
+#include <epan/strutil.h>
+
+#include "plugins/plugin_api_defs.h"
+
+/* Define version if we are not building ethereal statically */
+
+#ifndef __ETHEREAL_STATIC__
+G_MODULE_EXPORT const gchar version[] = VERSION;
+#endif
+
+/*
+ * See
+ *
+ *     http://www.artisticlicence.com/art-net.pdf
+ */
+
+/* Define udp_port for ArtNET */
+
+#define UDP_PORT_ARTNET 0x1936
+
+#define ARTNET_HEADER_LENGTH                 10
+#define ARTNET_POLL_LENGTH                   4
+#define ARTNET_POLL_REPLY_LENGTH             197
+#define ARTNET_POLL_REPLY_PORT_INFO_LENGTH   22
+#define ARTNET_POLL_REPLY_PORT_TYPES_LENGTH  4
+#define ARTNET_POLL_REPLY_GOOD_INPUT_LENGTH  4
+#define ARTNET_POLL_REPLY_GOOD_OUTPUT_LENGTH 4
+#define ARTNET_POLL_REPLY_SWIN_LENGTH        4
+#define ARTNET_POLL_REPLY_SWOUT_LENGTH       4
+#define ARTNET_ADDRESS_LENGTH                97
+#define ARTNET_ADDRESS_SWIN_LENGTH           4
+#define ARTNET_ADDRESS_SWOUT_LENGTH          4
+#define ARTNET_OUTPUT_LENGTH                 1
+#define ARTNET_INPUT_LENGTH                  10
+#define ARTNET_INPUT_INPUT_LENGTH            4
+#define ARTNET_FIRMWARE_MASTER_LENGTH        1035
+#define ARTNET_FIRMWARE_REPLY_LENGTH         26
+#define ARTNET_VIDEO_SETUP_LENGTH            74
+#define ARTNET_VIDEO_PALETTE_LENGTH          55
+#define ARTNET_VIDEO_DATA_LENGTH             8
+
+
+#define ARTNET_OP_POLL            0x2000
+#define ARTNET_OP_POLL_REPLY      0x2100
+#define ARTNET_OP_OUTPUT          0x5000
+#define ARTNET_OP_ADDRESS         0x6000
+#define ARTNET_OP_INPUT           0x7000
+#define ARTNET_OP_VIDEO_SETUP     0xa010
+#define ARTNET_OP_VIDEO_PALETTE   0xa020
+#define ARTNET_OP_VIDEO_DATA      0xa040
+
+#define ARTNET_OP_UNKNOWN_0x8000  0x8000
+#define ARTNET_OP_UNKNOWN_0x8100  0x8100
+#define ARTNET_OP_UNKNOWN_0x8200  0x8200
+#define ARTNET_OP_UNKNOWN_0x8300  0x8300
+
+#define ARTNET_OP_MAC_MASTER      0xf000
+#define ARTNET_OP_MAC_SLAVE       0xf100
+#define ARTNET_OP_FIRMWARE_MASTER 0xf200
+#define ARTNET_OP_FIRMWARE_REPLY  0xf300
+
+static const value_string artnet_opcode_vals[] = {
+  { ARTNET_OP_POLL,            "ArtPoll packet" },
+  { ARTNET_OP_POLL_REPLY,      "ArtPollReply packet" },
+  { ARTNET_OP_OUTPUT,          "ArtDMX data packet" },
+  { ARTNET_OP_ADDRESS,         "ArtAddress packet" },
+  { ARTNET_OP_INPUT,           "ArtInput packet" },
+  { ARTNET_OP_VIDEO_SETUP,     "ArtVideoSetup packet" },
+  { ARTNET_OP_VIDEO_PALETTE,   "ArtVideoPalette packet" },
+  { ARTNET_OP_VIDEO_DATA,      "ArtVideoData packet" },
+
+  { ARTNET_OP_UNKNOWN_0x8000,  "Undocument opcode 0x8000" },
+  { ARTNET_OP_UNKNOWN_0x8100,  "Undocument opcode 0x8100" },
+  { ARTNET_OP_UNKNOWN_0x8200,  "Undocument opcode 0x8200" },
+  { ARTNET_OP_UNKNOWN_0x8300,  "Undocument opcode 0x8300" },
+  
+  { ARTNET_OP_MAC_MASTER,      "ArtMacMaster packet" },
+  { ARTNET_OP_MAC_SLAVE,       "ArtMacSlave packet" },
+  { ARTNET_OP_FIRMWARE_MASTER, "ArtFirmwareMaster packet" },
+  { ARTNET_OP_FIRMWARE_REPLY,  "ArtFirmwareReply packet" },
+  { 0,                       NULL }
+};
+
+#define ARTNET_AC_NONE           0x00
+#define ARTNET_AC_CANCEL_MERGE   0x01
+#define ARTNET_AC_LED_NORMAL     0x02
+#define ARTNET_AC_LED_MUTE       0x03
+#define ARTNET_AC_LED_LOCATE     0x04
+#define ARTNET_AC_RESET_RX_FLAGS 0x05
+#define ARTNET_AC_MERGE_LTP0     0x10
+#define ARTNET_AC_MERGE_LTP1     0x11
+#define ARTNET_AC_MERGE_LTP2     0x12
+#define ARTNET_AC_MERGE_LTP3     0x13
+#define ARTNET_AC_MERGE_HTP0     0x50
+#define ARTNET_AC_MERGE_HTP1     0x51
+#define ARTNET_AC_MERGE_HTP2     0x52
+#define ARTNET_AC_MERGE_HTP3     0x53
+#define ARTNET_AC_CLEAR_OP0      0x90
+#define ARTNET_AC_CLEAR_OP1      0x91
+#define ARTNET_AC_CLEAR_OP2      0x92
+#define ARTNET_AC_CLEAR_OP3      0x93
+
+static const value_string artnet_address_command_vals[] = {
+  { ARTNET_AC_NONE,            "No Action" },
+  { ARTNET_AC_CANCEL_MERGE,    "Cancel merge" },
+  { ARTNET_AC_LED_NORMAL,      "LED Normal" },
+  { ARTNET_AC_LED_MUTE,        "LED Mute" },
+  { ARTNET_AC_LED_LOCATE,      "LED Locate" },
+  { ARTNET_AC_RESET_RX_FLAGS,  "Reset SIP text" },
+  { ARTNET_AC_MERGE_LTP0,      "DMX port 1 LTP" },
+  { ARTNET_AC_MERGE_LTP1,      "DMX port 2 LTP" },
+  { ARTNET_AC_MERGE_LTP2,      "DXM port 3 LTP" },
+  { ARTNET_AC_MERGE_LTP3,      "DMX port 4 LTP" },
+  { ARTNET_AC_MERGE_HTP0,      "DMX port 1 HTP" },
+  { ARTNET_AC_MERGE_HTP1,      "DMX port 2 HTP" },
+  { ARTNET_AC_MERGE_HTP2,      "DXM port 3 HTP" },
+  { ARTNET_AC_MERGE_HTP3,      "DMX port 4 HTP" },
+  { ARTNET_AC_CLEAR_OP0,       "Clear DMX port 1" },
+  { ARTNET_AC_CLEAR_OP1,       "Clear DMX port 2" },
+  { ARTNET_AC_CLEAR_OP2,       "Clear DXM port 3" },
+  { ARTNET_AC_CLEAR_OP3,       "Clear DMX port 4" },
+  { 0,                         NULL }
+};
+
+#define ARTNET_FT_FIRM_FIRST 0x00
+#define ARTNET_FT_FIRM_CONT  0x01
+#define ARTNET_FT_FIRM_LAST  0x02
+#define ARTNET_FT_UBEA_FIRST 0x03
+#define ARTNET_FT_UBEA_CONT  0x04
+#define ARTNET_FT_UBEA_LAST  0x05
+
+static const value_string artnet_firmware_master_type_vals[] = {
+  { ARTNET_FT_FIRM_FIRST, "FirmFirst" },
+  { ARTNET_FT_FIRM_CONT,  "FirmCont" },
+  { ARTNET_FT_FIRM_LAST,  "FirmLast" },
+  { ARTNET_FT_UBEA_FIRST, "UbeaFirst" },
+  { ARTNET_FT_UBEA_CONT,  "UbeaCont" },
+  { ARTNET_FT_UBEA_LAST,  "UbeaLast" },
+  { 0,                    NULL }
+};
+
+#define ARTNET_FRT_FIRM_BLOCK_GOOD 0x00
+#define ARTNET_FRT_FIRM_ALL_GOOD   0x01
+#define ARTNET_FRT_FIRM_FAIL       0xff
+
+static const value_string artnet_firmware_reply_type_vals[] = {
+  { ARTNET_FRT_FIRM_BLOCK_GOOD, "FirmBlockGood" },
+  { ARTNET_FRT_FIRM_ALL_GOOD,   "FirmAllGood" },
+  { ARTNET_FRT_FIRM_FAIL,       "FirmFail" },
+  { 0,                          NULL }
+};
+
+void proto_reg_handoff_artnet(void);
+
+/* Define the artnet proto */
+static int proto_artnet = -1;
+
+/* Header */
+static int hf_artnet_header = -1;
+static int hf_artnet_header_id = -1;
+static int hf_artnet_header_opcode = -1;
+
+/* ArtPoll */
+static int hf_artnet_poll = -1;
+static int hf_artnet_poll_protver = -1;
+static int hf_artnet_poll_talktome = -1;
+static int hf_artnet_poll_pad = -1;
+
+/* ArtPollReply */
+static int hf_artnet_poll_reply = -1;
+static int hf_artnet_poll_reply_ip_address = -1;
+static int hf_artnet_poll_reply_port_nr = -1;
+static int hf_artnet_poll_reply_versinfo = -1;
+static int hf_artnet_poll_reply_subswitch = -1;
+static int hf_artnet_poll_reply_oem = -1;
+static int hf_artnet_poll_reply_ubea_version = -1;
+static int hf_artnet_poll_reply_status = -1;
+static int hf_artnet_poll_reply_esta_man = -1;
+static int hf_artnet_poll_reply_short_name = -1;
+static int hf_artnet_poll_reply_long_name = -1;
+static int hf_artnet_poll_reply_node_report = -1;
+static int hf_artnet_poll_reply_port_info = -1;
+static int hf_artnet_poll_reply_num_ports = -1;
+static int hf_artnet_poll_reply_port_types = -1;
+static int hf_artnet_poll_reply_port_types_1 = -1;
+static int hf_artnet_poll_reply_port_types_2 = -1;
+static int hf_artnet_poll_reply_port_types_3 = -1;
+static int hf_artnet_poll_reply_port_types_4 = -1;
+static int hf_artnet_poll_reply_good_input = -1;
+static int hf_artnet_poll_reply_good_input_1 = -1;
+static int hf_artnet_poll_reply_good_input_2 = -1;
+static int hf_artnet_poll_reply_good_input_3 = -1;
+static int hf_artnet_poll_reply_good_input_4 = -1;
+static int hf_artnet_poll_reply_good_output = -1;
+static int hf_artnet_poll_reply_good_output_1 = -1;
+static int hf_artnet_poll_reply_good_output_2 = -1;
+static int hf_artnet_poll_reply_good_output_3 = -1;
+static int hf_artnet_poll_reply_good_output_4 = -1;
+static int hf_artnet_poll_reply_swin = -1;
+static int hf_artnet_poll_reply_swin_1 = -1;
+static int hf_artnet_poll_reply_swin_2 = -1;
+static int hf_artnet_poll_reply_swin_3 = -1;
+static int hf_artnet_poll_reply_swin_4 = -1;
+static int hf_artnet_poll_reply_swout = -1;
+static int hf_artnet_poll_reply_swout_1 = -1;
+static int hf_artnet_poll_reply_swout_2 = -1;
+static int hf_artnet_poll_reply_swout_3 = -1;
+static int hf_artnet_poll_reply_swout_4 = -1;
+static int hf_artnet_poll_reply_swvideo = -1;
+static int hf_artnet_poll_reply_swmacro = -1;
+static int hf_artnet_poll_reply_swremote = -1;
+static int hf_artnet_poll_reply_spare = -1;
+static int hf_artnet_poll_reply_mac = -1;
+
+/* ArtOutput */
+static int hf_artnet_output = -1;
+static int hf_artnet_output_protver = -1;
+static int hf_artnet_output_sequence = -1;
+static int hf_artnet_output_physical = -1;
+static int hf_artnet_output_universe = -1;
+static int hf_artnet_output_length = -1;
+static int hf_artnet_output_data = -1;
+
+/* ArtAddress */
+static int hf_artnet_address = -1;
+static int hf_artnet_address_protver = -1;
+static int hf_artnet_address_filler = -1;
+static int hf_artnet_address_short_name = -1;
+static int hf_artnet_address_long_name = -1;
+static int hf_artnet_address_swin = -1;
+static int hf_artnet_address_swin_1 = -1;
+static int hf_artnet_address_swin_2 = -1;
+static int hf_artnet_address_swin_3 = -1;
+static int hf_artnet_address_swin_4 = -1;
+static int hf_artnet_address_swout = -1;
+static int hf_artnet_address_swout_1 = -1;
+static int hf_artnet_address_swout_2 = -1;
+static int hf_artnet_address_swout_3 = -1;
+static int hf_artnet_address_swout_4 = -1;
+static int hf_artnet_address_subswitch = -1;
+static int hf_artnet_address_swvideo = -1;
+static int hf_artnet_address_command = -1;
+
+/* ArtInput */
+static int hf_artnet_input = -1;
+static int hf_artnet_input_protver = -1;
+static int hf_artnet_input_filler = -1;
+static int hf_artnet_input_num_ports = -1;
+static int hf_artnet_input_input = -1;
+static int hf_artnet_input_input_1 = -1;
+static int hf_artnet_input_input_2 = -1;
+static int hf_artnet_input_input_3 = -1;
+static int hf_artnet_input_input_4 = -1;
+
+/* ArtFirmwareMaster */
+static int hf_artnet_firmware_master = -1;
+static int hf_artnet_firmware_master_protver = -1;
+static int hf_artnet_firmware_master_filler = -1;
+static int hf_artnet_firmware_master_type = -1;
+static int hf_artnet_firmware_master_block_id = -1;
+static int hf_artnet_firmware_master_length = -1;
+static int hf_artnet_firmware_master_spare = -1;
+static int hf_artnet_firmware_master_data = -1;
+
+/* ArtFirmwareReply */
+static int hf_artnet_firmware_reply = -1;
+static int hf_artnet_firmware_reply_protver = -1;
+static int hf_artnet_firmware_reply_filler = -1;
+static int hf_artnet_firmware_reply_type = -1;
+static int hf_artnet_firmware_reply_spare = -1;
+
+/* ArtVideoSetup */
+static int hf_artnet_video_setup = -1;
+static int hf_artnet_video_setup_protver = -1;
+static int hf_artnet_video_setup_filler = -1;
+static int hf_artnet_video_setup_control = -1;
+static int hf_artnet_video_setup_font_height = -1;
+static int hf_artnet_video_setup_first_font = -1;
+static int hf_artnet_video_setup_last_font = -1;
+static int hf_artnet_video_setup_win_font_name = -1;
+static int hf_artnet_video_setup_font_data = -1;
+
+/* ArtVideoPalette */
+static int hf_artnet_video_palette = -1;
+static int hf_artnet_video_palette_protver = -1;
+static int hf_artnet_video_palette_filler = -1;
+static int hf_artnet_video_palette_colour_red = -1;
+static int hf_artnet_video_palette_colour_green = -1;
+static int hf_artnet_video_palette_colour_blue = -1;
+
+/* ArtVideoData */
+static int hf_artnet_video_data = -1;
+static int hf_artnet_video_data_protver = -1;
+static int hf_artnet_video_data_filler = -1;
+static int hf_artnet_video_data_pos_x = -1;
+static int hf_artnet_video_data_pos_y = -1;
+static int hf_artnet_video_data_len_x = -1;
+static int hf_artnet_video_data_len_y = -1;
+static int hf_artnet_video_data_data = -1;
+
+
+
+/* Define the tree for artnet */
+static int ett_artnet = -1;
+
+/* 
+ * Here are the global variables associated with the preferences
+ * for artnet
+ */
+
+static guint global_udp_port_artnet = UDP_PORT_ARTNET;
+static guint udp_port_artnet = UDP_PORT_ARTNET;
+
+/* A static handle for the ip dissector */
+static dissector_handle_t ip_handle;
+
+static guint
+dissect_artnet_poll(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  guint8 talktome;
+  guint16 protver;
+
+  protver = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  talktome = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_talktome, tvb,
+                      offset, 1, talktome);
+  offset += 1;
+        
+  proto_tree_add_item(tree, hf_artnet_poll_pad, tvb,
+                      offset, 1, FALSE);
+  offset += 1;
+  
+  return offset;
+}
+
+static guint 
+dissect_artnet_poll_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  proto_tree *hi,*si,*ti;
+  guint32 ip_address;
+  guint16 port_nr, versinfo,subswitch,oem;
+  guint8 ubea_version,swin,swout,swvideo,swmacro,swremote;
+  guint8 status,port_types,good_input,good_output;
+  guint16 esta_man;
+  guint16 num_ports;
+        
+  ip_address = tvb_get_letohl(tvb, offset);
+  proto_tree_add_ipv4(tree, hf_artnet_poll_reply_ip_address, tvb,
+                      offset, 4, ip_address);
+  offset += 4;
+      
+  port_nr = tvb_get_letohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_port_nr, tvb,
+                      offset, 2, port_nr);
+  offset += 2;
+
+  versinfo = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_versinfo, tvb,
+                      offset, 2, versinfo);
+  offset += 2;
+      
+  subswitch = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_subswitch, tvb,
+                      offset, 2, subswitch);
+  offset += 2;
+        
+  oem = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_oem, tvb,
+                      offset, 2, oem);
+  offset += 2;
+
+  ubea_version = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_ubea_version, tvb,
+                      offset, 1, ubea_version);
+  offset += 1;
+   
+  status = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_status, tvb,
+                      offset, 1, status);
+  offset += 1;
+
+  esta_man = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_esta_man, tvb,
+                      offset, 2, esta_man);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_poll_reply_short_name,
+                      tvb, offset, 18, FALSE);
+  offset += 18;
+        
+  proto_tree_add_item(tree, hf_artnet_poll_reply_long_name,
+                      tvb, offset, 64, FALSE);
+  offset += 64;
+
+  proto_tree_add_item(tree, hf_artnet_poll_reply_node_report,
+                      tvb, offset, 64, FALSE);
+  offset += 64;
+
+  
+  hi = proto_tree_add_item(tree,
+                           hf_artnet_poll_reply_port_info,
+                           tvb,
+                           offset,
+                           ARTNET_POLL_REPLY_PORT_INFO_LENGTH,
+                           FALSE);
+
+  si = proto_item_add_subtree(hi, ett_artnet);
+
+  num_ports = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_poll_reply_num_ports, tvb,
+                      offset, 2, num_ports);
+  offset += 2;
+
+  hi = proto_tree_add_item(si,
+                           hf_artnet_poll_reply_port_types,
+                           tvb,
+                           offset,
+                           ARTNET_POLL_REPLY_PORT_TYPES_LENGTH,
+                           FALSE);
+
+  ti = proto_item_add_subtree(hi, ett_artnet);
+
+  port_types = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_port_types_1, tvb,
+                      offset, 1, port_types);
+  offset += 1;
+
+  port_types = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_port_types_2, tvb,
+                      offset, 1, port_types);
+  offset += 1;
+
+  port_types = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_port_types_3, tvb,
+                      offset, 1, port_types);
+  offset += 1;
+
+  port_types = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_port_types_4, tvb,
+                      offset, 1, port_types);
+  offset += 1;
+  
+  hi = proto_tree_add_item(si,
+                           hf_artnet_poll_reply_good_input,
+                           tvb,
+                           offset,
+                           ARTNET_POLL_REPLY_GOOD_INPUT_LENGTH,
+                           FALSE);
+
+  ti = proto_item_add_subtree(hi, ett_artnet);
+
+  good_input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_input_1, tvb,
+                      offset, 1, good_input);
+  offset += 1;
+
+  good_input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_input_2, tvb,
+                      offset, 1, good_input);
+  offset += 1;
+
+  good_input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_input_3, tvb,
+                      offset, 1, good_input);
+  offset += 1;
+
+  good_input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_input_4, tvb,
+                      offset, 1, good_input);
+  offset += 1;
+
+  hi = proto_tree_add_item(si,
+                           hf_artnet_poll_reply_good_output,
+                           tvb,
+                           offset,
+                           ARTNET_POLL_REPLY_GOOD_OUTPUT_LENGTH,
+                           FALSE);
+
+  ti = proto_item_add_subtree(hi, ett_artnet);
+
+  good_output = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_output_1, tvb,
+                      offset, 1, good_output);
+  offset += 1;
+
+  good_output = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_output_2, tvb,
+                      offset, 1, good_output);
+  offset += 1;
+
+  good_output = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_output_3, tvb,
+                      offset, 1, good_output);
+  offset += 1;
+
+  good_output = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_good_output_4, tvb,
+                      offset, 1, good_output);
+  offset += 1;
+
+  hi = proto_tree_add_item(si,
+                           hf_artnet_poll_reply_swin,
+                           tvb,
+                           offset,
+                           ARTNET_POLL_REPLY_SWIN_LENGTH,
+                           FALSE);
+
+  ti = proto_item_add_subtree(hi, ett_artnet);
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swin_1, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swin_2, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swin_3, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swin_4, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  hi = proto_tree_add_item(si,
+                           hf_artnet_poll_reply_swout,
+                           tvb,
+                           offset,
+                           ARTNET_POLL_REPLY_SWOUT_LENGTH,
+                           FALSE);
+
+  ti = proto_item_add_subtree(hi, ett_artnet);
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swout_1, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swout_2, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swout_3, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_poll_reply_swout_4, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swvideo = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_swvideo, tvb,
+                      offset, 1, swvideo);
+  offset += 1;
+
+  swmacro = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_swmacro, tvb,
+                      offset, 1, swmacro);
+  offset += 1;
+
+  swremote = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_poll_reply_swremote, tvb,
+                      offset, 1, swremote);
+  offset += 1;
+
+  proto_tree_add_item(tree, hf_artnet_poll_reply_spare, tvb,
+                      offset, 4, FALSE);
+  offset += 4;
+
+  proto_tree_add_item(tree, hf_artnet_poll_reply_mac,
+                        tvb, offset, 6, FALSE);
+
+  offset += 6;
+  
+  return offset;
+}
+
+static guint 
+dissect_artnet_output(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  guint16 protver,universe,length;
+  guint8 sequence,physical;
+        
+  protver = tvb_get_letohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_output_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  sequence = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_output_sequence, tvb,
+                      offset, 1, sequence);
+  offset += 1;
+  
+  physical = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_output_physical, tvb,
+                      offset, 1, physical);
+  offset += 1;
+  
+  universe = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_output_universe, tvb,
+                      offset, 2, universe);
+  offset += 2;
+  
+  length = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_output_length, tvb,
+                      offset, 2, length);
+  offset += 2;
+  
+  proto_tree_add_item(tree, hf_artnet_output_data, tvb,
+                      offset, length, FALSE );
+  offset += length;
+
+  return offset;   
+}
+
+static guint
+dissect_artnet_address(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  proto_tree *hi,*si,*ti;
+  guint16 protver;
+  guint8 swin,swout,swvideo,command;
+        
+  protver = tvb_get_letohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_address_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_address_filler, tvb,
+                      offset, 2, FALSE);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_address_short_name,
+                      tvb, offset, 18, FALSE);
+  offset += 18;
+        
+  proto_tree_add_item(tree, hf_artnet_address_long_name,
+                      tvb, offset, 64, FALSE);
+  offset += 64;
+
+  hi = proto_tree_add_item(tree,
+                           hf_artnet_address_swin,
+                           tvb,
+                           offset,
+                           ARTNET_ADDRESS_SWIN_LENGTH,
+                           FALSE);
+
+  ti = proto_item_add_subtree(hi, ett_artnet);
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_address_swin_1, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_address_swin_2, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_address_swin_3, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  swin = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(ti, hf_artnet_address_swin_4, tvb,
+                      offset, 1, swin);
+  offset += 1;
+
+  hi = proto_tree_add_item(tree,
+                           hf_artnet_address_swout,
+                           tvb,
+                           offset,
+                           ARTNET_ADDRESS_SWOUT_LENGTH,
+                           FALSE);
+
+  si = proto_item_add_subtree(hi, ett_artnet);
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_address_swout_1, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_address_swout_2, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_address_swout_3, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swout = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_address_swout_4, tvb,
+                      offset, 1, swout);
+  offset += 1;
+
+  swvideo = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_address_swvideo, tvb,
+                      offset, 1, swvideo);
+  offset += 1;
+
+  command = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_address_command, tvb,
+                      offset, 1, command);
+
+  offset += 1;
+  
+  return offset;
+}
+
+static guint 
+dissect_artnet_input(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  proto_tree *hi,*si;
+  guint16 protver, num_ports;
+  guint8 input;
+        
+  protver = tvb_get_letohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_input_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_input_filler, tvb,
+                      offset, 2, FALSE);
+  offset += 2;
+
+  num_ports = tvb_get_letohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_input_num_ports, tvb,
+                      offset, 2, num_ports);
+  offset += 2;
+
+  hi = proto_tree_add_item(tree,
+                           hf_artnet_input_input,
+                           tvb,
+                           offset,
+                           ARTNET_INPUT_INPUT_LENGTH,
+                           FALSE);
+
+  si = proto_item_add_subtree(hi, ett_artnet);
+
+  input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_input_input_1, tvb,
+                      offset, 1, input);
+  offset += 1;
+
+  input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_input_input_2, tvb,
+                      offset, 1, input);
+  offset += 1;
+
+  input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_input_input_3, tvb,
+                      offset, 1, input);
+  offset += 1;
+
+  input = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(si, hf_artnet_input_input_4, tvb,
+                      offset, 1, input);
+  offset += 1;
+  
+  return offset;
+}
+
+static guint
+dissect_artnet_video_setup(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
+  guint16 protver;
+  guint32 size;
+  guint8 control,font_height, last_font,first_font;
+        
+  protver = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_setup_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_video_setup_filler, tvb,
+                      offset, 4, FALSE);
+  offset += 4;
+
+  control = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_setup_control, tvb,
+                      offset, 1, control);
+  offset += 1;
+
+  font_height = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_setup_font_height, tvb,
+                      offset, 1, font_height);
+  offset += 1;
+
+  first_font = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_setup_first_font, tvb,
+                      offset, 1, first_font);
+  offset += 1;
+
+  last_font = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_setup_last_font, tvb,
+                      offset, 1, last_font);
+  offset += 1;
+
+  proto_tree_add_item(tree, hf_artnet_video_setup_win_font_name,
+                      tvb, offset, 64, FALSE);
+  offset += 64;
+
+  size = last_font * font_height;
+
+  proto_tree_add_item(tree, hf_artnet_video_setup_font_data, tvb,
+                      offset, size, FALSE );
+  
+  offset += size;
+
+  return offset;
+}
+
+static guint 
+dissect_artnet_video_palette(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  guint16 protver;
+        
+  protver = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_palette_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_video_palette_filler, tvb,
+                      offset, 2, FALSE);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_video_palette_colour_red, tvb,
+                      offset, 17, FALSE );
+  
+  offset += 17;
+
+  proto_tree_add_item(tree, hf_artnet_video_palette_colour_green, tvb,
+                      offset, 17, FALSE );
+  
+  offset += 17;
+  proto_tree_add_item(tree, hf_artnet_video_palette_colour_blue, tvb,
+                      offset, 17, FALSE );
+  
+  offset += 17;
+
+  return offset;
+}
+
+static guint
+dissect_artnet_video_data(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  guint16 protver;
+  guint8 pos_x, pos_y, len_x, len_y;
+  guint32 size;
+        
+  protver = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_data_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_video_data_filler, tvb,
+                      offset, 2, FALSE);
+  offset += 2;
+
+  pos_x = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_data_pos_x, tvb,
+                      offset, 1, pos_x);
+  offset += 1;
+
+  pos_y = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_data_pos_y, tvb,
+                      offset, 1, pos_y);
+  offset += 1;
+
+  len_x = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_data_len_x, tvb,
+                      offset, 1, len_x);
+  offset += 1;
+
+  len_y = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_video_data_len_y, tvb,
+                      offset, 1, len_y);
+  offset += 1;
+
+  size = len_x * len_y * 2;
+
+  proto_tree_add_item(tree, hf_artnet_video_data_data, tvb,
+                      offset, size, FALSE );
+  
+  offset += size;
+
+  return offset;
+}
+
+static guint 
+dissect_artnet_firmware_master(tvbuff_t *tvb, guint offset, proto_tree *tree ) {
+  guint16 protver;
+  guint8 type,block_id;
+  guint32 length;
+        
+  protver = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_firmware_master_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_firmware_master_filler, tvb,
+                      offset, 2, FALSE);
+  offset += 2;
+  
+  type = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_firmware_master_type, tvb,
+                      offset, 1, type);
+  offset += 1;
+  
+  block_id = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_firmware_master_block_id, tvb,
+                      offset, 1, block_id);
+  offset += 1;
+  
+  length = tvb_get_ntohl(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_firmware_master_length, tvb,
+                      offset, 4, length);
+  offset += 4;
+  
+  proto_tree_add_item(tree, hf_artnet_firmware_master_spare, tvb,
+                      offset, 20, FALSE );
+  
+  offset += 20;
+  
+  proto_tree_add_item(tree, hf_artnet_firmware_master_data, tvb,
+                      offset, 1024, FALSE );
+  
+  offset += 1024;
+  
+  return offset;  
+}
+
+static guint 
+dissect_artnet_firmware_reply(tvbuff_t *tvb, guint offset, proto_tree *tree) {
+  guint16 protver;
+  guint8 type;
+        
+  protver = tvb_get_ntohs(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_firmware_reply_protver, tvb,
+                      offset, 2, protver);
+  offset += 2;
+
+  proto_tree_add_item(tree, hf_artnet_firmware_reply_filler, tvb,
+                      offset, 2, FALSE);
+  offset += 2;
+  
+  type = tvb_get_guint8(tvb, offset);
+  proto_tree_add_uint(tree, hf_artnet_firmware_reply_type, tvb,
+                      offset, 1, type);
+  offset += 1;
+  
+  proto_tree_add_item(tree, hf_artnet_firmware_reply_spare, tvb,
+                      offset, 21, FALSE );
+  
+  offset += 21;
+
+  return offset;
+}
+
+static void 
+dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
+  gint offset = 0;
+  guint size;
+  guint16 opcode;
+  proto_tree *ti,*hi,*si,*artnet_tree=NULL,*artnet_header_tree=NULL;
+
+  /* Set the protocol column */
+  if(check_col(pinfo->cinfo,COL_PROTOCOL)){
+    col_set_str(pinfo->cinfo,COL_PROTOCOL,"ARTNET");
+  }
+
+  /* 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_artnet, tvb, offset, -1, FALSE); 
+    artnet_tree = proto_item_add_subtree(ti, ett_artnet);
+
+    hi = proto_tree_add_item(artnet_tree,
+                             hf_artnet_header,
+                             tvb,
+                             offset,
+                             ARTNET_HEADER_LENGTH ,
+                             FALSE);
+
+    artnet_header_tree = proto_item_add_subtree(hi, ett_artnet);
+  }
+
+  if (check_col(pinfo->cinfo, COL_INFO)) {
+    col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+                    tvb_get_ptr(tvb, offset, 8));
+  }
+  if( tree ){
+    proto_tree_add_item(artnet_header_tree, hf_artnet_header_id,
+                        tvb, offset, 8, FALSE);
+  }
+  offset += 8;
+
+  opcode = tvb_get_letohs(tvb, offset);
+  /* set the info column */
+  if (check_col(pinfo->cinfo, COL_INFO)) {
+    col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
+      val_to_str(opcode, artnet_opcode_vals, "Unknown (0x%04x)"));
+  }
+  
+  if( tree ){
+    proto_tree_add_uint(artnet_header_tree, hf_artnet_header_opcode, tvb,
+                        offset, 2, opcode);
+  }
+  offset += 2;
+
+  switch( opcode ) {
+    case ARTNET_OP_POLL:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_poll,
+                                 tvb,
+                                 offset,
+                                 ARTNET_POLL_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_poll( tvb, offset, si );
+        size -= offset;
+        
+        proto_item_set_len(si, size); 
+      }        
+      break;
+
+    case ARTNET_OP_POLL_REPLY:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_poll_reply,
+                                 tvb,
+                                 offset,
+                                 ARTNET_POLL_REPLY_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_poll_reply( tvb, offset, si);
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }        
+      break;
+
+    case ARTNET_OP_OUTPUT:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_output,
+                                 tvb,
+                                 offset,
+                                 ARTNET_OUTPUT_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_output( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }
+      break;
+
+    case ARTNET_OP_ADDRESS:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_address,
+                                 tvb,
+                                 offset,
+                                 ARTNET_POLL_REPLY_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_address( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }        
+      break;
+
+    case ARTNET_OP_INPUT:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_input,
+                                 tvb,
+                                 offset,
+                                 ARTNET_INPUT_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_input( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }      
+      break;
+
+    case ARTNET_OP_VIDEO_SETUP:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_input,
+                                 tvb,
+                                 offset,
+                                 ARTNET_VIDEO_SETUP_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_video_setup( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }      
+      break;
+
+    case ARTNET_OP_VIDEO_PALETTE:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_input,
+                                 tvb,
+                                 offset,
+                                 ARTNET_VIDEO_PALETTE_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_video_palette( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }      
+      break;
+    
+    case ARTNET_OP_VIDEO_DATA:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_input,
+                                 tvb,
+                                 offset,
+                                 ARTNET_VIDEO_DATA_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_video_data( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }      
+      break;
+
+    case ARTNET_OP_FIRMWARE_MASTER:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_firmware_master,
+                                 tvb,
+                                 offset,
+                                 ARTNET_FIRMWARE_MASTER_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_firmware_master( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }      
+      break;
+
+    case ARTNET_OP_FIRMWARE_REPLY:
+      if (tree) {
+        hi = proto_tree_add_item(artnet_tree,
+                                 hf_artnet_firmware_master,
+                                 tvb,
+                                 offset,
+                                 ARTNET_FIRMWARE_REPLY_LENGTH,
+                                 FALSE);
+
+        si = proto_item_add_subtree(hi, ett_artnet);
+        
+        size = dissect_artnet_firmware_reply( tvb, offset, si );
+        size -= offset;
+
+        proto_item_set_len(si, size); 
+      }      
+      break;
+      
+    default:
+      if (tree) {
+        proto_tree_add_text(artnet_tree, tvb, offset, -1,
+          "Data (%d bytes)", tvb_reported_length_remaining(tvb, offset));
+      }
+      break;
+  }
+}
+
+void 
+proto_register_artnet(void) {
+  static hf_register_info hf[] = {
+
+    /* header */
+    
+    { &hf_artnet_header,
+      { "Descriptor Header", 
+        "artnet.header",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET Descriptor Header", HFILL }},
+
+    { &hf_artnet_header_id,
+      { "ID",             
+        "artnet.header.id",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "ArtNET ID", HFILL }},
+
+    { &hf_artnet_header_opcode,
+      { "Opcode",             
+        "artnet.header.opcode",
+        FT_UINT16, BASE_HEX, VALS(artnet_opcode_vals), 0x0,
+        "ArtNET message type", HFILL }},
+   
+    /* ArtPoll */
+
+    { &hf_artnet_poll,
+      { "ArtPoll packet", 
+        "artnet.poll",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtPoll packet", HFILL }},
+
+    { &hf_artnet_poll_protver,
+      { "ProVer",             
+        "artnet.poll.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Protcol revision number", HFILL }},
+
+    { &hf_artnet_poll_talktome,
+      { "TalkToMe",             
+        "artnet.poll.talktome",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "TalkToMe", HFILL }},
+
+    { &hf_artnet_poll_pad,
+      { "Pad",             
+        "artnet.poll.pad",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "Filler byte", HFILL }},
+
+    /* ArtPollReply */
+
+    { &hf_artnet_poll_reply,
+      { "ArtPollReply packet", 
+        "artnet.poll_reply",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtPollReply packet", HFILL }},
+
+    { &hf_artnet_poll_reply_ip_address,
+      { "IP Address",             
+        "artnet.poll_reply.ip_address",
+        FT_IPv4, BASE_DEC, NULL, 0x0,
+        "IP Address", HFILL }},
+
+    { &hf_artnet_poll_reply_port_nr,
+      { "Port number",             
+        "artnet.poll_reply.port_nr",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Port Number", HFILL }},
+
+    { &hf_artnet_poll_reply_versinfo,
+      { "Version Info",             
+        "artnet.poll_reply.versinfo",
+        FT_UINT16, BASE_HEX, NULL, 0x0,
+        "Version info", HFILL }},
+
+    { &hf_artnet_poll_reply_subswitch,
+      { "SubSwitch",             
+        "artnet.poll_reply.subswitch",
+        FT_UINT16, BASE_HEX, NULL, 0x0,
+        "Subswitch version", HFILL }},
+
+    { &hf_artnet_poll_reply_oem,
+      { "Oem",             
+        "artnet.poll_reply.oem",
+        FT_UINT16, BASE_HEX, NULL, 0x0,
+        "OEM", HFILL }},
+
+    { &hf_artnet_poll_reply_ubea_version,
+      { "UBEA Version",             
+        "artnet.poll_reply.ubea_version",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "UBEA version number", HFILL }},
+        
+    { &hf_artnet_poll_reply_status,
+      { "Status",             
+        "artnet.poll_reply.status",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Status", HFILL }},
+
+    { &hf_artnet_poll_reply_esta_man,
+      { "ESTA Code",             
+        "artnet.poll_reply.esta_man",
+        FT_UINT16, BASE_HEX, NULL, 0x0,
+        "ESTA Code", HFILL }},
+
+    { &hf_artnet_poll_reply_short_name,
+      { "Short Name",             
+        "artnet.poll_reply.short_name",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "Short Name", HFILL }},
+
+    { &hf_artnet_poll_reply_long_name,
+      { "Long Name",             
+        "artnet.poll_reply.long_name",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "Long Name", HFILL }},
+
+    { &hf_artnet_poll_reply_node_report,
+      { "Node Report",             
+        "artnet.poll_reply.node_report",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "Node Report", HFILL }},
+
+    { &hf_artnet_poll_reply_port_info,
+      { "Port Info", 
+        "artnet.poll_reply.port_info",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Port Info", HFILL }},
+
+    { &hf_artnet_poll_reply_num_ports,
+      { "Number of Ports",             
+        "artnet.poll_reply.num_ports",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Number of Ports", HFILL }},
+
+    { &hf_artnet_poll_reply_port_types,
+      { "Port Types", 
+        "artnet.poll_reply.port_types",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Port Types", HFILL }},
+
+    { &hf_artnet_poll_reply_port_types_1,
+      { "Type of Port 1",             
+        "artnet.poll_reply.port_types_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Type of Port 1", HFILL }},
+
+    { &hf_artnet_poll_reply_port_types_2,
+      { "Type of Port 2",             
+        "artnet.poll_reply.port_types_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Type of Port 2", HFILL }},
+
+    { &hf_artnet_poll_reply_port_types_3,
+      { "Type of Port 3",             
+        "artnet.poll_reply.port_types_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Type of Port 3", HFILL }},
+
+    { &hf_artnet_poll_reply_port_types_4,
+      { "Type of Port 4",             
+        "artnet.poll_reply.port_types_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Type of Port 4", HFILL }},
+
+    { &hf_artnet_poll_reply_good_input,
+      { "Input Status", 
+        "artnet.poll_reply.good_input",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Input Status", HFILL }},
+
+    { &hf_artnet_poll_reply_good_input_1,
+      { "Input status of Port 1",             
+        "artnet.poll_reply.good_input_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input status of Port 1", HFILL }},
+
+    { &hf_artnet_poll_reply_good_input_2,
+      { "Input status of Port 2",             
+        "artnet.poll_reply.good_input_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input status of Port 2", HFILL }},
+
+    { &hf_artnet_poll_reply_good_input_3,
+      { "Input status of Port 3",             
+        "artnet.poll_reply.good_input_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input status of Port 3", HFILL }},
+
+    { &hf_artnet_poll_reply_good_input_4,
+      { "Input status of Port 4",             
+        "artnet.poll_reply.good_input_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input status of Port 4", HFILL }},
+
+    { &hf_artnet_poll_reply_good_output,
+      { "Output Status", 
+        "artnet.poll_reply.good_output",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Port output status", HFILL }},
+
+    { &hf_artnet_poll_reply_good_output_1,
+      { "Output status of Port 1",             
+        "artnet.poll_reply.good_output_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output status of Port 1", HFILL }},
+
+    { &hf_artnet_poll_reply_good_output_2,
+      { "Output status of Port 2",             
+        "artnet.poll_reply.good_output_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output status of Port 2", HFILL }},
+
+    { &hf_artnet_poll_reply_good_output_3,
+      { "Output status of Port 3",             
+        "artnet.poll_reply.good_output_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output status of Port 3", HFILL }},
+
+    { &hf_artnet_poll_reply_good_output_4,
+      { "Output status of Port 4",             
+        "artnet.poll_reply.good_output_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Outpus status of Port 4", HFILL }},
+
+    { &hf_artnet_poll_reply_swin,
+      { "Input Subswitch", 
+        "artnet.poll_reply.swin",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Input Subswitch", HFILL }},
+
+    { &hf_artnet_poll_reply_swin_1,
+      { "Input Subswitch of Port 1",             
+        "artnet.poll_reply.swin_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 1", HFILL }},
+
+    { &hf_artnet_poll_reply_swin_2,
+      { "Input Subswitch of Port 2",             
+        "artnet.poll_reply.swin_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 2", HFILL }},
+
+    { &hf_artnet_poll_reply_swin_3,
+      { "Input Subswitch of Port 3",             
+        "artnet.poll_reply.swin_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 3", HFILL }},
+
+    { &hf_artnet_poll_reply_swin_4,
+      { "Input Subswitch of Port 4",             
+        "artnet.poll_reply.swin_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 4", HFILL }},
+
+    { &hf_artnet_poll_reply_swout,
+      { "Output Subswitch", 
+        "artnet.poll_reply.swout",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Output Subswitch", HFILL }},
+
+    { &hf_artnet_poll_reply_swout_1,
+      { "Output Subswitch of Port 1",             
+        "artnet.poll_reply.swout_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output Subswitch of Port 1", HFILL }},
+
+    { &hf_artnet_poll_reply_swout_2,
+      { "Output Subswitch of Port 2",             
+        "artnet.poll_reply.swout_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output Subswitch of Port 2", HFILL }},
+
+    { &hf_artnet_poll_reply_swout_3,
+      { "Output Subswitch of Port 3",             
+        "artnet.poll_reply.swout_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output Subswitch of Port 3", HFILL }},
+
+    { &hf_artnet_poll_reply_swout_4,
+      { "Output Subswitch of Port 4",             
+        "artnet.poll_reply.swout_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Ouput Subswitch of Port 4", HFILL }},
+
+    { &hf_artnet_poll_reply_swvideo,
+      { "SwVideo",             
+        "artnet.poll_reply.swvideo",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "SwVideo", HFILL }},
+
+    { &hf_artnet_poll_reply_swmacro,
+      { "SwMacro",             
+        "artnet.poll_reply.swmacro",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "SwMacro", HFILL }},
+
+    { &hf_artnet_poll_reply_swremote,
+      { "SwRemote",             
+        "artnet.poll_reply.swremote",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "SwRemote", HFILL }},
+
+    { &hf_artnet_poll_reply_spare,
+      { "spare",             
+        "artnet.poll_reply.spare",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "spare", HFILL }},
+        
+    { &hf_artnet_poll_reply_mac,
+      { "MAC",             
+        "artnet.poll_reply.mac",
+        FT_ETHER, BASE_HEX, NULL, 0x0,
+        "MAC", HFILL }},
+        
+    /* ArtOutput */
+
+    { &hf_artnet_output,
+      { "ArtDMX packet", 
+        "artnet.output",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtDMX packet", HFILL }},
+
+    { &hf_artnet_output_protver,
+      { "ProVers",             
+        "artnet.output.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+        
+    { &hf_artnet_output_sequence,
+      { "Sequence",             
+        "artnet.output.sequence",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "Sequence", HFILL }},
+        
+    { &hf_artnet_output_physical,
+      { "Physical",             
+        "artnet.output.physical",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "Physical", HFILL }},
+        
+    { &hf_artnet_output_universe,
+      { "Universe",             
+        "artnet.output.universe",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Universe", HFILL }},
+        
+    { &hf_artnet_output_length,
+      { "Length",             
+        "artnet.output.length",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Length", HFILL }},
+        
+    { &hf_artnet_output_data,
+      { "DMX data",             
+        "artnet.output.data",
+        FT_BYTES, BASE_DEC, NULL, 0x0,
+        "DMX Data", HFILL }},
+                
+    /* ArtAddress */
+
+    { &hf_artnet_address,
+      { "ArtAddress packet", 
+        "artnet.address",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtAddress packet", HFILL }},
+
+    { &hf_artnet_address_protver,
+      { "ProVers",             
+        "artnet.address.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_address_filler,
+      { "filler",             
+        "artnet.address.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+
+    { &hf_artnet_address_short_name,
+      { "Short Name",             
+        "artnet.address.short_name",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "Short Name", HFILL }},
+
+    { &hf_artnet_address_long_name,
+      { "Long Name",             
+        "artnet.address.long_name",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "Long Name", HFILL }},
+        
+    { &hf_artnet_address_swin,
+      { "Input Subswitch", 
+        "artnet.address.swin",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Input Subswitch", HFILL }},
+
+    { &hf_artnet_address_swin_1,
+      { "Input Subswitch of Port 1", 
+        "artnet.address.swin_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 1", HFILL }},
+
+    { &hf_artnet_address_swin_2,
+      { "Input Subswitch of Port 2", 
+        "artnet.address.swin_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 2", HFILL }},
+
+    { &hf_artnet_address_swin_3,
+      { "Input Subswitch of Port 3",             
+        "artnet.address.swin_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 3", HFILL }},
+
+    { &hf_artnet_address_swin_4,
+      { "Input Subswitch of Port 4",             
+        "artnet.address.swin_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Input Subswitch of Port 4", HFILL }},
+
+    { &hf_artnet_address_swout,
+      { "Output Subswitch", 
+        "artnet.address.swout",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Output Subswitch", HFILL }},
+
+    { &hf_artnet_address_swout_1,
+      { "Output Subswitch of Port 1", 
+        "artnet.address.swout_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output Subswitch of Port 1", HFILL }},
+
+    { &hf_artnet_address_swout_2,
+      { "Output Subswitch of Port 2",             
+        "artnet.address.swout_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output Subswitch of Port 2", HFILL }},
+
+    { &hf_artnet_address_swout_3,
+      { "Output Subswitch of Port 3",             
+        "artnet.address.swout_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Output Subswitch of Port 3", HFILL }},
+
+    { &hf_artnet_address_swout_4,
+      { "Output Subswitch of Port 4",             
+        "artnet.address.swout_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Ouput Subswitch of Port 4", HFILL }},
+
+    { &hf_artnet_address_subswitch,
+      { "Subswitch",             
+        "artnet.address.subswitch",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Subswitch", HFILL }},
+
+    { &hf_artnet_address_swvideo,
+      { "SwVideo",             
+        "artnet.address.swvideo",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "SwVideo", HFILL }},
+
+    { &hf_artnet_address_command,
+      { "Command",             
+        "artnet.address.command",
+        FT_UINT8, BASE_HEX, VALS(artnet_address_command_vals), 0x0,
+        "Command", HFILL }},
+
+    /* ArtInput */
+
+    { &hf_artnet_input,
+      { "ArtInput packet", 
+        "artnet.input",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtInput packet", HFILL }},
+
+    { &hf_artnet_input_protver,
+      { "ProVers",             
+        "artnet.input.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_input_filler,
+      { "filler",             
+        "artnet.input.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+        
+    { &hf_artnet_input_num_ports,
+      { "Number of Ports",             
+        "artnet.input.num_ports",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "Number of Ports", HFILL }},
+
+    { &hf_artnet_input_input,
+      { "Port Status", 
+        "artnet.input.input",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "Port Status", HFILL }},
+
+    { &hf_artnet_input_input_1,
+      { "Status of Port 1",
+        "artnet.input.input_1",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Status of Port 1", HFILL }},
+
+    { &hf_artnet_input_input_2,
+      { "Status of Port 2",
+        "artnet.input.input_2",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Status of Port 2", HFILL }},
+
+    { &hf_artnet_input_input_3,
+      { "Status of Port 3",
+        "artnet.input.input_3",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Status of Port 3", HFILL }},
+
+    { &hf_artnet_input_input_4,
+      { "Status of Port 4",
+        "artnet.input.input_4",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "Status of Port 4", HFILL }},
+        
+    /* ArtFirmwareMaster */
+
+    { &hf_artnet_firmware_master,
+      { "ArtFirmwareMaster packet", 
+        "artnet.firmware_master",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtFirmwareMaster packet", HFILL }},
+
+    { &hf_artnet_firmware_master_protver,
+      { "ProVers",             
+        "artnet.firmware_master.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_firmware_master_filler,
+      { "filler",             
+        "artnet.firmware_master.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+        
+    { &hf_artnet_firmware_master_type,
+      { "Type",             
+        "artnet.firmware_master.type",
+        FT_UINT8, BASE_HEX, VALS(artnet_firmware_master_type_vals), 0x0,
+        "Number of Ports", HFILL }},
+        
+    { &hf_artnet_firmware_master_block_id,
+      { "Block ID",             
+        "artnet.firmware_master.block_id",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "Block ID", HFILL }},
+        
+    { &hf_artnet_firmware_master_length,
+      { "Lentgh",             
+        "artnet.firmware_master.length",
+        FT_UINT32, BASE_DEC, NULL, 0x0,
+        "Length", HFILL }},
+        
+    { &hf_artnet_firmware_master_spare,
+      { "spare",             
+        "artnet.firmware_master.spare",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "spare", HFILL }},
+        
+    { &hf_artnet_firmware_master_data,
+      { "data",             
+        "artnet.firmware_master.data",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "data", HFILL }},
+        
+    /* ArtFirmwareReply */
+
+    { &hf_artnet_firmware_reply,
+      { "ArtFirmwareReply packet", 
+        "artnet.firmware_reply",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtFirmwareReply packet", HFILL }},
+
+    { &hf_artnet_firmware_reply_protver,
+      { "ProVers",             
+        "artnet.firmware_reply.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_firmware_reply_filler,
+      { "filler",             
+        "artnet.firmware_reply.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+        
+    { &hf_artnet_firmware_reply_type,
+      { "Type",             
+        "artnet.firmware_reply.type",
+        FT_UINT8, BASE_HEX, VALS(artnet_firmware_reply_type_vals), 0x0,
+        "Number of Ports", HFILL }},
+
+    { &hf_artnet_firmware_reply_spare,
+      { "spare",             
+        "artnet.firmware_reply.spare",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "spare", HFILL }},
+             
+    /* ArtVideoSetup */
+
+    { &hf_artnet_video_setup,
+      { "ArtVideoSetup packet", 
+        "artnet.video_setup",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtVideoSetup packet", HFILL }},
+
+    { &hf_artnet_video_setup_protver,
+      { "ProVers",             
+        "artnet.video_setup.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_video_setup_filler,
+      { "filler",             
+        "artnet.video_setup.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+
+    { &hf_artnet_video_setup_control,
+      { "control",             
+        "artnet.video_setup.control",
+        FT_UINT8, BASE_HEX, NULL, 0x0,
+        "control", HFILL }},
+
+    { &hf_artnet_video_setup_font_height,
+      { "Font Height",             
+        "artnet.video_setup.font_height",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "Font Height", HFILL }},
+
+    { &hf_artnet_video_setup_first_font,
+      { "First Font",             
+        "artnet.video_setup.first_font",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "First Font", HFILL }},
+
+    { &hf_artnet_video_setup_last_font,
+      { "Last Font",             
+        "artnet.video_setup.last_font",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "Last Font", HFILL }},
+
+    { &hf_artnet_video_setup_win_font_name,
+      { "Windows Font Name",             
+        "artnet.video_setup.win_font_name",
+        FT_STRING, BASE_DEC, NULL, 0x0,
+        "Windows Font Name", HFILL }},
+
+    { &hf_artnet_video_setup_font_data,
+      { "Font data",             
+        "artnet.video_setup.font_data",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "Font Date", HFILL }},
+
+    /* ArtVideoPalette */
+
+    { &hf_artnet_video_palette,
+      { "ArtVideoPalette packet", 
+        "artnet.video_palette",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtVideoPalette packet", HFILL }},
+
+    { &hf_artnet_video_palette_protver,
+      { "ProVers",             
+        "artnet.video_palette.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_video_palette_filler,
+      { "filler",             
+        "artnet.video_palette.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+
+    { &hf_artnet_video_palette_colour_red,
+      { "Colour Red",             
+        "artnet.video_palette.colour_red",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "Colour Red", HFILL }},
+
+    { &hf_artnet_video_palette_colour_green,
+      { "Colour Green",             
+        "artnet.video_palette.colour_green",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "Colour Green", HFILL }},
+
+    { &hf_artnet_video_palette_colour_blue,
+      { "Colour Blue",             
+        "artnet.video_palette.colour_blue",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "Colour Blue", HFILL }},
+
+    /* ArtVideoData */
+
+    { &hf_artnet_video_data,
+      { "ArtVideoData packet", 
+        "artnet.video_data",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "ArtNET ArtVideoData packet", HFILL }},
+
+    { &hf_artnet_video_data_protver,
+      { "ProVers",             
+        "artnet.video_data.protver",
+        FT_UINT16, BASE_DEC, NULL, 0x0,
+        "ProtVers", HFILL }},
+
+    { &hf_artnet_video_data_filler,
+      { "filler",             
+        "artnet.video_data.filler",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "filler", HFILL }},
+
+    { &hf_artnet_video_data_pos_x,
+      { "PosX",             
+        "artnet.video_data.pos_x",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "PosX", HFILL }},
+        
+    { &hf_artnet_video_data_pos_y,
+      { "PosY",             
+        "artnet.video_data.pos_y",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "PosY", HFILL }},
+
+    { &hf_artnet_video_data_len_x,
+      { "LenX",             
+        "artnet.video_data.len_x",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "LenX", HFILL }},
+
+    { &hf_artnet_video_data_len_y,
+      { "LenY",             
+        "artnet.video_data.len_y",
+        FT_UINT8, BASE_DEC, NULL, 0x0,
+        "LenY", HFILL }},
+
+    { &hf_artnet_video_data_data,
+      { "Video Data",             
+        "artnet.video_data.data",
+        FT_BYTES, BASE_HEX, NULL, 0x0,
+        "Video Data", HFILL }}
+  };
+
+  static gint *ett[] = {
+    &ett_artnet,
+  };
+
+  module_t *artnet_module;
+
+  proto_artnet = proto_register_protocol("ArtNET",
+                                      "ARTNET","artnet");
+  proto_register_field_array(proto_artnet,hf,array_length(hf));
+  proto_register_subtree_array(ett,array_length(ett));
+
+  artnet_module = prefs_register_protocol(proto_artnet,
+                                       proto_reg_handoff_artnet);
+  prefs_register_uint_preference(artnet_module, "udp_port",
+                                "ARTNET UDP Port",
+                                "The UDP port on which "
+                                "ArtNET "
+                                "packets will be sent",
+                                10,&global_udp_port_artnet);
+
+}
+
+/* The registration hand-off routing */
+
+void
+proto_reg_handoff_artnet(void) {
+  static int artnet_initialized = FALSE;
+  static dissector_handle_t artnet_handle;
+
+  ip_handle = find_dissector("ip");
+
+  if(!artnet_initialized) {
+    artnet_handle = create_dissector_handle(dissect_artnet,proto_artnet);
+    artnet_initialized = TRUE;
+  } else {
+    dissector_delete("udp.port",udp_port_artnet,artnet_handle);
+  }
+
+  udp_port_artnet = global_udp_port_artnet;
+  
+  dissector_add("udp.port",global_udp_port_artnet,artnet_handle);
+}
+
+/* Start the functions we need for the plugin stuff */
+
+#ifndef __ETHEREAL_STATIC__
+
+G_MODULE_EXPORT void
+plugin_reg_handoff(void){
+  proto_reg_handoff_artnet();
+}
+
+G_MODULE_EXPORT void
+plugin_init(plugin_address_table_t *pat
+#ifndef PLUGINS_NEED_ADDRESS_TABLE
+_U_
+#endif
+){
+  /* initialise the table of pointers needed in Win32 DLLs */
+  plugin_address_table_init(pat);
+  /* register the new protocol, protocol fields, and subtrees */
+  if (proto_artnet == -1) { /* execute protocol initialization only once */
+    proto_register_artnet();
+  }
+}
+
+#endif
+
+/* End the functions we need for plugin stuff */
+
diff --git a/prefs.c b/prefs.c
index 04ed71c80956733656c1b0ea3291b5450ea0d549..9b26b784dc3889dade4286341e5e9e41e93bc0f6 100644 (file)
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
 /* prefs.c
  * Routines for handling preferences
  *
- * $Id: prefs.c,v 1.99 2003/04/09 08:43:53 guy Exp $
+ * $Id: prefs.c,v 1.100 2003/04/21 21:28:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1657,6 +1657,10 @@ set_pref(gchar *pref_name, gchar *value)
         /* Handle old names for PCLI preferences. */
         if (strcmp(dotp, "pcli.udp_port") == 0)
           pref = find_preference(module, "udp_port");
+      } else if (strcmp(module->name, "artnet") == 0) {
+        /* Handle old names for ARTNET preferences. */
+        if (strcmp(dotp, "artnet.udp_port") == 0)
+          pref = find_preference(module, "udp_port");
       } else if (strcmp(module->name, "mapi") == 0) {
         /* Handle old names for MAPI preferences. */
         if (strcmp(dotp, "mapi_decrypt") == 0)