mesh: Clean up handling of config poll timeout message

This modification allows using a single point for sending out
the composed status messages by the Config Server.

Change-Id: I0d04b74c9619e53319f1443a4c331ec33d40ef18
Signed-off-by: anuj.bhumiya <anuj.bhumiya@samsung.com>

diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index 176f99a..a1a5219 100644 (file)
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -642,6 +642,25 @@ static uint16_t cfg_get_appkeys_msg(struct mesh_node *node, const uint8_t *pkt)
        return n + 3 + sz;
 }
 
+static uint16_t cfg_poll_timeout_msg(struct mesh_node *node, const uint8_t *pkt)
+{
+       uint16_t n, addr = l_get_le16(pkt);
+       uint32_t poll_to;
+
+       if (!IS_UNICAST(addr))
+               return 0;
+
+       n = mesh_model_opcode_set(OP_CONFIG_POLL_TIMEOUT_STATUS, msg);
+       l_put_le16(addr, msg + n);
+       n += 2;
+
+       poll_to = mesh_net_friend_timeout(node_get_net(node), addr);
+       msg[n++] = poll_to;
+       msg[n++] = poll_to >> 8;
+       msg[n++] = poll_to >> 16;
+       return n;
+}
+
 static uint16_t get_composition(struct mesh_node *node, uint8_t page,
                                                                uint8_t *buf)
 {
@@ -677,7 +696,7 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx,
        struct mesh_net *net;
        const uint8_t *pkt = data;
        struct timeval time_now;
-       uint32_t opcode, tmp32;
+       uint32_t opcode;
        int b_res = MESH_STATUS_SUCCESS;
        struct mesh_net_heartbeat *hb;
        uint16_t n_idx;
@@ -1116,18 +1135,11 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx,
                msg[n++] = hb->sub_max_hops;
                break;
 
-       case OP_CONFIG_POLL_TIMEOUT_LIST:
-               if (size != 2 || l_get_le16(pkt) == 0 ||
-                                               l_get_le16(pkt) > 0x7fff)
+       case OP_CONFIG_POLL_TIMEOUT_GET:
+               if (size != 2)
                        return true;
 
-               n = mesh_model_opcode_set(OP_CONFIG_POLL_TIMEOUT_STATUS, msg);
-               l_put_le16(l_get_le16(pkt), msg + n);
-               n += 2;
-               tmp32 = mesh_net_friend_timeout(net, l_get_le16(pkt));
-               msg[n++] = tmp32;
-               msg[n++] = tmp32 >> 8;
-               msg[n++] = tmp32 >> 16;
+               n = cfg_poll_timeout_msg(node, pkt);
                break;
 
        case OP_NODE_RESET:

diff --git a/mesh/cfgmod.h b/mesh/cfgmod.h
index 7b6a958..6d73656 100644 (file)
--- a/mesh/cfgmod.h
+++ b/mesh/cfgmod.h
@@ -66,7 +66,7 @@
 #define OP_CONFIG_MODEL_SUB_LIST               0x802A
 #define OP_CONFIG_VEND_MODEL_SUB_GET           0x802B
 #define OP_CONFIG_VEND_MODEL_SUB_LIST          0x802C
-#define OP_CONFIG_POLL_TIMEOUT_LIST            0x802D
+#define OP_CONFIG_POLL_TIMEOUT_GET             0x802D
 #define OP_CONFIG_POLL_TIMEOUT_STATUS          0x802E
 /* Health opcodes in health-mod.h */
 #define OP_CONFIG_HEARTBEAT_PUB_GET            0x8038