Wireshark · Ethereal-dev: [Ethereal-dev] RT-Net plugin bug fix

[Erwin Rol <mailinglists@xxxxxxxxxxxx>]

Hello all,

the attached patch has a bug fix for the RT-Net plugin. To fix the
problem I changed the ARP dissector so one can use
find_dissector("arp"). The patch also has a update for my new email
address.

- Erwin


Index: AUTHORS
===================================================================
RCS file: /cvsroot/ethereal/AUTHORS,v
retrieving revision 1.816
diff -u -r1.816 AUTHORS
--- AUTHORS	8 Aug 2003 22:48:59 -0000	1.816
+++ AUTHORS	16 Aug 2003 08:57:40 -0000
@@ -1687,7 +1687,7 @@
 	    codes for Modbus/TCP
 }
 
-Erwin Rol <erwin [AT] muffin.org> {
+Erwin Rol <erwin [AT] erwinrol.com> {
 	ArtNET support
 	RTNET support
 }
Index: packet-arp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-arp.c,v
retrieving revision 1.56
diff -u -r1.56 packet-arp.c
--- packet-arp.c	10 Feb 2003 21:13:13 -0000	1.56
+++ packet-arp.c	16 Aug 2003 08:57:44 -0000
@@ -988,6 +988,8 @@
   proto_register_subtree_array(ett, array_length(ett));
 
   atmarp_handle = create_dissector_handle(dissect_atmarp, proto_arp);
+
+  register_dissector( "arp" , dissect_arp, proto_arp );
 }
 
 void
@@ -995,10 +997,12 @@
 {
   dissector_handle_t arp_handle;
 
-  arp_handle = create_dissector_handle(dissect_arp, proto_arp);
+  arp_handle = find_dissector("arp");
+
   dissector_add("ethertype", ETHERTYPE_ARP, arp_handle);
   dissector_add("ethertype", ETHERTYPE_REVARP, arp_handle);
   dissector_add("arcnet.protocol_id", ARCNET_PROTO_ARP_1051, arp_handle);
   dissector_add("arcnet.protocol_id", ARCNET_PROTO_ARP_1201, arp_handle);
   dissector_add("arcnet.protocol_id", ARCNET_PROTO_RARP_1201, arp_handle);
+
 }
Index: plugins/artnet/AUTHORS
===================================================================
RCS file: /cvsroot/ethereal/plugins/artnet/AUTHORS,v
retrieving revision 1.1
diff -u -r1.1 AUTHORS
--- plugins/artnet/AUTHORS	21 Apr 2003 21:28:39 -0000	1.1
+++ plugins/artnet/AUTHORS	16 Aug 2003 08:57:49 -0000
@@ -1,3 +1,3 @@
 Author :
-Erwin Rol <erwin@xxxxxxxxxx>
+Erwin Rol <erwin@xxxxxxxxxxxx>
 
Index: plugins/artnet/packet-artnet.c
===================================================================
RCS file: /cvsroot/ethereal/plugins/artnet/packet-artnet.c,v
retrieving revision 1.1
diff -u -r1.1 packet-artnet.c
--- plugins/artnet/packet-artnet.c	21 Apr 2003 21:28:39 -0000	1.1
+++ plugins/artnet/packet-artnet.c	16 Aug 2003 08:58:10 -0000
@@ -3,7 +3,7 @@
  *
  * $Id: packet-artnet.c,v 1.1 2003/04/21 21:28:39 guy Exp $
  *
- * Copyright (c) 2003 by Erwin Rol <erwin@xxxxxxxxxx>
+ * Copyright (c) 2003 by Erwin Rol <erwin@xxxxxxxxxxxx>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@xxxxxxxxxxxx>
Index: plugins/rtnet/AUTHORS
===================================================================
RCS file: /cvsroot/ethereal/plugins/rtnet/AUTHORS,v
retrieving revision 1.1
diff -u -r1.1 AUTHORS
--- plugins/rtnet/AUTHORS	11 Jun 2003 09:17:03 -0000	1.1
+++ plugins/rtnet/AUTHORS	16 Aug 2003 08:58:11 -0000
@@ -1,3 +1,3 @@
 Author :
-Erwin Rol <erwin@xxxxxxxxxx>
+Erwin Rol <erwin@xxxxxxxxxxxx>
 
Index: plugins/rtnet/moduleinfo.h
===================================================================
RCS file: /cvsroot/ethereal/plugins/rtnet/moduleinfo.h,v
retrieving revision 1.1
diff -u -r1.1 moduleinfo.h
--- plugins/rtnet/moduleinfo.h	11 Jun 2003 09:17:03 -0000	1.1
+++ plugins/rtnet/moduleinfo.h	16 Aug 2003 08:58:11 -0000
@@ -13,5 +13,5 @@
 #endif
 
 /* Version number of package */
-#define VERSION "0.0.1"
+#define VERSION "0.0.2"
 
Index: plugins/rtnet/packet-rtnet.c
===================================================================
RCS file: /cvsroot/ethereal/plugins/rtnet/packet-rtnet.c,v
retrieving revision 1.2
diff -u -r1.2 packet-rtnet.c
--- plugins/rtnet/packet-rtnet.c	16 Jul 2003 02:07:18 -0000	1.2
+++ plugins/rtnet/packet-rtnet.c	16 Aug 2003 08:58:22 -0000
@@ -3,7 +3,7 @@
  *
  * $Id: packet-rtnet.c,v 1.2 2003/07/16 02:07:18 tpot Exp $
  *
- * Copyright (c) 2003 by Erwin Rol <erwin@xxxxxxxxxx>
+ * Copyright (c) 2003 by Erwin Rol <erwin@xxxxxxxxxxxx>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@xxxxxxxxxxxx>
@@ -448,7 +448,8 @@
       if (!next_tvb)
         next_tvb = tvb_new_subset(tvb, offset, -1, -1);
 
-      call_dissector(ip_handle, next_tvb, pinfo, tree);
+      if( tree )
+        call_dissector(ip_handle, next_tvb, pinfo, tree);
       
       break;
 
@@ -456,7 +457,8 @@
       if (!next_tvb)
         next_tvb = tvb_new_subset(tvb, offset, -1, -1);
 
-      call_dissector(arp_handle, next_tvb, pinfo, tree);
+      if( tree )
+        call_dissector(arp_handle, next_tvb, pinfo, tree);
 
       break;