microsoft
/
ebpf-for-windows
зеркало из https://github.com/microsoft/ebpf-for-windows.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix eBPF store clear/setup and add logs to `export_program_info.exe` (#1975) 

* fix ebpf store & tool logs

* bare vm pass
This commit is contained in:
Gianni Trevisiol 2023-01-30 07:53:19 -08:00 коммит произвёл GitHub
Родитель 7d22d50da8
Коммит 83ddc74d1d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 20 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
installer/Product.wxs
Просмотреть файл

@ -146,7 +146,7 @@ SPDX-License-Identifier: MIT
<Fragment>
<ComponentGroup Id="eBPF_Runtime_Components" Directory="INSTALLFOLDER">
<Component Id ="eBpfPATH" Guid="{C062B980-4B93-4FC7-A4F9-A751C2B419FD}" KeyPath="yes">
<Environment Id="eBpfPATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
<Environment Id="eBpfPATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="no" Part="last" Action="set" System="yes" Separator=";" />
</Component>
<Component Id="LICENSE" Guid="{AF22EAE5-7D8D-4F22-BB64-6B6A079A2947}">
<File Id="LICENSE.txt" Name="LICENSE.txt" DiskId="1" Source="$(var.SolutionDir)LICENSE.txt" />
@ -193,12 +193,10 @@ SPDX-License-Identifier: MIT
</ComponentGroup>
<!--Clear/Setup the eBPF store-->
<SetProperty Id="Clear_eBPF_store" Value='"[#EXPORT_PROGRAM_INFO.EXE]" --clear' Before="Clear_eBPF_store" Sequence="execute"/>
<CustomAction Id="Clear_eBPF_store" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="check" Impersonate="no"/>
<SetProperty Id="Clear_eBPF_store_uninstall" Value='"[#EXPORT_PROGRAM_INFO.EXE]" --clear' Before="Clear_eBPF_store" Sequence="execute"/>
<CustomAction Id="Clear_eBPF_store_uninstall" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
<CustomAction Id="Clear_eBPF_store" ExeCommand='"[#EXPORT_PROGRAM_INFO.EXE]" --clear' Directory="INSTALLFOLDER" Execute="deferred" Return="check" Impersonate="yes"/>
<CustomAction Id="Clear_eBPF_store_uninstall" ExeCommand='"[#EXPORT_PROGRAM_INFO.EXE]" --clear' Directory="INSTALLFOLDER" Execute="deferred" Return="ignore" Impersonate="yes"/>
<SetProperty Id="Setup_eBPF_store" Value='"[#EXPORT_PROGRAM_INFO.EXE]"' Before="Setup_eBPF_store" Sequence="execute"/>
<CustomAction Id="Setup_eBPF_store" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="check" Impersonate="no"/>
<CustomAction Id="Setup_eBPF_store" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="check" Impersonate="yes"/>
<!--Install/Uninstall the netsh helper-->
<!--qtexec does not currently support a working directory (ref. https://github.com/wixtoolset/issues/issues/1265)-->

19
tools/export_program_info/main.cpp
Просмотреть файл

@ -24,12 +24,25 @@ main(int argc, char** argv)
}
if (!clear) {
uint32_t status;
std::cout << "Exporting program information." << std::endl;
export_all_program_information();
status = export_all_program_information();
if (status != ERROR_SUCCESS) {
std::cout << "Failed export_all_program_information() - ERROR #" << status << std::endl;
}
std::cout << "Exporting section information." << std::endl;
export_all_section_information();
status = export_all_section_information();
if (status != ERROR_SUCCESS) {
std::cout << "Failed export_all_section_information() - ERROR #" << status << std::endl;
}
std::cout << "Exporting global helper information." << std::endl;
export_global_helper_information();
status = export_global_helper_information();
if (status != ERROR_SUCCESS) {
std::cout << "Failed export_global_helper_information() - ERROR #" << status << std::endl;
}
} else {
clear_all_ebpf_stores();
}