summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-12-03 22:12:52 -0500
committerJeff Morriss <jeff.morriss.ws@gmail.com>2014-12-04 14:04:58 +0000
commitb2fcbb2ba291e4c1110ef251d4349f94d1aa2bf4 (patch)
tree33628848dd1175c967a238f80e76f9546fa3fd25
parenta919566091693a945ed441c9e1779232467171b1 (diff)
downloadwireshark-b2fcbb2ba291e4c1110ef251d4349f94d1aa2bf4.tar.gz
Add a MIME type for Tektronix rf5 files and register Wireshark for that type of
file. The magic matching comes from wiretap/k12.c. (Yes, I just made the application/x-tektronix-rf5 MIME type up.) Change-Id: Iafd7300aa7f2664bb06e1330caede10785c21d68 Reviewed-on: https://code.wireshark.org/review/5607 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
-rw-r--r--wireshark-mime-package.xml10
-rw-r--r--wireshark.desktop2
2 files changed, 11 insertions, 1 deletions
diff --git a/wireshark-mime-package.xml b/wireshark-mime-package.xml
index 46bdc5bd00..5056c3a594 100644
--- a/wireshark-mime-package.xml
+++ b/wireshark-mime-package.xml
@@ -126,4 +126,14 @@
<glob pattern="*.5vw"/>
<glob pattern="*.5vw.gz"/>
</mime-type>
+
+ <mime-type type="application/x-tektronix-rf5">
+ <comment>Packet Capture (Tektronix rf5)</comment>
+ <generic-icon name="application-wireshark-doc"/>
+ <magic>
+ <match type="string" offset="0" value="\x00\x00\x02\x00\x12\x05\x00\x10"/>
+ </magic>
+ <glob pattern="*.rf5"/>
+ <glob pattern="*.rf5.gz"/>
+ </mime-type>
</mime-info>
diff --git a/wireshark.desktop b/wireshark.desktop
index 81e87b79eb..c0d17b250e 100644
--- a/wireshark.desktop
+++ b/wireshark.desktop
@@ -105,7 +105,7 @@ Icon=wireshark
TryExec=wireshark
Exec=wireshark %f
Terminal=false
-MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;
+MimeType=application/vnd.tcpdump.pcap;application/x-pcapng;application/x-snoop;application/x-iptrace;application/x-lanalyzer;application/x-nettl;application/x-radcom;application/x-etherpeek;application/x-visualnetworks;application/x-netinstobserver;application/x-5view;application/x-tektronix-rf5;
# Category entry according to:
# http://standards.freedesktop.org/menu-spec/1.0/
Categories=System;Monitor;GTK;