zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-13 04:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing client issues for uspace, fwmark, vpn

Browse Source
This commit is contained in:
afeiszli
2021-11-29 04:34:11 -05:00
parent 07b2055abf
commit 801919ab0d
14 changed files with 122 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netclient/ncutils/netclientutils_linux.go
View File

@@ -28,19 +28,15 @@ func RunCmdFormatted(command string, printerr bool) (string, error) {
}
// CreateUserSpaceConf - creates a user space WireGuard conf
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, fwmark int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
func CreateUserSpaceConf(address string, privatekey string, listenPort string, mtu int32, perskeepalive int32, peers []wgtypes.PeerConfig) (string, error) {
peersString, err := parsePeers(perskeepalive, peers)
var listenPortString string
var fwmarkString string
if mtu <= 0 {
mtu = 1280
}
if listenPort != "" {
listenPortString += "ListenPort = " + listenPort
}
if fwmark != 0 {
fwmarkString += "FWMark = " + strconv.Itoa(int(fwmark))
}
if err != nil {
return "", err
}
@@ -49,7 +45,6 @@ Address = %s
PrivateKey = %s
MTU = %s
%s
%s
%s
@@ -58,7 +53,6 @@ MTU = %s
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
fwmarkString,
peersString)
return config, nil
}