osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Register a few more file extensions as belonging to Wireshark. 

Register Wireshark for PacketLogger, ERF, IPFIX, and VWR files on
freedesktop.org, OS X, and Windows (we were already registered for ERF and VWR
files on Windows).

Change-Id: I8105997cb15ea06e1c078489fd88763d4ce9e40c
Reviewed-on: https://code.wireshark.org/review/15635
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jeff Morriss 2016-05-30 21:45:18 -04:00 committed by Anders Broman
parent 16c91568bb
commit 162edec9ad
7 changed files with 143 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
packaging/macosx/Info.plist.in
View File

@ -55,10 +55,58 @@
<key>CFBundleTypeIconFile</key> <key>CFBundleTypeIconFile</key>
<string>Wiresharkdoc.icns</string> <string>Wiresharkdoc.icns</string>
<key>CFBundleTypeName</key> <key>CFBundleTypeName</key>
<string>Micropross mplog capture</string> <string>Micropross mplog Capture</string>
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>pklg</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>Wiresharkdoc.icns</string>
<key>CFBundleTypeName</key>
<string>OS X PacketLogger Capture</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>erf</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>Wiresharkdoc.icns</string>
<key>CFBundleTypeName</key>
<string>Endace ERF Capture</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>pfx</string>
<string>ipfix</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>Wiresharkdoc.icns</string>
<key>CFBundleTypeName</key>
<string>IPFIX Packet Capture</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>vwr</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>Wiresharkdoc.icns</string>
<key>CFBundleTypeName</key>
<string>Ixia IxVeriWave Packet Capture</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<!-- XXX - This dictionary needs a lot more entries --> <!-- XXX - This dictionary needs a lot more entries -->
</array> </array>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>

4
packaging/nsis/AdditionalTasksPage.ini
View File

@ -113,7 +113,7 @@ Left=10
Right=280 Right=280
Top=120 Top=120
Bottom=128 Bottom=128
Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, mplog, out, pcap, Text=Extensions: 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, mplog, out, pcap,
[Field 13] [Field 13]
Type=Label Type=Label
@ -121,5 +121,5 @@ Left=10
Right=280 Right=280
Top=130 Top=130
Bottom=138 Bottom=138
Text=pcapng, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz Text=pcapng, pfx, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, wpz

5
packaging/nsis/common.nsh
View File

@ -105,10 +105,14 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
Push ".snoop" Push ".snoop"
Push ".rf5" Push ".rf5"
Push ".pkt" Push ".pkt"
Push ".pklg"
Push ".pfx"
Push ".pcapng" Push ".pcapng"
Push ".pcap" Push ".pcap"
Push ".out" Push ".out"
Push ".ntar" Push ".ntar"
Push ".mplog"
Push ".ipfix"
Push ".fdc" Push ".fdc"
Push ".erf" Push ".erf"
Push ".enc" Push ".enc"
@ -118,7 +122,6 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
Push ".apc" Push ".apc"
Push ".acp" Push ".acp"
Push ".5vw" Push ".5vw"
Push ".mplog"
!macroend !macroend
!macro IsWiresharkRunning !macro IsWiresharkRunning

54
packaging/wix/ComponentGroups.wxi
View File

@ -636,6 +636,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition> <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component> </Component>
<Component Id="cmpFAipfix">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="ipfix">
<Extension Id="ipfix">
<Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
</Extension>
</ProgId>
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ipfix" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component>
<Component Id="cmpFAmplog"> <Component Id="cmpFAmplog">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog">
<Extension Id="mplog"> <Extension Id="mplog">
@ -654,6 +663,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition> <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component> </Component>
<Component Id="cmpFApfx">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pfx">
<Extension Id="pfx">
<Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
</Extension>
</ProgId>
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pfx" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component>
<Component Id="cmpFApcap"> <Component Id="cmpFApcap">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap">
<Extension Id="pcap"> <Extension Id="pcap">
@ -672,6 +690,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition> <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component> </Component>
<Component Id="cmpFApklg">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pklg">
<Extension Id="pklg">
<Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument="&quot;%1&quot;"/>
</Extension>
</ProgId>
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pklg" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition>
</Component>
<Component Id="cmpFApkt"> <Component Id="cmpFApkt">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt">
<Extension Id="pkt"> <Extension Id="pkt">
@ -859,6 +886,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component> </Component>
<Component Id="cmpFAipfixLegacy" Guid="00381091-977F-4F50-A2CC-BC1C2AACE81F">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="ipfix">
<Extension Id="ipfix">
<Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
</Extension>
</ProgId>
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="ipfix" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component>
<Component Id="cmpFAmplogLegacy" Guid="7AA152AB-1225-466E-8C33-2DF9E6C1CBCE"> <Component Id="cmpFAmplogLegacy" Guid="7AA152AB-1225-466E-8C33-2DF9E6C1CBCE">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog">
<Extension Id="mplog"> <Extension Id="mplog">
@ -877,6 +913,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component> </Component>
<Component Id="cmpFApfxLegacy" Guid="75E60C7A-758F-45C9-A9CF-6B87F3609229">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pfx">
<Extension Id="pfx">
<Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
</Extension>
</ProgId>
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pfx" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component>
<Component Id="cmpFApcapLegacy" Guid="B419D3B0-2ECA-4F56-A23B-56A9A3FAAB35"> <Component Id="cmpFApcapLegacy" Guid="B419D3B0-2ECA-4F56-A23B-56A9A3FAAB35">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap">
<Extension Id="pcap"> <Extension Id="pcap">
@ -895,6 +940,15 @@
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component> </Component>
<Component Id="cmpFApklgLegacy" Guid="3BF582A0-771E-4706-8414-975B24B4250B">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pklg">
<Extension Id="pklg">
<Verb Id="open" Command="open" TargetFile="filWiresharkGTK_exe" Argument="&quot;%1&quot;"/>
</Extension>
</ProgId>
<RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pklg" Type="integer" Value="1" KeyPath="yes"/>
<Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition>
</Component>
<Component Id="cmpFApktLegacy" Guid="3BF582A0-771E-4706-8414-975B24B4250B"> <Component Id="cmpFApktLegacy" Guid="3BF582A0-771E-4706-8414-975B24B4250B">
<ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt">
<Extension Id="pkt"> <Extension Id="pkt">

32
wireshark-mime-package.xml
View File

@ -165,7 +165,7 @@
</mime-type> </mime-type>
<mime-type type="application/x-micropross-mplog"> <mime-type type="application/x-micropross-mplog">
<comment>Packet Capture (mplog)</comment> <comment>Packet Capture (Micropross mplog)</comment>
<generic-icon name="application-wireshark-doc"/> <generic-icon name="application-wireshark-doc"/>
<magic> <magic>
<match type="string" offset="0" value="MPCSII"/> <match type="string" offset="0" value="MPCSII"/>
@ -173,4 +173,34 @@
<glob pattern="*.mplog"/> <glob pattern="*.mplog"/>
<glob pattern="*.mplog.gz"/> <glob pattern="*.mplog.gz"/>
</mime-type> </mime-type>
<mime-type type="application/x-apple-packetlogger">
<comment>Packet Capture (OS X PacketLogger)</comment>
<generic-icon name="application-wireshark-doc"/>
<glob pattern="*.pklg"/>
<glob pattern="*.pklg.gz"/>
</mime-type>
<mime-type type="application/x-endace-erf">
<comment>Packet Capture (Endace ERF)</comment>
<generic-icon name="application-wireshark-doc"/>
<glob pattern="*.erf"/>
<glob pattern="*.erf.gz"/>
</mime-type>
<mime-type type="application/ipfix">
<comment>Packet Capture (IPFIX)</comment>
<generic-icon name="application-wireshark-doc"/>
<glob pattern="*.pfx"/>
<glob pattern="*.ipfix"/>
<glob pattern="*.pfx.gz"/>
<glob pattern="*.ipfix.gz"/>
</mime-type>
<mime-type type="application/x-ixia-vwr">
<comment>Packet Capture (Ixia IxVeriWave)</comment>
<generic-icon name="application-wireshark-doc"/>
<glob pattern="*.vwr"/>
<glob pattern="*.vwr.gz"/>
</mime-type>
</mime-info> </mime-info>

2
wireshark.desktop
View File

@ -105,7 +105,7 @@ Icon=wireshark
TryExec=wireshark TryExec=wireshark
Exec=wireshark %f Exec=wireshark %f
Terminal=false 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;application/x-tektronix-rf5;application/x-micropross-mplog; 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;application/x-micropross-mplog;application/x-apple-packetlogger;application/x-endace-erf;application/ipfix;application/x-ixia-vwr;
# Category entry according to: # Category entry according to:
# http://standards.freedesktop.org/menu-spec/1.0/ # http://standards.freedesktop.org/menu-spec/1.0/
Categories=Network;Monitor;Qt; Categories=Network;Monitor;Qt;

4
wiretap/file_access.c
View File

@ -346,7 +346,7 @@ static struct open_info open_info_base[] = {
/* Gammu DCT3 trace must come before MIME files as it's XML based*/ /* Gammu DCT3 trace must come before MIME files as it's XML based*/
{ "Gammu DCT3 trace", OPEN_INFO_MAGIC, dct3trace_open, NULL, NULL, NULL }, { "Gammu DCT3 trace", OPEN_INFO_MAGIC, dct3trace_open, NULL, NULL, NULL },
{ "MIME Files Format", OPEN_INFO_MAGIC, mime_file_open, NULL, NULL, NULL }, { "MIME Files Format", OPEN_INFO_MAGIC, mime_file_open, NULL, NULL, NULL },
{ "Micropross mplog", OPEN_INFO_MAGIC, mplog_open, "mplog", NULL, NULL }, { "Micropross mplog", OPEN_INFO_MAGIC, mplog_open, "mplog", NULL, NULL },
{ "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL }, { "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL },
/* /*
* PacketLogger must come before MPEG, because its files * PacketLogger must come before MPEG, because its files
@ -399,7 +399,7 @@ static struct open_info open_info_base[] = {
/* this is only used to build the dynamic array on load, do NOT use this /* this is only used to build the dynamic array on load, do NOT use this
* for anything else, because the size of the actual array will change if * for anything else, because the size of the actual array will change if
* Lua scripts register a new file reader. * Lua scripts register a new file reader.
*/ */
#define N_OPEN_INFO_ROUTINES ((sizeof open_info_base / sizeof open_info_base[0])) #define N_OPEN_INFO_ROUTINES ((sizeof open_info_base / sizeof open_info_base[0]))