Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 71 insertions, 0 deletions

diff --git a/resources/share/wireshark/profiles/Bluetooth/colorfilters b/resources/share/wireshark/profiles/Bluetooth/colorfilters
new file mode 100644
index 0000000..3d58a6a
--- /dev/null
+++ b/resources/share/wireshark/profiles/Bluetooth/colorfilters
@@ -0,0 +1,52 @@
+# 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]
+@IPv4 TTL low or unexpected@(ip.dst != 224.0.0.0/4 && ip.ttl < 5 && !(pim || ospf || eigrp || bgp || tcp.port==179)) || (ip.dst == 224.0.0.0/24 && ip.dst != 224.0.0.251 && ip.ttl != 1 && !(vrrp || carp || eigrp || rip || glbp))@[42148,0,0][60652,61680,60395]
+@IPv6 hop limit low or unexpected@(ipv6.dst != ff00::/8 && ipv6.hlim < 5 && !( ospf|| bgp || tcp.port==179)) || (ipv6.dst==ff00::/8 && ipv6.hlim not in {1, 64, 255})@[42148,0,0][60652,61680,60395]
+@Checksum Errors@cdp.checksum.status=="Bad" || edp.checksum.status=="Bad" || ip.checksum.status=="Bad" || tcp.checksum.status=="Bad" || udp.checksum.status=="Bad"|| sctp.checksum.status=="Bad" || mstp.checksum.status=="Bad"@[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 || carp || 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]
+
+# 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]
+@VDP@btvdp@[64930,48878,57789][5111,4915,4652]
+@A2DP@bta2dp@[65535,55032,52260][5111,4915,4652]
+@AVDTP@btavdtp@[60726,32232,22916][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@obex@[15856,45391,43152][5111,4915,4652]
+@SAP@btsap@[51110,54321,18857][5111,4915,4652]
+@HFP@bthfp@[57840,49413,65535][5111,4915,4652]
+@HSP@bthsp@[52394,49749,56625][7995,7208,6946]
+@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]
+@AMP@btamp@[61646,61964,60015][7995,7208,6946]
+@SMP@btsmp@[55255,54741,5911][7967,7196,6939]
+@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/resources/share/wireshark/profiles/Bluetooth/preferences b/resources/share/wireshark/profiles/Bluetooth/preferences
new file mode 100644
index 0000000..d109541
--- /dev/null
+++ b/resources/share/wireshark/profiles/Bluetooth/preferences
@@ -0,0 +1,19 @@
+####### User Interface: Columns ########
+
+# Packet list column format
+# Each pair of strings consists of a column title and its format
+gui.column.format:
+	"No.", "%m",
+	"Time", "%Yt",
+	"Delta", "%Gt",
+	"Source", "%s",
+	"Destination", "%d",
+	"Protocol", "%p",
+	"Length", "%L",
+	"Info", "%i"
+
+####### User Interface: Layout ########
+
+# Layout type (1-6)
+# A decimal number
+gui.layout_type: 3