Wireshark-dev: [Wireshark-dev] redback dissector update vs current svn

From: Florian Lohoff <flo@xxxxxxxxxx>
Date: Wed, 6 Sep 2006 13:49:49 +0200

Hi,
after using the redback dissector again i found some more protocol
types:

Index: epan/dissectors/packet-redback.c
===================================================================
--- epan/dissectors/packet-redback.c	(revision 19163)
+++ epan/dissectors/packet-redback.c	(working copy)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@xxxxxxxxxxxxx>
  *
  * Start of RedBack SE400/800 tcpdump trace disassembly
- * Copyright 2005 Florian Lohoff <flo@xxxxxxxxxx>
+ * Copyright 2005,2006 Florian Lohoff <flo@xxxxxxxxxx>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -66,7 +66,7 @@
 
   ti = proto_tree_add_text(tree, tvb, 0, length, "Redback");
 
-  subtree = proto_item_add_subtree(ti, ett_redback);  
+  subtree = proto_item_add_subtree(ti, ett_redback);
   tisub = proto_tree_add_text (subtree, tvb, 0, 4,
                             "Context: 0x%08x", context);
   tisub = proto_tree_add_text (subtree, tvb, 4, 4,
@@ -85,7 +85,7 @@
 
   /* Mark the gap as "Data" for now */
   if (dataoff > l3off) {
-	proto_tree_add_text (subtree, tvb, 24, l3off-24, "Data");	
+	proto_tree_add_text (subtree, tvb, 24, l3off-24, "Data (%d bytes)", l3off-24);
   }
 
   /*
@@ -112,13 +112,14 @@
 	 */
         call_dissector(clnp_handle, next_tvb, pinfo, tree);
         break;
-      case 0x04:
-	/* ARP - Always eth header in front */
+      case 0x03: /* Unicast Ethernet tx - Seen with PPPoE PADO */
+      case 0x04: /* Unicast Ethernet rx - Seen with ARP  */
+      case 0x08: /* Broadcast Ethernet rx - Seen with PPPoE PADI */
         call_dissector(eth_handle, next_tvb, pinfo, tree);
         break;
       default:
-	tisub = proto_tree_add_text (subtree, tvb, 24, length-24, 
-				"Unknown Protocol %u", proto);
+	tisub = proto_tree_add_text (subtree, tvb, 24, length-24,
+				"Unknown Protocol Data %u", proto);
         break;
     }
   }



-- 
Florian Lohoff                  flo@xxxxxxxxxx             +49-171-2280134
                        Heisenberg may have been here.

Attachment: signature.asc
Description: Digital signature