sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 08:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ebpf code to its own package to avoid crash issues in Android (#1033)

Browse Source 
* Move ebpf code to its own package to avoid crash issues in Android

Older versions of android crashes because of the bytecode files
Even when they aren't loaded as it was our case

* move c file to own folder

* fix lint
This commit is contained in:
Maycon Santos
2023-07-27 15:34:27 +02:00
committed by GitHub
parent 7794b744f8
commit 24713fbe59
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/internal/wgproxy/proxy_ebpf.go
View File

@@ -14,11 +14,13 @@ import (
"github.com/google/gopacket/layers"
log "github.com/sirupsen/logrus"
ebpf2 "github.com/netbirdio/netbird/client/internal/wgproxy/ebpf"
)
// WGEBPFProxy definition for proxy with eBPF support
// WGEBPFProxy definition for proxy with EBPF support
type WGEBPFProxy struct {
ebpf *eBPF
ebpf *ebpf2.EBPF
lastUsedPort uint16
localWGListenPort int
@@ -34,7 +36,7 @@ func NewWGEBPFProxy(wgPort int) *WGEBPFProxy {
log.Debugf("instantiate ebpf proxy")
wgProxy := &WGEBPFProxy{
localWGListenPort: wgPort,
ebpf: newEBPF(),
ebpf: ebpf2.NewEBPF(),
lastUsedPort: 0,
turnConnStore: make(map[uint16]net.Conn),
}
@@ -54,7 +56,7 @@ func (p *WGEBPFProxy) Listen() error {
return err
}
err = p.ebpf.load(wgPorxyPort, p.localWGListenPort)
err = p.ebpf.Load(wgPorxyPort, p.localWGListenPort)
if err != nil {
return err
}
@@ -107,7 +109,7 @@ func (p *WGEBPFProxy) Free() error {
err1 = p.conn.Close()
}
err2 = p.ebpf.free()
err2 = p.ebpf.Free()
if p.rawConn != nil {
err3 = p.rawConn.Close()
}