extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-12 16:37:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

[client] Add NB_SKIP_SOCKET_MARK & fix crash instead of returing an error (#2899)

Browse Source 
* dialer: fix crash instead of returning error

* add NB_SKIP_SOCKET_MARK
This commit is contained in:
Krzysztof Nazarewski (kdn)
2024-11-19 14:14:58 +01:00
committed by GitHub
parent 52ea2e84e9
commit eb5d0569ae
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/net/net_linux.go
View File

@ -4,9 +4,14 @@ package net
import (
"fmt"
"os"
"syscall"
log "github.com/sirupsen/logrus"
)
const EnvSkipSocketMark = "NB_SKIP_SOCKET_MARK"
// SetSocketMark sets the SO_MARK option on the given socket connection
func SetSocketMark(conn syscall.Conn) error {
sysconn, err := conn.SyscallConn()
@ -36,6 +41,13 @@ func SetRawSocketMark(conn syscall.RawConn) error {
func SetSocketOpt(fd int) error {
if CustomRoutingDisabled() {
log.Infof("Custom routing is disabled, skipping SO_MARK")
return nil
}
// Check for the new environment variable
if skipSocketMark := os.Getenv(EnvSkipSocketMark); skipSocketMark == "true" {
log.Info("NB_SKIP_SOCKET_MARK is set to true, skipping SO_MARK")
return nil
}