mesh: Correct u32 to u8 log transformation

Fixed the log transformation to correctly follow the value mapping
defined in the mesh profile (section 4.1.2).

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index 9bc2f1c..33796d0 100644 (file)
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -455,14 +455,14 @@ done:
 static uint8_t uint32_to_log(uint32_t value)
 {
        uint32_t val = 1;
-       uint8_t ret = 1;
+       uint8_t ret = 0;
 
        if (!value)
                return 0;
        else if (value > 0x10000)
                return 0xff;
 
-       while (val < value) {
+       while (val <= value) {
                val <<= 1;
                ret++;
        }
@@ -495,7 +495,7 @@ static uint16_t hb_subscription_get(struct mesh_node *node, int status)
        l_put_le16(sub->dst, msg + n);
        n += 2;
        msg[n++] = uint32_to_log(time_now.tv_sec);
-       msg[n++] = uint32_to_log(sub->count);
+       msg[n++] = sub->count != 0xffff ? uint32_to_log(sub->count) : 0xff;
        msg[n++] = sub->count ? sub->min_hops : 0;
        msg[n++] = sub->max_hops;
 
@@ -538,7 +538,7 @@ static uint16_t hb_publication_get(struct mesh_node *node, int status)
        msg[n++] = status;
        l_put_le16(pub->dst, msg + n);
        n += 2;
-       msg[n++] = uint32_to_log(pub->count);
+       msg[n++] = pub->count != 0xffff ? uint32_to_log(pub->count) : 0xff;
        msg[n++] = uint32_to_log(pub->period);
        msg[n++] = pub->ttl;
        l_put_le16(pub->features, msg + n);