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

[client] Remove usage of custom dialer for localhost (#2639)

Browse Source 
* Downgrade error log level for network monitor warnings

* Do not use custom dialer for localhost
This commit is contained in:
Viktor Liu 2024-09-24 12:29:15 +02:00 committed by GitHub
parent d47be154ea
commit ab82302c95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/internal/networkmonitor/monitor_bsd.go
View File

@ -24,7 +24,7 @@ func checkChange(ctx context.Context, nexthopv4, nexthopv6 systemops.Nexthop, ca
defer func() { defer func() {
err := unix.Close(fd) err := unix.Close(fd)
if err != nil && !errors.Is(err, unix.EBADF) { if err != nil && !errors.Is(err, unix.EBADF) {
log.Errorf("Network monitor: failed to close routing socket: %v", err) log.Warnf("Network monitor: failed to close routing socket: %v", err)
} }
}() }()
@ -32,7 +32,7 @@ func checkChange(ctx context.Context, nexthopv4, nexthopv6 systemops.Nexthop, ca
<-ctx.Done() <-ctx.Done()
err := unix.Close(fd) err := unix.Close(fd)
if err != nil && !errors.Is(err, unix.EBADF) { if err != nil && !errors.Is(err, unix.EBADF) {
log.Debugf("Network monitor: closed routing socket") log.Debugf("Network monitor: closed routing socket: %v", err)
} }
}() }()
@ -45,12 +45,12 @@ func checkChange(ctx context.Context, nexthopv4, nexthopv6 systemops.Nexthop, ca
n, err := unix.Read(fd, buf) n, err := unix.Read(fd, buf)
if err != nil { if err != nil {
if !errors.Is(err, unix.EBADF) && !errors.Is(err, unix.EINVAL) { if !errors.Is(err, unix.EBADF) && !errors.Is(err, unix.EINVAL) {
log.Errorf("Network monitor: failed to read from routing socket: %v", err) log.Warnf("Network monitor: failed to read from routing socket: %v", err)
} }
continue continue
} }
if n < unix.SizeofRtMsghdr { if n < unix.SizeofRtMsghdr {
log.Errorf("Network monitor: read from routing socket returned less than expected: %d bytes", n) log.Debugf("Network monitor: read from routing socket returned less than expected: %d bytes", n)
continue continue
} }
@ -61,7 +61,7 @@ func checkChange(ctx context.Context, nexthopv4, nexthopv6 systemops.Nexthop, ca
case unix.RTM_ADD, syscall.RTM_DELETE: case unix.RTM_ADD, syscall.RTM_DELETE:
route, err := parseRouteMessage(buf[:n]) route, err := parseRouteMessage(buf[:n])
if err != nil { if err != nil {
log.Errorf("Network monitor: error parsing routing message: %v", err) log.Debugf("Network monitor: error parsing routing message: %v", err)
continue continue
} }

5
client/internal/wgproxy/proxy_userspace.go
View File

@ -7,8 +7,6 @@ import (
"net" "net"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
nbnet "github.com/netbirdio/netbird/util/net"
) )
// WGUserSpaceProxy proxies // WGUserSpaceProxy proxies
@ -36,7 +34,8 @@ func (p *WGUserSpaceProxy) AddTurnConn(remoteConn net.Conn) (net.Addr, error) {
p.remoteConn = remoteConn p.remoteConn = remoteConn
var err error var err error
p.localConn, err = nbnet.NewDialer().DialContext(p.ctx, "udp", fmt.Sprintf(":%d", p.localWGListenPort)) dialer := &net.Dialer{}
p.localConn, err = dialer.DialContext(p.ctx, "udp", fmt.Sprintf(":%d", p.localWGListenPort))
if err != nil { if err != nil {
log.Errorf("failed dialing to local Wireguard port %s", err) log.Errorf("failed dialing to local Wireguard port %s", err)
return nil, err return nil, err