diff options
-rw-r--r-- | packaging/macosx/Info.plist.in | 50 | ||||
-rw-r--r-- | packaging/nsis/AdditionalTasksPage.ini | 4 | ||||
-rwxr-xr-x | packaging/nsis/common.nsh | 5 | ||||
-rw-r--r-- | packaging/wix/ComponentGroups.wxi | 54 | ||||
-rw-r--r-- | wireshark-mime-package.xml | 32 | ||||
-rw-r--r-- | wireshark.desktop | 2 | ||||
-rw-r--r-- | wiretap/file_access.c | 4 |
7 files changed, 143 insertions, 8 deletions
diff --git a/packaging/macosx/Info.plist.in b/packaging/macosx/Info.plist.in index f044c48ba0..456de01ba6 100644 --- a/packaging/macosx/Info.plist.in +++ b/packaging/macosx/Info.plist.in @@ -55,10 +55,58 @@ <key>CFBundleTypeIconFile</key> <string>Wiresharkdoc.icns</string> <key>CFBundleTypeName</key> - <string>Micropross mplog capture</string> + <string>Micropross mplog Capture</string> <key>CFBundleTypeRole</key> <string>Viewer</string> </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 --> </array> <key>CFBundleInfoDictionaryVersion</key> diff --git a/packaging/nsis/AdditionalTasksPage.ini b/packaging/nsis/AdditionalTasksPage.ini index 34ac014ef4..29e45db352 100644 --- a/packaging/nsis/AdditionalTasksPage.ini +++ b/packaging/nsis/AdditionalTasksPage.ini @@ -113,7 +113,7 @@ Left=10 Right=280 Top=120 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] Type=Label @@ -121,5 +121,5 @@ Left=10 Right=280 Top=130 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 diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh index d84434141e..3645022b26 100755 --- a/packaging/nsis/common.nsh +++ b/packaging/nsis/common.nsh @@ -105,10 +105,14 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".snoop" Push ".rf5" Push ".pkt" + Push ".pklg" + Push ".pfx" Push ".pcapng" Push ".pcap" Push ".out" Push ".ntar" + Push ".mplog" + Push ".ipfix" Push ".fdc" Push ".erf" Push ".enc" @@ -118,7 +122,6 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".apc" Push ".acp" Push ".5vw" - Push ".mplog" !macroend !macro IsWiresharkRunning diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 05fff89ca9..20aa23a017 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -636,6 +636,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition> </Component> + <Component Id="cmpFAipfix"> + <ProgId Id="$(var.WiresharkFileAssociation)" Description="ipfix"> + <Extension Id="ipfix"> + <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument=""%1""/> + </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"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog"> <Extension Id="mplog"> @@ -654,6 +663,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition> </Component> + <Component Id="cmpFApfx"> + <ProgId Id="$(var.WiresharkFileAssociation)" Description="pfx"> + <Extension Id="pfx"> + <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument=""%1""/> + </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"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap"> <Extension Id="pcap"> @@ -672,6 +690,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "0"</Condition> </Component> + <Component Id="cmpFApklg"> + <ProgId Id="$(var.WiresharkFileAssociation)" Description="pklg"> + <Extension Id="pklg"> + <Verb Id="open" Command="open" TargetFile="filWireshark_exe" Argument=""%1""/> + </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"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt"> <Extension Id="pkt"> @@ -859,6 +886,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="fdc" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> </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=""%1""/> + </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"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="mplog"> <Extension Id="mplog"> @@ -877,6 +913,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="out" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> </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=""%1""/> + </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"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pcap"> <Extension Id="pcap"> @@ -895,6 +940,15 @@ <RegistryValue Root="HKCU" Key="Software\$(var.WiresharkName)" Name="pcapng" Type="integer" Value="1" KeyPath="yes"/> <Condition>WIRESHARK_FILE_EXTENSIONS = "1"</Condition> </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=""%1""/> + </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"> <ProgId Id="$(var.WiresharkFileAssociation)" Description="pkt"> <Extension Id="pkt"> diff --git a/wireshark-mime-package.xml b/wireshark-mime-package.xml index 41e0b58f66..3281038145 100644 --- a/wireshark-mime-package.xml +++ b/wireshark-mime-package.xml @@ -165,7 +165,7 @@ </mime-type> <mime-type type="application/x-micropross-mplog"> - <comment>Packet Capture (mplog)</comment> + <comment>Packet Capture (Micropross mplog)</comment> <generic-icon name="application-wireshark-doc"/> <magic> <match type="string" offset="0" value="MPCSII"/> @@ -173,4 +173,34 @@ <glob pattern="*.mplog"/> <glob pattern="*.mplog.gz"/> </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> diff --git a/wireshark.desktop b/wireshark.desktop index c073f63481..334db48076 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;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: # http://standards.freedesktop.org/menu-spec/1.0/ Categories=Network;Monitor;Qt; diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 0940a2cfec..f138376428 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -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", OPEN_INFO_MAGIC, dct3trace_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 }, /* * 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 * 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])) |