浏览代码

change signal const to strings

Signed-off-by: Matthew R. Kasun <[email protected]>
Matthew R. Kasun 3 年之前
父节点
当前提交
736c8b71fd
共有 3 个文件被更改,包括 15 次插入15 次删除
  1. 11 11
      mq/handlers.go
  2. 2 2
      netclient/functions/daemon.go
  3. 2 2
      netclient/ncutils/constants.go

+ 11 - 11
mq/handlers.go

@@ -41,11 +41,11 @@ func Ping(client mqtt.Client, msg mqtt.Message) {
 		//	logger.Log(0, "error decrypting when updating node ", node.ID, decryptErr.Error())
 		//	return
 		//}
-		if err := json.Unmarshal(msg.Payload(), &node.Version); err != nil {
-			logger.Log(0, "error getting version from payload ", node.ID, err.Error())
-			return
-		}
-
+		//if err := json.Unmarshal(msg.Payload(), &node.Version); err != nil {
+		//	logger.Log(0, "error getting version from payload ", node.ID, err.Error())
+		//	return
+		//}
+		node.Version = string(msg.Payload())
 		node.SetLastCheckIn()
 		if err := logic.UpdateNode(&node, &node); err != nil {
 			logger.Log(0, "error updating node", node.Name, node.ID, " on checkin", err.Error())
@@ -108,13 +108,13 @@ func ClientPeerUpdate(client mqtt.Client, msg mqtt.Message) {
 		//	logger.Log(1, "failed to decrypt message during client peer update for node ", id, decryptErr.Error())
 		//	return
 		//}
-		response := []byte{}
-		if err := json.Unmarshal(msg.Payload(), &response); err != nil {
-			logger.Log(1, "failed to decode message during client peer update for node ", id, err.Error())
-			return
-		}
+		response := string(msg.Payload())
+		//if err := json.Unmarshal(msg.Payload(), &response); err != nil {
+		//	logger.Log(1, "failed to decode message during client peer update for node ", id, err.Error())
+		//	return
+		//}
 		//switch decrypted[0] {
-		switch response[0] {
+		switch response {
 		case ncutils.ACK:
 			currentServerNode, err := logic.GetNetworkServerLocal(currentNode.Network)
 			if err != nil {

+ 2 - 2
netclient/functions/daemon.go

@@ -268,8 +268,8 @@ func NewTLSConfig(cfg *config.ClientConfig) *tls.Config {
 }
 
 // publishes a message to server to update peers on this peer's behalf
-func publishSignal(nodeCfg *config.ClientConfig, signal byte) error {
-	if err := publish(nodeCfg, fmt.Sprintf("signal/%s", nodeCfg.Node.ID), []byte{signal}, 1); err != nil {
+func publishSignal(nodeCfg *config.ClientConfig, signal string) error {
+	if err := publish(nodeCfg, fmt.Sprintf("signal/%s", nodeCfg.Node.ID), []byte(signal), 1); err != nil {
 		return err
 	}
 	return nil

+ 2 - 2
netclient/ncutils/constants.go

@@ -2,7 +2,7 @@ package ncutils
 
 const (
 	// ACK - acknowledgement signal for MQ
-	ACK = 1
+	ACK = "ack"
 	// DONE - done signal for MQ
-	DONE = 2
+	DONE = "done"
 )