From 6e88922f14e872192621c04457becc9f7abe20ab Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Thu, 2 Jun 2022 08:17:53 +0300 Subject: [PATCH] Rename `socket` struct to `golang_socket` --- tap/tlstapper/bpf/golang_uprobes.c | 8 ++++---- tap/tlstapper/bpf/include/maps.h | 6 +++--- tap/tlstapper/tlstapper_bpfeb.o | Bin 127872 -> 127888 bytes tap/tlstapper/tlstapper_bpfel.o | Bin 127872 -> 127888 bytes 4 files changed, 7 insertions(+), 7 deletions(-) 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 9ca5f54f7e25d7ba2643d782a9810d64a2867d3d..88a0ba4dc59e1aa14cdc708527d83bf80e591732 100644 GIT binary patch delta 4824 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 F`7alD|04hZ delta 5059 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 TnUnL}%t-%dXi8+{Gg19t5K;1!