v0.2.1

MatejLach · Sep 25, 2023 · 08c9e30 · 08c9e30
1 parent 7a05471
commit 08c9e30
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/provider/turris/delta.go b/provider/turris/delta.go
@@ -13,7 +13,7 @@ import (
 type Delta struct {
 	Operation string
 	IP        net.IP
-	Serial    uint16
+	Serial    uint32
 	Timestamp time.Time
 }
 
@@ -38,7 +38,11 @@ func (c *Client) decodeDelta(rawMsg []byte) (Delta, error) {
 
 	operation := rawMap["delta"].(string)
 	ip := rawMap["ip"].(string)
-	serial := rawMap["serial"].(uint16)
+	serial, ok := rawMap["serial"].(uint32)
+	if !ok {
+		serial = uint32(rawMap["serial"].(uint16))
+	}
+
 	ts := rawMap["ts"].(uint32)
 
 	return Delta{

diff --git a/provider/turris/list.go b/provider/turris/list.go
@@ -12,7 +12,7 @@ import (
 
 type List struct {
 	Version   time.Time
-	Serial    uint16
+	Serial    uint32
 	Blacklist []net.IP
 	Timestamp time.Time
 }
@@ -38,7 +38,11 @@ func (c *Client) decodeList(rawMsg []byte) (List, error) {
 	}
 
 	version := rawMap["version"].(uint32)
-	serial := rawMap["serial"].(uint16)
+	serial, ok := rawMap["serial"].(uint32)
+	if !ok {
+		serial = uint32(rawMap["serial"].(uint16))
+	}
+
 	rawBlocklist := rawMap["list"].([]interface{})
 	ts := rawMap["ts"].(uint32)
 

diff --git a/provider/turris/turris.go b/provider/turris/turris.go
@@ -112,7 +112,7 @@ func (c *Client) Connect() error {
 }
 
 func (c *Client) RequestMessages(ctx context.Context) {
-	var previousDeltaSerial uint16
+	var previousDeltaSerial uint32
 	refreshList := true // upon launch, initialize the list
 
 	for {
@@ -173,7 +173,7 @@ func (c *Client) RequestMessages(ctx context.Context) {
 	}
 }
 
-func serialOk(oldSerial, currentSerial uint16) bool {
+func serialOk(oldSerial, currentSerial uint32) bool {
 	if (oldSerial+1 == currentSerial) || oldSerial == 0 {
 		return true
 	}