Reduce statically initialized strings (#2672)
Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> Co-authored-by: Alan Jowett <alan.jowett@microsoft.com>
This commit is contained in:
Родитель
090e627159
Коммит
97fb3ae0da
|
@ -396,7 +396,7 @@ get_program_type_windows(const std::string& section, const std::string&)
|
|||
return get_program_type_windows(*global_program_type);
|
||||
} catch (...) {
|
||||
if (!get_verification_in_progress()) {
|
||||
return windows_unspecified_program_type;
|
||||
return PTYPE("unspec", {0}, (uint64_t)&EBPF_PROGRAM_TYPE_UNSPECIFIED, {});
|
||||
} else {
|
||||
if (global_program_type_found) {
|
||||
auto guid_string = guid_to_string(global_program_type);
|
||||
|
|
|
@ -24,72 +24,6 @@
|
|||
// the preprocessor treat a prefix list as one macro argument.
|
||||
#define COMMA ,
|
||||
|
||||
//
|
||||
// XDP program type.
|
||||
//
|
||||
const ebpf_context_descriptor_t g_xdp_context_descriptor = {
|
||||
sizeof(xdp_md_t),
|
||||
EBPF_OFFSET_OF(xdp_md_t, data),
|
||||
EBPF_OFFSET_OF(xdp_md_t, data_end),
|
||||
EBPF_OFFSET_OF(xdp_md_t, data_meta)};
|
||||
|
||||
const EbpfProgramType windows_xdp_program_type =
|
||||
PTYPE("xdp", &g_xdp_context_descriptor, (uint64_t)&EBPF_PROGRAM_TYPE_XDP, {"xdp"});
|
||||
|
||||
//
|
||||
// Bind program type.
|
||||
//
|
||||
const ebpf_context_descriptor_t g_bind_context_descriptor = {
|
||||
sizeof(bind_md_t), EBPF_OFFSET_OF(bind_md_t, app_id_start), EBPF_OFFSET_OF(bind_md_t, app_id_end), -1};
|
||||
|
||||
const EbpfProgramType windows_bind_program_type =
|
||||
PTYPE("bind", &g_bind_context_descriptor, (uint64_t)&EBPF_PROGRAM_TYPE_BIND, {"bind"});
|
||||
|
||||
//
|
||||
// eBPF Sample extensions program type.
|
||||
//
|
||||
const ebpf_context_descriptor_t g_sample_ext_context_descriptor = {
|
||||
sizeof(sample_program_context_t),
|
||||
EBPF_OFFSET_OF(sample_program_context_t, data_start),
|
||||
EBPF_OFFSET_OF(sample_program_context_t, data_end),
|
||||
-1, // Offset into ctx struct for pointer to metadata, or -1 if none.
|
||||
};
|
||||
|
||||
const EbpfProgramType windows_sample_ext_program_type =
|
||||
PTYPE("sample_ext", &g_sample_ext_context_descriptor, (uint64_t)&EBPF_PROGRAM_TYPE_SAMPLE, {"sample_ext"});
|
||||
|
||||
//
|
||||
// CGROUP_SOCK_ADDR.
|
||||
//
|
||||
const ebpf_context_descriptor_t g_sock_addr_context_descriptor = {
|
||||
sizeof(bpf_sock_addr_t),
|
||||
-1, // Offset into ctx struct for pointer to data, or -1 if none.
|
||||
-1, // Offset into ctx struct for pointer to data, or -1 if none.
|
||||
-1, // Offset into ctx struct for pointer to metadata, or -1 if none.
|
||||
};
|
||||
|
||||
const EbpfProgramType windows_sock_addr_program_type = {
|
||||
"sock_addr",
|
||||
&g_sock_addr_context_descriptor,
|
||||
(uint64_t)&EBPF_PROGRAM_TYPE_CGROUP_SOCK_ADDR,
|
||||
{"cgroup/connect4", "cgroup/connect6", "cgroup/recv_accept4", "cgroup/recv_accept6"}};
|
||||
|
||||
//
|
||||
// SOCK_OPS.
|
||||
//
|
||||
const ebpf_context_descriptor_t g_sock_ops_context_descriptor = {
|
||||
sizeof(bpf_sock_ops_t),
|
||||
-1, // Offset into ctx struct for pointer to data, or -1 if none.
|
||||
-1, // Offset into ctx struct for pointer to data, or -1 if none.
|
||||
-1, // Offset into ctx struct for pointer to metadata, or -1 if none.
|
||||
};
|
||||
|
||||
const EbpfProgramType windows_sock_ops_program_type = {
|
||||
"sockops", &g_sock_ops_context_descriptor, (uint64_t)&EBPF_PROGRAM_TYPE_SOCK_OPS, {"sockops"}};
|
||||
|
||||
const EbpfProgramType windows_unspecified_program_type =
|
||||
PTYPE("unspec", {0}, (uint64_t)&EBPF_PROGRAM_TYPE_UNSPECIFIED, {});
|
||||
|
||||
typedef struct _ebpf_section_definition
|
||||
{
|
||||
_Field_z_ const char* section_prefix;
|
||||
|
@ -114,9 +48,3 @@ struct helper_function_info_t
|
|||
const size_t count;
|
||||
const ebpf_helper_function_prototype_t* data;
|
||||
};
|
||||
|
||||
const std::map<ebpf_program_type_t, helper_function_info_t, ebpf_attach_type_compare>
|
||||
program_type_specific_helper_functions = {
|
||||
{EBPF_PROGRAM_TYPE_XDP, _xdp_ebpf_extension_helper_function_prototype},
|
||||
{EBPF_PROGRAM_TYPE_SAMPLE, _sample_ebpf_extension_helper_function_prototype},
|
||||
};
|
Загрузка…
Ссылка в новой задаче