fixed bug in zos message parsing

threefoldtecharchive · Jun 23, 2023 · 02efd88 · 02efd88
1 parent 3da9baa
commit 02efd88
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/farmerbot/manager/data.v b/farmerbot/manager/data.v
@@ -110,7 +110,7 @@ fn (mut d DataManager) handle_responses(mut node_twin_ids []u32) {
 					d.logger.error('${manager.data_manager_prefix} ${err}')
 					continue
 				}
-				match message.cmd {
+				match message.ref {
 					'zos.system.version' {
 						message.parse_system_version() or {
 							continue
@@ -137,7 +137,10 @@ fn (mut d DataManager) handle_responses(mut node_twin_ids []u32) {
 						node.pools = storage_pools
 					}
 					else {
-						d.logger.warn('${manager.data_manager_prefix} Unknown command ${message.cmd}')
+						if message.ref != '' {
+							d.logger.warn('${manager.data_manager_prefix} Unknown command ${message.ref}')
+						}
+						continue
 					}
 				}
 				// remove from list so that we know which nodes we were able to contact

diff --git a/farmerbot/system/version.v b/farmerbot/system/version.v
@@ -4,7 +4,7 @@ pub const (
 	version_major = u8(0)
 	version_minor = u8(2)
 	version_patch = u8(0)
-	extension     = '-rc3'
+	extension     = '-rc4'
 
 	version       = '${version_major}.${version_minor}.${version_patch}${extension}'
 )
diff --git a/farmerbot/system/zos.v b/farmerbot/system/zos.v
@@ -36,7 +36,6 @@ pub struct RmbResponse {
 pub mut:
 	ver int = 1
 	ref string
-	cmd string
 	dat string
 	src string
 	now u64
@@ -157,6 +156,7 @@ pub fn (mut z ZosRMBPeer) rmb_client_request(cmd string, dsts []u32, data string
 	msg := RmbMessage{
 		ver: 1
 		cmd: cmd
+		ref: cmd
 		exp: exp
 		dat: base64.encode_str(data)
 		dst: dsts