mesh: Handle close for Acceptor

Provision complete callback is handled in provision failure case.
If link closed received abruptly with reason success, triggered
provision complete callback. Removed session timeout and session
free as they are handled in pb_adv_unreg.

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

diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
index e54a615b7e1a692a61a57d9bbc19a704dda432f6..c1316ed1b4722c9666d3b0675225322acd40d416 100644 (file)
--- a/mesh/pb-adv.c
+++ b/mesh/pb-adv.c
@@ -223,9 +223,6 @@ static void tx_timeout(struct l_timeout *timeout, void *user_data)
        if (!l_queue_find(pb_sessions, session_match, session))
                return;
 
-       l_timeout_remove(session->tx_timeout);
-       session->tx_timeout = NULL;
-
        mesh_send_cancel(filter, sizeof(filter));
 
        l_info("TX timeout");
@@ -392,17 +389,8 @@ static void pb_adv_packet(void *user_data, const uint8_t *pkt, uint16_t len)
                break;
 
        case PB_ADV_CLOSE:
-               l_timeout_remove(session->tx_timeout);
                l_debug("Link closed notification: %2.2x", pkt[0]);
-               /* Wrap callback for pre-cleaning */
-               if (true) {
-                       mesh_prov_close_func_t cb = session->close_cb;
-                       void *user_data = session->user_data;
-
-                       l_queue_remove(pb_sessions, session);
-                       l_free(session);
-                       cb(user_data, pkt[0]);
-               }
+               session->close_cb(session->user_data, pkt[0]);
                break;
 
        case PB_ADV_ACK:

diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index 903abc2ff2947cdbd760cbf5a140506ed34a938c..5231616ee6937e1f23b88d51fb1679bd02738822 100644 (file)
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c
@@ -120,7 +120,18 @@ static void acceptor_free(void)
 
 static void acp_prov_close(void *user_data, uint8_t reason)
 {
-       /* TODO: Handle Close */
+       struct mesh_prov_acceptor *rx_prov = user_data;
+
+       if (rx_prov != prov)
+               return;
+
+       if (reason == PROV_ERR_SUCCESS)
+               reason = PROV_ERR_UNEXPECTED_ERR;
+
+       if (prov->cmplt)
+               prov->cmplt(prov->caller_data, reason, NULL);
+
+       prov->cmplt = NULL;
        acceptor_free();
 }