diff options
| author | Odysseus Yang <wiresharkyyh@outlook.com> | 2020-12-02 09:05:11 +0000 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2020-12-02 09:05:11 +0000 |
| commit | 2a5b34d8b02b1663237490eec5dfd8652a9bdb51 (patch) | |
| tree | 5acf1640ab708e32a172a00763145e41e19c5089 /packaging | |
| parent | fe1f9475409f252b6ca2dccc71187868e168c74b (diff) | |
MBIM: Update dissector to support DLT_ETW
New link type DLT_ETW is added for write and read Event Trace on Windows.
This change updates MBIM dissector to decode a MBIM message from
a DLT_ETW packet.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 7 | ||||
| -rw-r--r-- | packaging/wix/ComponentGroups.wxi | 20 | ||||
| -rw-r--r-- | packaging/wix/Features.wxi | 3 |
3 files changed, 30 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index f96a14a574..7af2a5c6e5 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1183,6 +1183,12 @@ Section /o "Randpktdump" SecRandpktdump SectionEnd !insertmacro CheckExtrasFlag "randpktdump" +Section /o "Etwdump" SecEtwdump +;------------------------------------------- + !insertmacro InstallExtcap "Etwdump" +SectionEnd +!insertmacro CheckExtrasFlag "Etwdump" + SectionGroupEnd ; "Tools" !ifdef DOCBOOK_DIR @@ -1232,6 +1238,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecSshdump} "Provide remote capture through SSH" !insertmacro MUI_DESCRIPTION_TEXT ${SecUDPdump} "Provide capture interface that gets UDP packets from network devices" !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpktdump} "Provide random packet generator" + !insertmacro MUI_DESCRIPTION_TEXT ${SecEtwdump} "Provide ETW reader" !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimmming packets, omitting them, or saving to a different format." !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Combine multiple saved capture files into a single output file" diff --git a/packaging/wix/ComponentGroups.wxi b/packaging/wix/ComponentGroups.wxi index 5468978bfd..59c6a1c84a 100644 --- a/packaging/wix/ComponentGroups.wxi +++ b/packaging/wix/ComponentGroups.wxi @@ -471,6 +471,26 @@ </ComponentGroup> </Fragment> + <!-- Etwdump --> + <Fragment> + <DirectoryRef Id="dirExtcap"> + <Component Id="cmpEtwdump_exe" Guid="*"> + <File Id="filEtwdump_exe" KeyPath="yes" Source="$(var.Extcap.Dir)\etwdump.exe" /> + </Component> + </DirectoryRef> + <DirectoryRef Id="INSTALLFOLDER"> + <Component Id="cmpEtwdump_html" Guid="*"> + <File Id="filEtwdump_html" KeyPath="yes" Source="$(var.Staging.Dir)\etwdump.html" /> + </Component> + </DirectoryRef> + </Fragment> + <Fragment> + <ComponentGroup Id="CG.Tools.Etwdump"> + <ComponentRef Id="cmpEtwdump_exe" /> + <ComponentRef Id="cmpEtwdump_html" /> + </ComponentGroup> + </Fragment> + <!-- Sshdump --> <Fragment> <DirectoryRef Id="dirExtcap"> diff --git a/packaging/wix/Features.wxi b/packaging/wix/Features.wxi index eb37b11f95..58837cba21 100644 --- a/packaging/wix/Features.wxi +++ b/packaging/wix/Features.wxi @@ -89,6 +89,9 @@ <Feature Id="Fe.Tools.Randpktdump" Title="Randpktdump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide random packet generator."> <ComponentGroupRef Id="CG.Tools.Randpktdump" /> </Feature> + <Feature Id="Fe.Tools.Etwdump" Title="Etwdump" Level="2" AllowAdvertise="yes" Display="expand" Description="Provide ETW reader."> + <ComponentGroupRef Id="CG.Tools.Etwdump" /> + </Feature> <Feature Id="Fe.Tools.Sshdump" Title="Sshdump" Level="1" AllowAdvertise="yes" Display="expand" Description="Provide remote capture through SSH."> <ComponentGroupRef Id="CG.Tools.Sshdump" /> </Feature> |