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

merge conflicts resolved

Browse Source
This commit is contained in:
Abhishek Kondur
2022-09-26 17:47:20 +05:30
parent 698a4be861 f35429f768
commit f632bec11d
123 changed files with 5080 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
netclient/functions/daemon.go
View File

@@ -94,11 +94,13 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
cfg := config.ClientConfig{}
cfg.Network = network
cfg.ReadConfig()
if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, ncutils.GetNetclientPathSpecific()+cfg.Node.Interface+".conf"); err != nil {
logger.Log(0, "failed to start ", cfg.Node.Interface, "wg interface", err.Error())
}
if cfg.PublicIPService != "" {
global_settings.PublicIPServices[network] = cfg.PublicIPService
if cfg.Node.Connected == "yes" {
if err := wireguard.ApplyConf(&cfg.Node, cfg.Node.Interface, ncutils.GetNetclientPathSpecific()+cfg.Node.Interface+".conf"); err != nil {
logger.Log(0, "failed to start ", cfg.Node.Interface, "wg interface", err.Error())
}
if cfg.PublicIPService != "" {
global_settings.PublicIPServices[network] = cfg.PublicIPService
}
}
server := cfg.Server.Server
@@ -106,10 +108,7 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
// == subscribe to all nodes for each on machine ==
serverSet[server] = true
logger.Log(1, "started daemon for server ", server)
err := local.SetNetmakerDomainRoute(cfg.Server.API)
if err != nil {
logger.Log(0, "error setting route for netmaker: "+err.Error())
}
local.SetNetmakerDomainRoute(cfg.Server.API)
wg.Add(1)
go messageQueue(ctx, wg, &cfg)
}