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

refactored continue

Browse Source
This commit is contained in:
0xdcarns
2022-01-29 10:28:12 -05:00
parent 3dadb8dcbf
commit 2d703dce7c
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/node_grpc.go
View File

@@ -90,6 +90,8 @@ func (s *NodeServiceServer) CreateNode(ctx context.Context, req *nodepb.Object)
Mod: node.TrafficKeys.Mod, Mod: node.TrafficKeys.Mod,
E: node.TrafficKeys.E, E: node.TrafficKeys.E,
Server: key, Server: key,
Smod: *key.N,
SE: key.E,
} }
err = logic.CreateNode(&node) err = logic.CreateNode(&node)

2
models/structs.go
View File

@@ -191,4 +191,6 @@ type TrafficKeys struct {
Mod big.Int `json:"mod" bson:"mod" yaml:"mod"` Mod big.Int `json:"mod" bson:"mod" yaml:"mod"`
E int `json:"e" bson:"e" yaml:"e"` E int `json:"e" bson:"e" yaml:"e"`
Server rsa.PublicKey `json:"server" bson:"server" yaml:"server"` Server rsa.PublicKey `json:"server" bson:"server" yaml:"server"`
Smod big.Int `json:"smod" bson:"smod" yaml:"smod"`
SE int `json:"se" bson:"se" yaml:"se"`
} }

3
mq/mq.go
View File

@@ -106,6 +106,9 @@ func PublishPeerUpdate(newNode *models.Node) error {
return err return err
} }
for _, node := range networkNodes { for _, node := range networkNodes {
if node.IsServer == "yes" {
continue
}
peerUpdate, err := logic.GetPeerUpdate(&node) peerUpdate, err := logic.GetPeerUpdate(&node)
if err != nil { if err != nil {
logger.Log(1, "error getting peer update for node ", node.ID, err.Error()) logger.Log(1, "error getting peer update for node ", node.ID, err.Error())

2
netclient/functions/daemon.go
View File

@@ -371,6 +371,8 @@ func Hello(cfg *config.ClientConfig, network string) {
func publish(cfg *config.ClientConfig, dest string, msg []byte) error { func publish(cfg *config.ClientConfig, dest string, msg []byte) error {
client := SetupMQTT(cfg) client := SetupMQTT(cfg)
defer client.Disconnect(250) defer client.Disconnect(250)
cfg.Node.TrafficKeys.Server.E = cfg.Node.TrafficKeys.SE
cfg.Node.TrafficKeys.Server.N = &cfg.Node.TrafficKeys.Smod
encrypted := ncutils.BuildMessage(msg, &cfg.Node.TrafficKeys.Server) encrypted := ncutils.BuildMessage(msg, &cfg.Node.TrafficKeys.Server)
if encrypted == "" { if encrypted == "" {
return fmt.Errorf("could not encrypt message") return fmt.Errorf("could not encrypt message")