Browse Source

refactored continue

0xdcarns 3 years ago
parent
commit
2d703dce7c
4 changed files with 9 additions and 0 deletions
  1. 2 0
      controllers/node_grpc.go
  2. 2 0
      models/structs.go
  3. 3 0
      mq/mq.go
  4. 2 0
      netclient/functions/daemon.go

+ 2 - 0
controllers/node_grpc.go

@@ -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 - 0
models/structs.go

@@ -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 - 0
mq/mq.go

@@ -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 - 0
netclient/functions/daemon.go

@@ -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")