extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-25 01:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ebpf close function (#2672)

Browse Source
This commit is contained in:
Zoltan Papp 2024-09-30 10:34:57 +02:00 committed by GitHub
parent cfbcf507fb
commit 3dca6099d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/internal/wgproxy/ebpf/proxy.go
View File

@ -81,8 +81,7 @@ func (p *WGEBPFProxy) Listen() error {
conn, err := nbnet.ListenUDP("udp", &addr) conn, err := nbnet.ListenUDP("udp", &addr)
if err != nil { if err != nil {
cErr := p.Free() if cErr := p.Free(); cErr != nil {
if cErr != nil {
log.Errorf("Failed to close the wgproxy: %s", cErr) log.Errorf("Failed to close the wgproxy: %s", cErr)
} }
return err return err
@ -122,8 +121,10 @@ func (p *WGEBPFProxy) Free() error {
p.ctxCancel() p.ctxCancel()
var result *multierror.Error var result *multierror.Error
if err := p.conn.Close(); err != nil { if p.conn != nil { // p.conn will be nil if we have failed to listen
result = multierror.Append(result, err) if err := p.conn.Close(); err != nil {
result = multierror.Append(result, err)
}
} }
if err := p.ebpfManager.FreeWGProxy(); err != nil { if err := p.ebpfManager.FreeWGProxy(); err != nil {