newtmgr; add sequence number to request header.
diff --git a/newtmgr/protocol/nmgr.go b/newtmgr/protocol/nmgr.go
index 4c60517..331c8b2 100644
--- a/newtmgr/protocol/nmgr.go
+++ b/newtmgr/protocol/nmgr.go
@@ -33,7 +33,8 @@
Flags uint8
Len uint16
Group uint16
- Id uint16
+ Seq uint8
+ Id uint8
Data []byte
}
@@ -63,7 +64,8 @@
nmr.Flags = uint8(data[1])
nmr.Len = binary.BigEndian.Uint16(data[2:4])
nmr.Group = binary.BigEndian.Uint16(data[4:6])
- nmr.Id = binary.BigEndian.Uint16(data[6:8])
+ nmr.Seq = uint8(data[6])
+ nmr.Id = uint8(data[7])
data = data[8:]
if int(nmr.Len) != len(data) {
@@ -74,6 +76,8 @@
}
nmr.Data = data
+ log.Debugf("Deserialized response %+v", nmr)
+
return nmr, nil
}
@@ -90,8 +94,8 @@
binary.BigEndian.PutUint16(u16b, nmr.Group)
data = append(data, u16b...)
- binary.BigEndian.PutUint16(u16b, nmr.Id)
- data = append(data, u16b...)
+ data = append(data, byte(nmr.Seq))
+ data = append(data, byte(nmr.Id))
data = append(data, nmr.Data...)