Wireshark · Ethereal-dev: [Ethereal-dev] ArtNET plugin

[Erwin Rol <erwin@xxxxxxxxxx>]

Hello all,

attached i have a patch and a tar file ( which should be extracted in
the plugin directory ) with a new artnet plugin ( i didn't manage to get
"cvs diff" to include the new directory :-/ )

I hope they can be included into the next version of ethereal, if there
is something missing or if something else needs to be done for inclusion
let me know.

- Erwin


-- 
              Dipl.-Ing. Erwin Rol - Software Engineering
tel: +49-(0)8024-479377  gsm: +49-(0)171-6929198 fax: +49-(0)8024-479379
                        email: erwin@xxxxxxxxxx

? plugins/artnet
Index: Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/Makefile.am,v
retrieving revision 1.574
diff -u -b -B -d -r1.574 Makefile.am
--- Makefile.am	16 Apr 2003 07:24:03 -0000	1.574
+++ Makefile.am	20 Apr 2003 11:47:53 -0000
@@ -424,7 +424,8 @@
 	plugins/gryphon/gryphon.la \
 	plugins/megaco/megaco.la \
 	plugins/mgcp/mgcp.la \
-	plugins/pcli/pcli.la
+	plugins/pcli/pcli.la \
+	plugins/artnet/artnet.la
 
 if ENABLE_STATIC
 plugin_ldadd = \
@@ -456,7 +457,8 @@
 	plugins/gryphon/packet-gryphon-static.o \
 	plugins/megaco/packet-megaco-static.o \
 	plugins/mgcp/packet-mgcp-static.o \
-	plugins/pcli/packet-pcli-static.o
+	plugins/pcli/packet-pcli-static.o \
+	plugins/artnet/packet-artnet-static.o
 
 plugin_src = \
 	plugins/docsis/packet-bpkmattr.c \
@@ -487,7 +489,8 @@
 	plugins/gryphon/packet-gryphon.c \
 	plugins/megaco/packet-megaco.c \
 	plugins/mgcp/packet-mgcp.c \
-	plugins/pcli/packet-pcli.c
+	plugins/pcli/packet-pcli.c \
+	plugins/artnet/packet-artnet.c
 
 else		# ENABLE_STATIC
 plugin_ldadd = \
@@ -498,7 +501,8 @@
 	"-dlopen" plugins/gryphon/gryphon.la \
 	"-dlopen" plugins/megaco/megaco.la \
 	"-dlopen" plugins/mgcp/mgcp.la \
-	"-dlopen" plugins/pcli/pcli.la
+	"-dlopen" plugins/pcli/pcli.la \
+	"-dlopen" plugins/artnet/artnet.la
 
 plugin_src =
 
Index: configure.in
===================================================================
RCS file: /cvsroot/ethereal/configure.in,v
retrieving revision 1.203
diff -u -b -B -d -r1.203 configure.in
--- configure.in	25 Mar 2003 23:35:30 -0000	1.203
+++ configure.in	20 Apr 2003 11:47:55 -0000
@@ -771,6 +771,7 @@
   plugins/megaco/Makefile
   plugins/mgcp/Makefile
   plugins/pcli/Makefile
+  plugins/artnet/Makefile
   tools/Makefile
   tools/lemon/Makefile
   ,)
Index: prefs.c
===================================================================
RCS file: /cvsroot/ethereal/prefs.c,v
retrieving revision 1.99
diff -u -b -B -d -r1.99 prefs.c
--- prefs.c	9 Apr 2003 08:43:53 -0000	1.99
+++ prefs.c	20 Apr 2003 11:48:02 -0000
@@ -1657,6 +1657,10 @@
         /* 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)
Index: plugins/Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/plugins/Makefile.am,v
retrieving revision 1.13
diff -u -b -B -d -r1.13 Makefile.am
--- plugins/Makefile.am	14 Jan 2003 23:53:38 -0000	1.13
+++ plugins/Makefile.am	20 Apr 2003 11:48:03 -0000
@@ -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 = docsis giop gryphon megaco mgcp pcli artnet
 
 plugindir = @plugindir@
 
Index: plugins/Makefile.nmake
===================================================================
RCS file: /cvsroot/ethereal/plugins/Makefile.nmake,v
retrieving revision 1.16
diff -u -b -B -d -r1.16 Makefile.nmake
--- plugins/Makefile.nmake	14 Jan 2003 23:53:38 -0000	1.16
+++ plugins/Makefile.nmake	20 Apr 2003 11:48:03 -0000
@@ -13,7 +13,7 @@
 
 OBJECTS=plugin_api.obj 
 
-all: plugin_api.obj docsis giop gryphon megaco mgcp pcli
+all: plugin_api.obj docsis giop gryphon megaco mgcp pcli artnet
 
 docsis::
 	cd docsis
@@ -45,6 +45,11 @@
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
+artnet:: 
+	cd artnet
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+	cd ..
+
 clean:
 	rm -f plugin_api.obj $(PDB_FILE)
 	cd docsis
@@ -58,5 +63,7 @@
 	cd ../mgcp
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../pcli
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../artnet
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ..

Attachment: artnet.tgz
Description: GNU Zip compressed data

Attachment: signature.asc
Description: This is a digitally signed message part