Skip to content

Commit ec8af2a

Browse files
nddqnddq
committedApr 18, 2024
modify conntrack
1 parent 6259fe1 commit ec8af2a

File tree

7 files changed

+34
-27
lines changed

7 files changed

+34
-27
lines changed
 

‎controller/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,13 @@ import (
3131
pc "github.com/microsoft/retina/pkg/controllers/daemon/pod"
3232
kec "github.com/microsoft/retina/pkg/controllers/daemon/retinaendpoint"
3333
sc "github.com/microsoft/retina/pkg/controllers/daemon/service"
34-
"github.com/microsoft/retina/pkg/plugin/conntrack"
35-
3634
"github.com/microsoft/retina/pkg/enricher"
3735
"github.com/microsoft/retina/pkg/log"
3836
cm "github.com/microsoft/retina/pkg/managers/controllermanager"
3937
"github.com/microsoft/retina/pkg/managers/filtermanager"
4038
"github.com/microsoft/retina/pkg/metrics"
4139
mm "github.com/microsoft/retina/pkg/module/metrics"
40+
"github.com/microsoft/retina/pkg/plugin/conntrack"
4241
"github.com/microsoft/retina/pkg/pubsub"
4342
"github.com/microsoft/retina/pkg/telemetry"
4443
)

‎go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ require (
5050
github.com/coreos/go-semver v0.3.1 // indirect
5151
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5252
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
53+
github.com/daixiang0/gci v0.13.4 // indirect
5354
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5455
github.com/distribution/reference v0.5.0 // indirect
5556
github.com/docker/cli v25.0.3+incompatible // indirect
@@ -111,6 +112,7 @@ require (
111112
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
112113
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
113114
github.com/hashicorp/serf v0.10.1 // indirect
115+
github.com/hexops/gotextdiff v1.0.3 // indirect
114116
github.com/huandu/xstrings v1.4.0 // indirect
115117
github.com/inconshreveable/mousetrap v1.1.0 // indirect
116118
github.com/jmoiron/sqlx v1.3.5 // indirect
@@ -196,10 +198,10 @@ require (
196198
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
197199
golang.org/x/crypto v0.21.0 // indirect
198200
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
199-
golang.org/x/mod v0.14.0 // indirect
201+
golang.org/x/mod v0.16.0 // indirect
200202
golang.org/x/text v0.14.0 // indirect
201203
golang.org/x/time v0.5.0 // indirect
202-
golang.org/x/tools v0.17.0 // indirect
204+
golang.org/x/tools v0.19.0 // indirect
203205
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
204206
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
205207
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect

‎go.sum

+7
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
168168
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
169169
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
170170
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
171+
github.com/daixiang0/gci v0.13.4 h1:61UGkmpoAcxHM2hhNkZEf5SzwQtWJXTSws7jaPyqwlw=
172+
github.com/daixiang0/gci v0.13.4/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk=
171173
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
172174
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
173175
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -430,6 +432,8 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR
430432
github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
431433
github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
432434
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
435+
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
436+
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
433437
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
434438
github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
435439
github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
@@ -866,6 +870,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
866870
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
867871
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
868872
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
873+
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
874+
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
869875
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
870876
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
871877
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1010,6 +1016,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
10101016
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
10111017
golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
10121018
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
1019+
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
10131020
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
10141021
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
10151022
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/plugin/packetparser/_cprog/packetparser.c

+22-23
Original file line numberDiff line numberDiff line change
@@ -213,24 +213,8 @@ static void parse(struct __sk_buff *skb, direction d)
213213
{
214214
p.tcp_metadata = tcp_metadata;
215215
}
216-
}
217-
else if (ip->protocol == IPPROTO_UDP)
218-
{
219-
struct udphdr *udp = data + sizeof(struct ethhdr) + sizeof(struct iphdr);
220-
if (data + sizeof(struct ethhdr) + sizeof(struct iphdr) + sizeof(struct udphdr) > data_end)
221-
return;
222216

223-
p.src_port = udp->source;
224-
p.dst_port = udp->dest;
225-
}
226-
else
227-
{
228-
return;
229-
}
230-
// If MONITOR_AGGREGATE is 1, we will sent the packet to the perf buffer if the packet contains unseen flags.
231-
if (MONITOR_AGGREGATE == 1) {
232-
// Check if packet is TCP
233-
if (ip->protocol == IPPROTO_TCP) {
217+
if (MONITOR_AGGREGATE == 1) {
234218
// Convert packet to 5 tuple.
235219
struct ct_key key;
236220
__builtin_memset(&key, 0, sizeof(key));
@@ -250,7 +234,18 @@ static void parse(struct __sk_buff *skb, direction d)
250234
}
251235
// Process the packet in the conntrack map.
252236
ct_process_packet(&key, flags);
253-
} else if (ip->protocol == IPPROTO_UDP) {
237+
}
238+
}
239+
else if (ip->protocol == IPPROTO_UDP)
240+
{
241+
struct udphdr *udp = data + sizeof(struct ethhdr) + sizeof(struct iphdr);
242+
if (data + sizeof(struct ethhdr) + sizeof(struct iphdr) + sizeof(struct udphdr) > data_end)
243+
return;
244+
245+
p.src_port = udp->source;
246+
p.dst_port = udp->dest;
247+
248+
if (MONITOR_AGGREGATE == 1) {
254249
// Convert packet to 5 tuple.
255250
struct ct_key key;
256251
__builtin_memset(&key, 0, sizeof(key));
@@ -263,17 +258,21 @@ static void parse(struct __sk_buff *skb, direction d)
263258

264259
// Check if the packet flags have been seen before.
265260
if (ct_check_flags(&key, flags)) {
266-
// If the flags have been seen before, process the packet in the conntrack map to update the timestamp and then return.
267-
ct_process_packet(&key, flags);
261+
// If the flags have been seen before, process the packet in the conntrack map to update the timestamp and then
262+
// return immediately instead of sending it to the perf buffer.
263+
ct_process_packet(&key, flags);
268264
return;
269265
}
270266
// Process the packet in the conntrack map.
271267
ct_process_packet(&key, flags);
272268
}
273-
bpf_perf_event_output(skb, &packetparser_events, BPF_F_CURRENT_CPU, &p, sizeof(p));
274-
} else {
275-
bpf_perf_event_output(skb, &packetparser_events, BPF_F_CURRENT_CPU, &p, sizeof(p));
276269
}
270+
else
271+
{
272+
return;
273+
}
274+
bpf_perf_event_output(skb, &packetparser_events, BPF_F_CURRENT_CPU, &p, sizeof(p));
275+
277276
}
278277

279278
SEC("classifier_endpoint_ingress")

‎pkg/plugin/packetparser/packetparser_bpf.o

568 Bytes
Binary file not shown.

‎pkg/plugin/packetparser/packetparser_bpfel_arm64.o

80 Bytes
Binary file not shown.

‎pkg/plugin/packetparser/packetparser_bpfel_x86.o

80 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)