gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-25 00:24:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #483 from gravitl/hotfix_v0.9.0linux_build

Browse source 
fixing build dependency issues
This commit is contained in:
Alex 2021-11-18 00:04:23 -05:00 committed by GitHub
commit e02ace0698
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
netclient/ncutils/netclientutils_darwin.go
View file

@ -1,9 +1,13 @@
package ncutils
import (
"fmt"
"log"
"os/exec"
"strconv"
"strings"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
// RunCmd - runs a local command
@ -19,6 +23,10 @@ func RunCmd(command string, printerr bool) (string, error) {
return string(out), err
}
func RunCmdFormatted(command string, printerr bool) (string, error) {
return "", nil
}
// 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) {
peersString, err := parsePeers(perskeepalive, peers)

43
netclient/ncutils/netclientutils_freebsd.go
View file

@ -2,13 +2,20 @@ package ncutils
import (
"context"
"fmt"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"log"
"os/exec"
"strconv"
"strings"
"syscall"
"time"
)
func RunCmdFormatted(command string, printerr bool) (string, error) {
return "", nil
}
// Runs Commands for FreeBSD
func RunCmd(command string, printerr bool) (string, error) {
args := strings.Fields(command)
@ -27,3 +34,39 @@ func RunCmd(command string, printerr bool) (string, error) {
}
return string(out), err
}
// 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) {
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
}
config := fmt.Sprintf(`[Interface]
Address = %s
PrivateKey = %s
MTU = %s
%s
%s
%s
`,
address+"/32",
privatekey,
strconv.Itoa(int(mtu)),
listenPortString,
fwmarkString,
peersString)
return config, nil
}

8
netclient/ncutils/netclientutils_linux.go
View file

@ -1,9 +1,13 @@
package ncutils
import (
"fmt"
"log"
"os/exec"
"strconv"
"strings"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
// RunCmd - runs a local command
@ -19,6 +23,10 @@ func RunCmd(command string, printerr bool) (string, error) {
return string(out), err
}
func RunCmdFormatted(command string, printerr bool) (string, error) {
return "", nil
}
// 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) {
peersString, err := parsePeers(perskeepalive, peers)