diff --git a/tap/tlstapper/bpf/golang_uprobes.c b/tap/tlstapper/bpf/golang_uprobes.c index 8fd151abe..5dacc1711 100644 --- a/tap/tlstapper/bpf/golang_uprobes.c +++ b/tap/tlstapper/bpf/golang_uprobes.c @@ -22,7 +22,7 @@ static __always_inline int golang_crypto_tls_write_uprobe(struct pt_regs *ctx) { } __u64 key_dial_full = (pid << 32) + key_dial; - struct socket *s = bpf_map_lookup_elem(&golang_socket_to_write, &key_dial_full); + struct golang_socket *s = bpf_map_lookup_elem(&golang_socket_to_write, &key_dial_full); if (s == NULL) { bpf_printk("[golang_crypto_tls_write_uprobe] error getting socket"); return 0; @@ -97,12 +97,12 @@ static __always_inline int golang_net_socket_uprobe(struct pt_regs *ctx) { __u64 pid = pid_tgid >> 32; // ctx->r14 is common between golang_net_socket_uprobe and golang_net_http_dialconn_uprobe __u64 key_socket = (pid << 32) + ctx->r14; - struct socket *s = bpf_map_lookup_elem(&golang_dial_to_socket, &key_socket); + struct golang_socket *s = bpf_map_lookup_elem(&golang_dial_to_socket, &key_socket); if (s == NULL) { return 0; } - struct socket b = { + struct golang_socket b = { .pid = s->pid, .fd = ctx->rax, .key_dial = s->key_dial, @@ -130,7 +130,7 @@ static __always_inline int golang_net_http_dialconn_uprobe(struct pt_regs *ctx) } __u64 pid_tgid = bpf_get_current_pid_tgid(); - struct socket b = { + struct golang_socket b = { .pid = pid_tgid >> 32, .fd = 0, .key_dial = key_dial, diff --git a/tap/tlstapper/bpf/include/maps.h b/tap/tlstapper/bpf/include/maps.h index 084a559dd..1367e7080 100644 --- a/tap/tlstapper/bpf/include/maps.h +++ b/tap/tlstapper/bpf/include/maps.h @@ -57,7 +57,7 @@ struct sys_close { __u32 fd; }; -struct socket { +struct golang_socket { __u32 pid; __u32 fd; __u64 key_dial; @@ -108,8 +108,8 @@ BPF_LRU_HASH(file_descriptor_to_ipv4, __u64, struct fd_info); BPF_PERF_OUTPUT(chunks_buffer); BPF_PERF_OUTPUT(log_buffer); -BPF_LRU_HASH(golang_dial_to_socket, __u64, struct socket); -BPF_LRU_HASH(golang_socket_to_write, __u64, struct socket); +BPF_LRU_HASH(golang_dial_to_socket, __u64, struct golang_socket); +BPF_LRU_HASH(golang_socket_to_write, __u64, struct golang_socket); BPF_RINGBUF(golang_read_writes); BPF_PERF_OUTPUT(sys_closes); diff --git a/tap/tlstapper/tlstapper_bpfeb.o b/tap/tlstapper/tlstapper_bpfeb.o index 9ca5f54f7..88a0ba4dc 100644 Binary files a/tap/tlstapper/tlstapper_bpfeb.o and b/tap/tlstapper/tlstapper_bpfeb.o differ diff --git a/tap/tlstapper/tlstapper_bpfel.o b/tap/tlstapper/tlstapper_bpfel.o index b8f59f0f7..9360fe987 100644 Binary files a/tap/tlstapper/tlstapper_bpfel.o and b/tap/tlstapper/tlstapper_bpfel.o differ