modify provisioning API for iotivity 1.2.0

Change-Id: I221b50aef093c7578463ebedfd267ba170042f2d
Signed-off-by: youngman <yman.jung@samsung.com>

diff --git a/src/ic-provisioning-find.c b/src/ic-provisioning-find.c
index 0ec9d41..9e599f4 100644 (file)
--- a/src/ic-provisioning-find.c
+++ b/src/ic-provisioning-find.c
@@ -134,6 +134,7 @@ static icl_provisioning_find_cb_s* _provisioning_find_cb_ref(
 static int _provisioning_find_create_device(const char *addr,
                const uint16_t port,
                OCTransportAdapter adapter,
+               OCTransportFlags flags,
                OCConnectivityType conn_type,
                OicSecDoxm_t *doxm,
                OCProvisionDev_t **device_list)
@@ -153,6 +154,7 @@ static int _provisioning_find_create_device(const char *addr,
        snprintf(temp->endpoint.addr, sizeof(temp->endpoint.addr), "%s", addr);
        temp->endpoint.port = port;
        temp->endpoint.adapter = adapter;
+       temp->endpoint.flags = flags;
        temp->connType = conn_type;
        temp->doxm = doxm;
        temp->securePort = DEFAULT_SECURE_PORT;
@@ -612,8 +614,13 @@ static OCStackApplicationResult _provisioning_find_cb(void *ctx, OCDoHandle hand
 
        container->cb_data = _provisioning_find_cb_ref(ctx);
 
-       ret = _provisioning_find_create_device(resp->devAddr.addr, resp->devAddr.port,
-                       resp->devAddr.adapter, resp->connType, doxm, &container->oic_device);
+       ret = _provisioning_find_create_device(resp->devAddr.addr,
+                       resp->devAddr.port,
+                       resp->devAddr.adapter,
+                       resp->devAddr.flags,
+                       resp->connType,
+                       doxm,
+                       &container->oic_device);
        if (OC_STACK_OK != ret) {
                ERR("_provisioning_find_create_device() Fail(%d)", ret);
                DeleteDoxmBinData(doxm);

diff --git a/src/ic-provisioning.c b/src/ic-provisioning.c
index f4df214..bd72e0c 100644 (file)
--- a/src/ic-provisioning.c
+++ b/src/ic-provisioning.c
@@ -35,6 +35,9 @@
 
 #define ICL_PROVISIONING_TIMEOUT_MAX 10
 
+static GQueue *icl_register_queue;
+static pthread_mutex_t icl_register_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 struct icl_provisioning_randompin_cb_container {
        iotcon_provisioning_randompin_cb cb;
        void *user_data;
@@ -222,6 +225,24 @@ API int iotcon_provisioning_set_randompin_cb(iotcon_provisioning_randompin_cb cb
 }
 
 
+static void _provisioning_register_mutex_lock()
+{
+       int ret;
+
+       ret = pthread_mutex_lock(&icl_register_mutex);
+       WARN_IF(0 != ret, "pthread_mutex_lock() Fail(%d)", ret);
+}
+
+
+static void _provisioning_register_mutex_unlock()
+{
+       int ret;
+
+       ret = pthread_mutex_unlock(&icl_register_mutex);
+       WARN_IF(0 != ret, "pthread_mutex_unlock() Fail(%d)", ret);
+}
+
+
 static void _provisioning_ownership_transfer_cb_container_destroy(
                struct icl_provisioning_ownership_transfer_cb_container *container)
 {
@@ -268,14 +289,50 @@ static void _provisioning_ownership_transfer_cb(void *ctx, int n_of_res,
 }
 
 
+static gboolean _provisioning_register_unowned_device(gpointer p)
+{
+       int ret;
+       OCProvisionDev_t *dev_list;
+       struct icl_provisioning_ownership_transfer_cb_container *container;
+
+       _provisioning_register_mutex_lock();
+       if (TRUE == g_queue_is_empty(icl_register_queue)) {
+               g_queue_free(icl_register_queue);
+               icl_register_queue = NULL;
+               _provisioning_register_mutex_unlock();
+               return G_SOURCE_REMOVE;
+       }
+
+       container = g_queue_pop_tail(icl_register_queue);
+       _provisioning_register_mutex_unlock();
+
+       dev_list = icl_provisioning_device_get_device(container->device);
+
+       ret = icl_ioty_mutex_lock();
+       if (IOTCON_ERROR_NONE != ret) {
+               ERR("icl_ioty_mutex_lock() Fail(%d)", ret);
+               g_queue_push_tail(icl_register_queue, container);
+               return G_SOURCE_CONTINUE;
+       }
+
+       ret = OCDoOwnershipTransfer(container, dev_list, _provisioning_ownership_transfer_cb);
+       icl_ioty_mutex_unlock();
+       if (OC_STACK_OK != ret) {
+               ERR("OCDoOwnershipTransfer() Fail(%d)", ret);
+               _provisioning_ownership_transfer_cb_container_destroy(container);
+               return G_SOURCE_CONTINUE;
+       }
+
+       return G_SOURCE_CONTINUE;
+}
+
+
 API int iotcon_provisioning_register_unowned_device(
                iotcon_provisioning_device_h device,
                iotcon_provisioning_ownership_transfer_cb cb,
                void *user_data)
 {
        FN_CALL;
-       int ret;
-       OCProvisionDev_t *dev_list;
        struct icl_provisioning_ownership_transfer_cb_container *container;
 
        RETV_IF(false == ic_utils_check_ocf_feature(), IOTCON_ERROR_NOT_SUPPORTED);
@@ -298,22 +355,13 @@ API int iotcon_provisioning_register_unowned_device(
 
        container->device = icl_provisioning_device_ref(device);
 
-       dev_list = icl_provisioning_device_get_device(device);
-
-       ret = icl_ioty_mutex_lock();
-       if (IOTCON_ERROR_NONE != ret) {
-               ERR("icl_ioty_mutex_lock() Fail(%d)", ret);
-               _provisioning_ownership_transfer_cb_container_destroy(container);
-               return ret;
-       }
-
-       ret = OCDoOwnershipTransfer(container, dev_list, _provisioning_ownership_transfer_cb);
-       icl_ioty_mutex_unlock();
-       if (OC_STACK_OK != ret) {
-               ERR("OCDoOwnershipTransfer() Fail(%d)", ret);
-               _provisioning_ownership_transfer_cb_container_destroy(container);
-               return _provisioning_parse_oic_error(ret);
+       _provisioning_register_mutex_lock();
+       if (NULL == icl_register_queue) {
+               icl_register_queue = g_queue_new();
+               g_timeout_add_seconds(2, _provisioning_register_unowned_device, NULL);
        }
+       g_queue_push_head(icl_register_queue, container);
+       _provisioning_register_mutex_unlock();
 
        return IOTCON_ERROR_NONE;
 }