Fix SetDoxmDeviceId()

Fix SetDoxmDeviceId()
PT check removed
sqlite3 linking removed

Change-Id: I3bced8ba7c8e65ef3b97bea7113eee5cdbde9168
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11543
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/security/SConscript b/resource/csdk/security/SConscript
index 4d72175..2d9e173 100644 (file)
--- a/resource/csdk/security/SConscript
+++ b/resource/csdk/security/SConscript
@@ -114,10 +114,6 @@ libocsrm_src = [
 if libocsrm_env.get('SECURED') == '1':
        if target_os in ['tizen']:
                libocsrm_env.ParseConfig('pkg-config --cflags --libs sqlite3')
-       else:
-               libocsrm_env.AppendUnique(CPPPATH = ['../../../extlibs/sqlite3'])
-               libocsrm_src = libocsrm_src + ['../../../extlibs/sqlite3/sqlite3.c']
-       libocsrm_src = libocsrm_src + [OCSRM_SRC + 'provisioningdatabasemanager.c']
        libocsrm_src = libocsrm_src + [OCSRM_SRC + 'oxmpincommon.c', OCSRM_SRC + 'pbkdf2.c']
 
 if target_os in ['windows', 'msys_nt']:

diff --git a/resource/csdk/security/provisioning/SConscript b/resource/csdk/security/provisioning/SConscript
index 2958f9e..84bae32 100644 (file)
--- a/resource/csdk/security/provisioning/SConscript
+++ b/resource/csdk/security/provisioning/SConscript
@@ -101,7 +101,8 @@ provisioning_src = [
        'src/secureresourceprovider.c',
        'src/ocprovisioningmanager.c',
        'src/oxmjustworks.c',
-       'src/oxmrandompin.c' ]
+       'src/oxmrandompin.c',
+       'src/provisioningdatabasemanager.c' ]
 
 if target_os not in ['tizen', 'windows', 'msys_nt']:
        provisioning_src = provisioning_src + [root_dir+'/extlibs/sqlite3/sqlite3.c' ]

diff --git a/resource/csdk/security/include/internal/provisioningdatabasemanager.h b/resource/csdk/security/provisioning/include/internal/provisioningdatabasemanager.h
similarity index 100%
rename from resource/csdk/security/include/internal/provisioningdatabasemanager.h
rename to resource/csdk/security/provisioning/include/internal/provisioningdatabasemanager.h

diff --git a/resource/csdk/security/src/provisioningdatabasemanager.c b/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
similarity index 100%
rename from resource/csdk/security/src/provisioningdatabasemanager.c
rename to resource/csdk/security/provisioning/src/provisioningdatabasemanager.c

diff --git a/resource/csdk/security/src/doxmresource.c b/resource/csdk/security/src/doxmresource.c
index 52ee663..60c2949 100644 (file)
--- a/resource/csdk/security/src/doxmresource.c
+++ b/resource/csdk/security/src/doxmresource.c
@@ -50,8 +50,6 @@
 #include "credresource.h"
 #include "srmutility.h"
 #include "pinoxmcommon.h"
-#include "pmtypes.h"
-#include "provisioningdatabasemanager.h"
 
 #define TAG  "SRM-DOXM"
 
@@ -1224,36 +1222,9 @@ OCStackResult SetDoxmDeviceID(const OicUuid_t *deviceID)
 
     //Check the device's OTM state
 
-#ifdef __WITH_DTLS__
-    //for PT.
-    if(true == gDoxm->owned &&
-       memcmp(gDoxm->deviceID.id, gDoxm->owner.id, sizeof(gDoxm->owner.id)) == 0)
-    {
-        OCUuidList_t* ownedDevices = NULL;
-        size_t* ownedDevNum = 0;
-
-        if(OC_STACK_OK == PDMGetOwnedDevices(&ownedDevices, &ownedDevNum))
-        {
-            OCUuidList_t* temp1 = NULL;
-            OCUuidList_t* temp2 = NULL;
-            LL_FOREACH_SAFE(ownedDevices, temp1, temp2)
-            {
-                LL_DELETE(ownedDevices, temp1);
-                OICFree(temp1);
-            }
-
-            if(0 != ownedDevNum)
-            {
-                OIC_LOG(ERROR, TAG, "This device has ownership for other device.");
-                OIC_LOG(ERROR, TAG, "Device UUID cannot be changed to guarantee the reliability of the connection.");
-                return OC_STACK_ERROR;
-            }
-        }
-
-        isPT = true;
-    }
+#ifdef __WITH_DTLS__}
     //for normal device.
-    else if(true == gDoxm->owned)
+    if(true == gDoxm->owned)
     {
         OIC_LOG(ERROR, TAG, "This device owned by owner's device.");
         OIC_LOG(ERROR, TAG, "Device UUID cannot be changed to guarantee the reliability of the connection.");