zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-30 19:56:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed startup logs. Removed comms from network list

Browse Source
This commit is contained in:
afeiszli
2021-05-30 11:26:10 -04:00
parent 8dfd81794d
commit b3655d2fdf
7 changed files with 121 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
serverctl/wireguard.go
View File

@@ -1,6 +1,7 @@
package serverctl
import (
//"github.com/davecgh/go-spew/spew"
"os"
"log"
"context"
@@ -38,8 +39,7 @@ func InitServerWireGuard() error {
err = netlink.LinkAdd(wglink)
if err != nil {
if os.IsExist(err) {
log.Println("interface " + ifaceSettings.Name + " already exists")
log.Println("continuing setup using existing interface")
log.Println("WireGuard interface " + ifaceSettings.Name + " already exists. Skipping...")
} else {
return err
}
@@ -50,13 +50,8 @@ func InitServerWireGuard() error {
}
err = netlink.AddrAdd(wglink, address)
if err != nil {
if os.IsExist(err) {
log.Println("address " + wgconfig.GRPCWGAddress + " already exists")
log.Println("continuing with existing setup")
} else {
if err != nil && !os.IsExist(err){
return err
}
}
err = netlink.LinkSetUp(wglink)
if err != nil {
@@ -138,7 +133,6 @@ func ReconfigureServerWireGuard() error {
if err != nil {
return err
}
wgserver, err := wgctrl.New()
if err != nil {
return err
@@ -180,10 +174,10 @@ func ReconfigureServerWireGuard() error {
ReplacePeers: true,
Peers: serverpeers,
}
err = wgserver.ConfigureDevice(servercfg.GetGRPCWGInterface(), wgconf)
wgiface := servercfg.GetGRPCWGInterface()
err = wgserver.ConfigureDevice(wgiface, wgconf)
if err != nil {
return err
}
return nil
}