Skip to content

Commit 6683a1b

Browse files
committed
Support for eBPF based port forwarding
Signed-off-by: Balaji Vijayakumar <[email protected]>
1 parent 9be3b9a commit 6683a1b

File tree

3 files changed

+37
-17
lines changed

3 files changed

+37
-17
lines changed

Diff for: go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require (
99
github.com/Microsoft/go-winio v0.6.2
1010
github.com/apparentlymart/go-cidr v1.1.0
1111
github.com/balajiv113/fd v0.0.0-20230330094840-143eec500f3e
12+
github.com/balajiv113/trackport v0.0.0-20241230084451-81fec14d876e
1213
github.com/cheggaaa/pb/v3 v3.1.5
1314
github.com/containerd/containerd v1.7.24
1415
github.com/containerd/continuity v0.4.5
@@ -65,6 +66,7 @@ require (
6566
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
6667
github.com/braydonk/yaml v0.7.0 // indirect
6768
github.com/buger/jsonparser v1.1.1 // indirect
69+
github.com/cilium/ebpf v0.17.1 // indirect
6870
github.com/containerd/errdefs v0.3.0 // indirect
6971
github.com/containerd/log v0.1.0 // indirect
7072
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

Diff for: go.sum

+15
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPn
2828
github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
2929
github.com/balajiv113/fd v0.0.0-20230330094840-143eec500f3e h1:IdMhFPEfTZQU971tIHx3UhY4l+yCeynprnINrDTSrOc=
3030
github.com/balajiv113/fd v0.0.0-20230330094840-143eec500f3e/go.mod h1:aXGMJsd3XrnUFTuyf/pTGg5jG6CY8JMZ5juywvShjgQ=
31+
github.com/balajiv113/trackport v0.0.0-20241230051808-717502f1cdc7 h1:3WoN0d3sXsfQnaYyEb3Z0hQcEw9qxrzE2ts1fMt+nyA=
32+
github.com/balajiv113/trackport v0.0.0-20241230051808-717502f1cdc7/go.mod h1:O5u3VTlXI0v9lJD0pJBHm83i1NBrDoczCMRe7cbr5s0=
33+
github.com/balajiv113/trackport v0.0.0-20241230052122-9e7e931d1d01 h1:7sUBsjYIa9l/xm5wHCguq1Et55mMgJcMo/tLVjXnNbs=
34+
github.com/balajiv113/trackport v0.0.0-20241230052122-9e7e931d1d01/go.mod h1:O5u3VTlXI0v9lJD0pJBHm83i1NBrDoczCMRe7cbr5s0=
35+
github.com/balajiv113/trackport v0.0.0-20241230084451-81fec14d876e h1:fNmYFRQaBJWuL+ynq+Tt21QhuP1F4YafXaGS+2F78+E=
36+
github.com/balajiv113/trackport v0.0.0-20241230084451-81fec14d876e/go.mod h1:O5u3VTlXI0v9lJD0pJBHm83i1NBrDoczCMRe7cbr5s0=
3137
github.com/bmatcuk/doublestar/v4 v4.6.0 h1:HTuxyug8GyFbRkrffIpzNCSK4luc0TY3wzXvzIZhEXc=
3238
github.com/bmatcuk/doublestar/v4 v4.6.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
3339
github.com/braydonk/yaml v0.7.0 h1:ySkqO7r0MGoCNhiRJqE0Xe9yhINMyvOAB3nFjgyJn2k=
@@ -36,6 +42,8 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMU
3642
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
3743
github.com/cheggaaa/pb/v3 v3.1.5 h1:QuuUzeM2WsAqG2gMqtzaWithDJv0i+i6UlnwSCI4QLk=
3844
github.com/cheggaaa/pb/v3 v3.1.5/go.mod h1:CrxkeghYTXi1lQBEI7jSn+3svI3cuc19haAj6jM60XI=
45+
github.com/cilium/ebpf v0.17.1 h1:G8mzU81R2JA1nE5/8SRubzqvBMmAmri2VL8BIZPWvV0=
46+
github.com/cilium/ebpf v0.17.1/go.mod h1:vay2FaYSmIlv3r8dNACd4mW/OCaZLJKJOo+IHBvCIO8=
3947
github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA=
4048
github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw=
4149
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
@@ -104,6 +112,8 @@ github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En
104112
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
105113
github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
106114
github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
115+
github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
116+
github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
107117
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
108118
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
109119
github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
@@ -154,6 +164,9 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
154164
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
155165
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
156166
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
167+
github.com/jsimonetti/rtnetlink v1.3.5 h1:hVlNQNRlLDGZz31gBPicsG7Q53rnlsz1l1Ix/9XlpVA=
168+
github.com/jsimonetti/rtnetlink/v2 v2.0.1 h1:xda7qaHDSVOsADNouv7ukSuicKZO7GgVUCXxpaIEIlM=
169+
github.com/jsimonetti/rtnetlink/v2 v2.0.1/go.mod h1:7MoNYNbb3UaDHtF8udiJo/RH6VsTKP1pqKLUTVCvToE=
157170
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
158171
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
159172
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -192,6 +205,8 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ
192205
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
193206
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
194207
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
208+
github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
209+
github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
195210
github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY=
196211
github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4=
197212
github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=

Diff for: pkg/guestagent/guestagent_linux.go

+20-17
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ import (
55
"errors"
66
"os"
77
"reflect"
8+
"strconv"
89
"sync"
910
"syscall"
1011
"time"
1112

13+
"github.com/balajiv113/trackport/pkg/bpftracker"
14+
"github.com/balajiv113/trackport/pkg/trackapi"
1215
"github.com/elastic/go-libaudit/v2"
1316
"github.com/elastic/go-libaudit/v2/auparse"
1417
"github.com/lima-vm/lima/pkg/guestagent/api"
@@ -195,24 +198,24 @@ func isEventEmpty(ev *api.Event) bool {
195198

196199
func (a *agent) Events(ctx context.Context, ch chan *api.Event) {
197200
defer close(ch)
198-
tickerCh, tickerClose := a.newTicker()
199-
defer tickerClose()
200-
var st eventState
201-
for {
202-
var ev *api.Event
203-
ev, st = a.collectEvent(ctx, st)
204-
if !isEventEmpty(ev) {
205-
ch <- ev
206-
}
207-
select {
208-
case <-ctx.Done():
209-
return
210-
case _, ok := <-tickerCh:
211-
if !ok {
212-
return
213-
}
214-
logrus.Debug("tick!")
201+
202+
portMonitor := bpftracker.NewTracker(func(event *trackapi.PortEvent) {
203+
port := make([]*api.IPPort, 1)
204+
ev := &api.Event{Time: timestamppb.Now()}
205+
atoi, _ := strconv.Atoi(event.Port)
206+
if event.Action == trackapi.OPEN {
207+
port[0] = &api.IPPort{Ip: event.Ip.String(), Port: int32(atoi), Protocol: trackapi.ProtocolToString(event.Protocol)}
208+
ev.LocalPortsAdded = port
209+
} else {
210+
port[0] = &api.IPPort{Ip: event.Ip.String(), Port: int32(atoi), Protocol: trackapi.ProtocolToString(event.Protocol)}
211+
ev.LocalPortsRemoved = port
215212
}
213+
ch <- ev
214+
})
215+
216+
err := portMonitor.Run(ctx)
217+
if err != nil {
218+
return
216219
}
217220
}
218221

0 commit comments

Comments
 (0)