Skip to content

Added event containing full payload for all packets #4122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2024
Merged

Added event containing full payload for all packets #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions pkg/ebpf/c/common/network.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,17 @@ typedef struct nethdrs_t {

typedef enum net_packet {
CAP_NET_PACKET = 1 << 0,
SUB_NET_PACKET_RAW = 1 << 1,
// Layer 3
SUB_NET_PACKET_IP = 1 << 1,
SUB_NET_PACKET_IP = 1 << 2,
// Layer 4
SUB_NET_PACKET_TCP = 1 << 2,
SUB_NET_PACKET_UDP = 1 << 3,
SUB_NET_PACKET_ICMP = 1 << 4,
SUB_NET_PACKET_ICMPV6 = 1 << 5,
SUB_NET_PACKET_TCP = 1 << 3,
SUB_NET_PACKET_UDP = 1 << 4,
SUB_NET_PACKET_ICMP = 1 << 5,
SUB_NET_PACKET_ICMPV6 = 1 << 6,
// Layer 7
SUB_NET_PACKET_DNS = 1 << 6,
SUB_NET_PACKET_HTTP = 1 << 7,
SUB_NET_PACKET_DNS = 1 << 7,
SUB_NET_PACKET_HTTP = 1 << 8,
} net_packet_t;

typedef struct net_event_contextmd {
Expand Down
7 changes: 6 additions & 1 deletion pkg/ebpf/c/tracee.bpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5238,6 +5238,8 @@ statfunc enum event_id_e net_packet_to_net_event(net_packet_t packet_type)
case CAP_NET_PACKET:
return NET_CAPTURE_BASE;
// Packets
case SUB_NET_PACKET_RAW:
return NET_PACKET_RAW;
case SUB_NET_PACKET_IP:
return NET_PACKET_IP;
case SUB_NET_PACKET_TCP:
Expand Down Expand Up @@ -6201,7 +6203,10 @@ CGROUP_SKB_HANDLE_FUNCTION(proto)
if (!dest)
return 1; // satisfy verifier for clang-12 generated binaries

// fastpath: submit the IP base event
// fastpath: submit the raw packet and IP base events

if (should_submit_net_event(neteventctx, SUB_NET_PACKET_RAW))
cgroup_skb_submit_event(ctx, neteventctx, NET_PACKET_RAW, FULL);

if (should_submit_net_event(neteventctx, SUB_NET_PACKET_IP))
cgroup_skb_submit_event(ctx, neteventctx, NET_PACKET_IP, HEADERS);
Expand Down
1 change: 1 addition & 0 deletions pkg/ebpf/c/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ enum event_id_e
{
// Net events IDs
NET_PACKET_BASE = 700,
NET_PACKET_RAW,
NET_PACKET_IP,
NET_PACKET_TCP,
NET_PACKET_UDP,
Expand Down
16 changes: 16 additions & 0 deletions pkg/events/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ type ID int32
// Common events (used by all architectures).
const (
NetPacketBase ID = iota + 700
NetPacketRaw
NetPacketIPBase
NetPacketTCPBase
NetPacketUDPBase
Expand Down Expand Up @@ -13236,6 +13237,21 @@ var CoreEvents = map[ID]Definition{
sets: []string{"network_events"},
params: []trace.ArgMeta{},
},
NetPacketRaw: {
id: NetPacketRaw,
id32Bit: Sys32Undefined,
name: "net_packet_raw",
version: NewVersion(1, 0, 0),
dependencies: Dependencies{
ids: []ID{
NetPacketBase,
},
},
sets: []string{"packets"},
params: []trace.ArgMeta{
{Type: "bytes", Name: "data"},
},
},
NetPacketIPBase: {
id: NetPacketIPBase,
id32Bit: Sys32Undefined,
Expand Down