Wireshark · Wireshark-dev: [Wireshark-dev] [Fwd: [Patch]Allow filtering on protocols within PPP multiplexed sub-frames]

["Donald White" <donald_white@xxxxxxxxx>]

I have seen no comments on this.  Are there any?

Thanks,

Don

-------- Original Message --------
Subject: [Wireshark-dev][Patch]Allow filtering on protocols within PPP 
multiplexed sub-frames
Date: Wed, 06 Sep 2006 20:57:58 -0700
From: Donald White <donald_white@xxxxxxxxx>
To: wireshark-dev@xxxxxxxxxxxxx

The attached patch is an enhancement to the PPP multiplexing protocol
dissector in protocol-ppp.c.  There are two changes:

     The protocol id field of the multiplexed sub-frame is added
     to the protocol tree using a header field.  This allows
     filters to select the protocol as is the case when it is not
     multiplexed.

     When the protocol id of the subframe is not present, the
     appropriate default protocol is displayed with the standard
     indication that Wireshark generated the value.

Thanks,

Don

Index: packet-ppp.c
===================================================================
--- packet-ppp.c	(revision 19137)
+++ packet-ppp.c	(working copy)
@@ -131,6 +132,7 @@
 static gint ett_pppmuxcp_options = -1;
 
 static int proto_pppmux = -1;
+static int hf_pppmux_protocol = -1;
 
 static gint ett_pppmux = -1;
 static gint ett_pppmux_subframe = -1;
@@ -3039,10 +3055,13 @@
 
       ti = proto_tree_add_text(hdr_tree,tvb,offset,length_field,"Sub-frame Length = %u",length);
 
-      if (flags & PPPMUX_PFF_BIT_SET)
-	proto_tree_add_text(hdr_tree,tvb,offset + length_field,pid_field,"%s: %s(0x%02x)",
-			    "Protocol ID",val_to_str(pid,ppp_vals,"Unknown"), pid);
+      ti = proto_tree_add_uint(hdr_tree,hf_pppmux_protocol,tvb,offset + length_field,pid_field, pid);
 
+      /* if protocol is not present in the sub-frame */
+      if (!(flags & PPPMUX_PFF_BIT_SET))
+	/* mark this item as generated */
+ 	PROTO_ITEM_SET_GENERATED(ti);
+
       offset += hdr_length;
       length_remaining -= hdr_length;
       length -= pid_field;
@@ -4290,6 +4566,14 @@
 void
 proto_register_pppmux(void)
 {
+  static hf_register_info hf[] =
+  {
+    { &hf_pppmux_protocol,
+      { "Protocol", "ppp.protocol", FT_UINT16, BASE_HEX,
+        VALS(ppp_vals), 0x0, 
+        "The protocol of the sub-frame.", HFILL }},
+  };
+	
   static gint *ett[] = {
     &ett_pppmux,
     &ett_pppmux_subframe,
@@ -4301,6 +4585,7 @@
   proto_pppmux = proto_register_protocol("PPP Multiplexing",
 				       "PPP PPPMux",
 				      "pppmux");
+  proto_register_field_array(proto_pppmux, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }