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

comment certs code for mq

Browse Source
This commit is contained in:
Abhishek Kondur
2022-09-15 09:23:33 +05:30
parent 5270c1ede8
commit 7db3bd3aca
6 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netclient/functions/daemon.go
View File

@@ -265,13 +265,15 @@ func setupMQTT(cfg *config.ClientConfig) error {
opts := mqtt.NewClientOptions()
server := cfg.Server.Server
port := cfg.Server.MQPort
opts.AddBroker("ssl://" + server + ":" + port)
tlsConfig, err := NewTLSConfig(server)
if err != nil {
logger.Log(0, "failed to get TLS config for", server, err.Error())
return err
}
opts.SetTLSConfig(tlsConfig)
opts.AddBroker("mqtts://" + server + ":" + port)
// tlsConfig, err := NewTLSConfig(server)
// if err != nil {
// logger.Log(0, "failed to get TLS config for", server, err.Error())
// return err
// }
//opts.SetTLSConfig(tlsConfig)
opts.SetUsername(cfg.Node.ID)
opts.SetPassword(cfg.Node.Password)
opts.SetClientID(ncutils.MakeRandomString(23))
opts.SetDefaultPublishHandler(All)
opts.SetAutoReconnect(true)
@@ -314,7 +316,7 @@ func setupMQTT(cfg *config.ClientConfig) error {
}
}
if connecterr != nil {
reRegisterWithServer(cfg)
//reRegisterWithServer(cfg)
//try after re-registering
if token := mqclient.Connect(); !token.WaitTimeout(30*time.Second) || token.Error() != nil {
return errors.New("unable to connect to broker")

6
netclient/functions/join.go
View File

@@ -206,9 +206,9 @@ func JoinNetwork(cfg *config.ClientConfig, privateKey string) error {
logger.Log(0, "error setting route for netmaker: "+err.Error())
}
cfg.Node = node
if err := Register(cfg); err != nil {
return err
}
// if err := Register(cfg); err != nil {
// return err
// }
logger.Log(0, "starting wireguard")
err = wireguard.InitWireguard(&node, privateKey, nodeGET.Peers[:])

2
netclient/functions/mqpublish.go
View File

@@ -103,7 +103,7 @@ func checkin() {
config.Write(&nodeCfg, nodeCfg.Network)
}
Hello(&nodeCfg)
checkCertExpiry(&nodeCfg)
//checkCertExpiry(&nodeCfg)
}
}