Add a "profiles" directory. Add a Bluetooth global profile with the

current default+Bluetooth colors and a Classic global profile with the
old 1.8 colors. Remove the Bluetooth rules from the default profile.

svn path=/trunk/; revision=49116

diff --git a/colorfilters b/colorfilters
index 18b5f2b8cfe674c32eb383faa0ff807ece69c2f2..8ff8df6d5aeb36d1ae8a3bc584a18ca87ca85e33 100644 (file)
--- a/colorfilters
+++ b/colorfilters
@@ -19,27 +19,3 @@
 @TCP@tcp@[59345,58980,65535][4718,10030,11796]
 @UDP@udp@[56026,61166,65535][4718,10030,11796]
 @Broadcast@eth[0] & 1@[65535,65535,65535][47802,48573,46774]
-
-# Bluetooth
-# For Bluetooth each color is assigned to dissector,
-# but higher position on that list is needed for meet encapsulation
-# requirements, for example AVRCP is on top of AVCTP,
-# AVCTP is on top of L2CAP, etc.
-@AVRCP@btavrcp@[42408,33825,25486][5111,4915,4652]
-@AVCTP@btavctp@[52805,45039,37599][5111,4915,4652]
-@HCRP@bthcrp@[38416,38416,38416][5111,4915,4652]
-@BNEP@btbnep@[46590,24119,49858][5111,4915,4652]
-@HID@bthid@[47057,38562,38562][5111,4915,4652]
-@OBEX@btobex@[15856,45391,43152][5111,4915,4652]
-@SAP@btsap@[51110,54321,18857][5111,4915,4652]
-@HFP@bthfp@[57840,49413,65535][5111,4915,4652]
-@DUN@btdun@[54914,48086,52739][7995,7208,6946]
-@GNSS@btgnss@[65535,56858,42421][7995,7208,6946]
-@RFCOMM@btrfcomm@[64249,44202,25136][5111,4915,4652]
-@MCAP@btmcap@[62194,62965,53970][5111,4915,4652]
-@SDP@btsdp@[34255,42642,22057][5111,4915,4652]
-@ATT@btatt@[35252,51463,40197][7995,7208,6946]
-@L2CAP@btl2cap@[58215,49541,23520][4718,10030,11796]
-@SCO@bthci_sco@[65535,28803,61093][5111,4915,4652]
-@HCI_EVT@bthci_evt@[47126,60905,65535][5111,4915,4652]
-@HCI_CMD@bthci_cmd@[18901,48590,65535][4718,10030,11796]

diff --git a/profiles/Bluetooth/colorfilters b/profiles/Bluetooth/colorfilters
new file mode 100644 (file)
index 0000000..18b5f2b
--- /dev/null
+++ b/profiles/Bluetooth/colorfilters
@@ -0,0 +1,45 @@
+# DO NOT EDIT THIS FILE!  It was created by Wireshark
+@Bad TCP@tcp.analysis.flags && !tcp.analysis.window_update@[4718,10030,11796][63479,34695,34695]
+@HSRP State Change@hsrp.state != 8 && hsrp.state != 16@[4718,10030,11796][65535,64764,40092]
+@Spanning Tree Topology  Change@stp.type == 0x80@[4718,10030,11796][65535,64764,40092]
+@OSPF State Change@ospf.msg != 1@[4718,10030,11796][65535,64764,40092]
+@ICMP errors@icmp.type eq 3 || icmp.type eq 4 || icmp.type eq 5 || icmp.type eq 11 || icmpv6.type eq 1 || icmpv6.type eq 2 || icmpv6.type eq 3 || icmpv6.type eq 4@[4718,10030,11796][47031,63479,29812]
+@ARP@arp@[64250,61680,55255][4718,10030,11796]
+@ICMP@icmp || icmpv6@[64764,57568,65535][4718,10030,11796]
+@TCP RST@tcp.flags.reset eq 1@[42148,0,0][65535,64764,40092]
+@SCTP ABORT@sctp.chunk_type eq ABORT@[42148,0,0][65535,64764,40092]
+@TTL low or unexpected@( ! ip.dst == 224.0.0.0/4 && ip.ttl < 5 && !pim) || (ip.dst == 224.0.0.0/24 && ip.ttl != 1)@[42148,0,0][60652,61680,60395]
+@Checksum Errors@eth.fcs_bad==1 || ip.checksum_bad==1 || tcp.checksum_bad==1 || udp.checksum_bad==1 || sctp.checksum_bad==1 || mstp.checksum_bad==1 || cdp.checksum_bad==1 || edp.checksum_bad==1 || wlan.fcs_bad==1@[4718,10030,11796][63479,34695,34695]
+@SMB@smb || nbss || nbns || nbipx || ipxsap || netbios@[65278,65535,53456][4718,10030,11796]
+@HTTP@http || tcp.port == 80@[58596,65535,51143][4718,10030,11796]
+@IPX@ipx || spx@[65534,58325,58808][4718,10030,11796]
+@DCERPC@dcerpc@[51199,38706,65533][4718,10030,11796]
+@Routing@hsrp || eigrp || ospf || bgp || cdp || vrrp || gvrp || igmp || ismp@[65534,62325,54808][4718,10030,11796]
+@TCP SYN/FIN@tcp.flags & 0x02 || tcp.flags.fin == 1@[41026,41026,41026][4718,10030,11796]
+@TCP@tcp@[59345,58980,65535][4718,10030,11796]
+@UDP@udp@[56026,61166,65535][4718,10030,11796]
+@Broadcast@eth[0] & 1@[65535,65535,65535][47802,48573,46774]
+
+# Bluetooth
+# For Bluetooth each color is assigned to dissector,
+# but higher position on that list is needed for meet encapsulation
+# requirements, for example AVRCP is on top of AVCTP,
+# AVCTP is on top of L2CAP, etc.
+@AVRCP@btavrcp@[42408,33825,25486][5111,4915,4652]
+@AVCTP@btavctp@[52805,45039,37599][5111,4915,4652]
+@HCRP@bthcrp@[38416,38416,38416][5111,4915,4652]
+@BNEP@btbnep@[46590,24119,49858][5111,4915,4652]
+@HID@bthid@[47057,38562,38562][5111,4915,4652]
+@OBEX@btobex@[15856,45391,43152][5111,4915,4652]
+@SAP@btsap@[51110,54321,18857][5111,4915,4652]
+@HFP@bthfp@[57840,49413,65535][5111,4915,4652]
+@DUN@btdun@[54914,48086,52739][7995,7208,6946]
+@GNSS@btgnss@[65535,56858,42421][7995,7208,6946]
+@RFCOMM@btrfcomm@[64249,44202,25136][5111,4915,4652]
+@MCAP@btmcap@[62194,62965,53970][5111,4915,4652]
+@SDP@btsdp@[34255,42642,22057][5111,4915,4652]
+@ATT@btatt@[35252,51463,40197][7995,7208,6946]
+@L2CAP@btl2cap@[58215,49541,23520][4718,10030,11796]
+@SCO@bthci_sco@[65535,28803,61093][5111,4915,4652]
+@HCI_EVT@bthci_evt@[47126,60905,65535][5111,4915,4652]
+@HCI_CMD@bthci_cmd@[18901,48590,65535][4718,10030,11796]

diff --git a/profiles/Classic/colorfilters b/profiles/Classic/colorfilters
new file mode 100644 (file)
index 0000000..649ab77
--- /dev/null
+++ b/profiles/Classic/colorfilters
@@ -0,0 +1,21 @@
+# DO NOT EDIT THIS FILE!  It was created by Wireshark
+@Bad TCP@tcp.analysis.flags && !tcp.analysis.window_update@[0,0,0][65535,24383,24383]
+@HSRP State Change@hsrp.state != 8 && hsrp.state != 16@[0,0,0][65535,63222,0]
+@Spanning Tree Topology  Change@stp.type == 0x80@[0,0,0][65535,63222,0]
+@OSPF State Change@ospf.msg != 1@[0,0,0][65535,63222,0]
+@ICMP errors@icmp.type eq 3 || icmp.type eq 4 || icmp.type eq 5 || icmp.type eq 11 || icmpv6.type eq 1 || icmpv6.type eq 2 || icmpv6.type eq 3 || icmpv6.type eq 4@[0,0,0][0,65535,3616]
+@ARP@arp@[55011,59486,65534][0,0,0]
+@ICMP@icmp || icmpv6@[49680,49737,65535][0,0,0]
+@TCP RST@tcp.flags.reset eq 1@[37008,0,0][65535,63121,32911]
+@SCTP ABORT@sctp.chunk_type eq ABORT@[37008,0,0][65535,63121,32911]
+@TTL low or unexpected@( ! ip.dst == 224.0.0.0/4 && ip.ttl < 5 && !pim) || (ip.dst == 224.0.0.0/24 && ip.ttl != 1)@[37008,0,0][65535,65535,65535]
+@Checksum Errors@cdp.checksum_bad==1 || edp.checksum_bad==1 || ip.checksum_bad==1 || tcp.checksum_bad==1 || udp.checksum_bad==1 || sctp.checksum_bad==1 || mstp.checksum_bad==1@[0,0,0][65535,24383,24383]
+@SMB@smb || nbss || nbns || nbipx || ipxsap || netbios@[65534,64008,39339][0,0,0]
+@HTTP@http || tcp.port == 80@[36107,65535,32590][0,0,0]
+@IPX@ipx || spx@[65534,58325,58808][0,0,0]
+@DCERPC@dcerpc@[51199,38706,65533][0,0,0]
+@Routing@hsrp || eigrp || ospf || bgp || cdp || vrrp || gvrp || igmp || ismp@[65534,62325,54808][0,0,0]
+@TCP SYN/FIN@tcp.flags & 0x02 || tcp.flags.fin == 1@[41026,41026,41026][0,0,0]
+@TCP@tcp@[59345,58980,65534][0,0,0]
+@UDP@udp@[28834,57427,65533][0,0,0]
+@Broadcast@eth[0] & 1@[65535,65535,65535][32768,32768,32768]