From: saerome.kim <saerome.kim@samsung.com>
Date: Wed, 7 Mar 2018 06:26:56 +0000 (+0900)
Subject: Update README.md
X-Git-Tag: submit/tizen/20190131.065036~101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef561fefbf183c3b630d63b31081035b0b3e823f;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git

Update README.md

- update iotivity patches

Signed-off-by: saerome.kim <saerome.kim@samsung.com>
---

diff --git a/README.md b/README.md
index 3d4ed9e..e51ef87 100644
--- a/README.md
+++ b/README.md
@@ -7,22 +7,141 @@ defines.append('-DMULTIPLE_OWNER=1')
 ```
 ### 2. packaging/iotivity.spec
 ```sh
-%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 1}
-@@ -268,6 +270,14 @@ cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat %{ex_install_dir}/provision-sample/
-cp ./extlibs/cjson/cJSON.h %{buildroot}%{_includedir}
-cp -R ./resource/csdk/connectivity/lib/libcoap-4.1.1/include/* %{buildroot}%{_includedir}
+--- a/packaging/iotivity.spec
++++ b/packaging/iotivity.spec
+@@ -1,6 +1,6 @@
+ Name: iotivity
+ Version: 1.2.1
+-Release: 0
++Release: 9
+ Summary: Samsung IoT Connectivity
+ Group: Network & Connectivity / IoT Connectivity
+ License: Apache-2.0
+@@ -37,7 +37,7 @@ Source1002: %{name}-test.manifest
+ 
+ # default is RELEASE mode.
+ # If DEBUG mode is needed, please use tizen_build_devel_mode
+-%define RELEASE True
++%define RELEASE False
+ # For Example
+ %if %{RELEASE} == "True"
+ %define build_mode release
+@@ -89,7 +89,7 @@ Source1002: %{name}-test.manifest
+ %{!?BLE_CUSTOM_ADV: %define BLE_CUSTOM_ADV False}
+ %{!?BLE_DIVISION: %define BLE_DIVISION VD}
+ %{!?BLE_TIZEN_30: %define BLE_TIZEN_30 True}
+-%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 0}
++%{!?MULTIPLE_OWNER: %define MULTIPLE_OWNER 1}
+ 
+ BuildRequires:  expat-devel
+ BuildRequires:  python, libcurl-devel
+@@ -194,7 +194,7 @@ scons %{JOB} --prefix=%{_prefix} \
+ mkdir -p %{buildroot}/%{_datadir}/license
+ cp LICENSE %{buildroot}/%{_datadir}/license/%{name}
+ %endif
+-rm -rf %{buildroot}
++#rm -rf %{buildroot}
+ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
+ scons install --install-sandbox=%{buildroot} --prefix=%{_prefix} \
+     ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} \
 @@ -259,6 +259,14 @@ cp ./resource/csdk/security/include/*.h %{buildroot}%{_includedir}
  cp ./resource/csdk/connectivity/api/*.h %{buildroot}%{_includedir}/
  cp ./resource/csdk/security/include/internal/*.h %{buildroot}%{_includedir}/
  cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
-+cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/pro
++cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/provision-sample/
 +cp ./resource/csdk/security/provisioning/sample/oic_svr_db_client.dat %{ex_install_dir}/provision-sample/
 +%if 0%{MULTIPLE_OWNER} == 1
-+cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/csdk/security/provisioning/sample/subownerclient %{ex_install_dir}/provisi
++cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/csdk/security/provisioning/sample/subownerclient %{ex_install_dir}/provision-sample/
 +cp ./resource/csdk/security/provisioning/sample/oic_svr_db_subowner_client.dat %{ex_install_dir}/provision-sample/
-+cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_preconfpin %{ex_install_dir
++cp out/%{TARGET_OS}/%{TARGET_ARCH}/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_preconfpin %{ex_install_dir}/provision-sample/
 +cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_preconfpin.dat %{ex_install_dir}/provision-sample/
 +%endif
+ cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
+ cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
+ cp ./resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{buildroot}%{_libdir}/oic_svr_db_server.dat
+@@ -286,7 +294,7 @@ ln -fs ../resource %{buildroot}%{_includedir}/iotivity/
+
+```
+
+### 3. policyengine.c
+```sh
+--- a/resource/csdk/security/src/policyengine.c
++++ b/resource/csdk/security/src/policyengine.c
+@@ -192,7 +192,7 @@ static bool IsRequestFromSubOwner(PEContext_t *context)
+  */
+ static bool IsValidRequestFromSubOwner(PEContext_t *context)
+ {
+-    bool isValidRequest = false;
++    bool isValidRequest = true;
+ 
+     if(NULL == context)
+     {
+@@ -294,7 +294,7 @@ bool IsRequestFromResourceOwner(PEContext_t *context)
+     {
+         if(OC_STACK_OK == GetSvrRownerId[(int)context->resourceType](&resourceOwner))
+         {
+-            retVal = UuidCmp(&context->subject, &resourceOwner);
++            retVal = true;//UuidCmp(&context->subject, &resourceOwner);
+         }
+     }
+ 
+```
+
+### 4. provisioningdatabasemanager.c
+
+```sh
+--- a/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
++++ b/resource/csdk/security/provisioning/src/provisioningdatabasemanager.c
+@@ -44,7 +44,7 @@
+ #define PDM_BIND_INDEX_THIRD 3
+ 
+ #define PDM_CREATE_T_DEVICE_LIST "create table T_DEVICE_LIST(ID INTEGER PRIMARY KEY AUTOINCREMENT,\
+-                                  UUID BLOB NOT NULL UNIQUE, STATE INT NOT NULL);"
++                                  UUID BLOB NOT NULL, STATE INT NOT NULL);"
+ 
+ #define PDM_CREATE_T_DEVICE_LINK  "create table T_DEVICE_LINK_STATE(ID INT NOT NULL, ID2 INT NOT \
+                                    NULL,STATE INT NOT NULL, PRIMARY KEY (ID, ID2));"
+
+```
+
+### 5. octypes.h
+```sh
+--- a/resource/csdk/stack/include/octypes.h
++++ b/resource/csdk/stack/include/octypes.h
+@@ -1052,7 +1052,9 @@ typedef enum
+     OC_STACK_SERVICE_UNAVAILABLE,    /** 503*/
+     OC_STACK_GATEWAY_TIMEOUT,        /** 504*/
+     OC_STACK_PROXY_NOT_SUPPORTED,    /** 505*/
+-
++#ifdef MULTIPLE_OWNER
++       OC_STACK_LINK_ALREADY_EXIST,
++#endif
+     /** ERROR in stack.*/
+     OC_STACK_ERROR = 255
+     /** Error status code - END HERE.*/
+```
+
+### 6. multipleownershiptransfermanager.c
+```sh
+--- a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
++++ b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c
+@@ -652,14 +652,14 @@ OCStackResult MOTAddPreconfigPIN(const OCProvisionDev_t *targetDeviceInfo,
+     VERIFY_NON_NULL(TAG, preconfPIN, ERROR);
+     VERIFY_SUCCESS(TAG, (0 != preconfPINLen), ERROR);
+     VERIFY_SUCCESS(TAG, (0 != preconfPINLen && OXM_PRECONFIG_PIN_MAX_SIZE >= preconfPINLen), ERROR);
+-
++#if 0
+     OicSecCred_t* prevCred = GetCredResourceData(&targetDeviceInfo->doxm->deviceID);
+     if(NULL != prevCred)
+     {
+         OIC_LOG(INFO, TAG, "PIN/PW Credential already exist!");
+         return OC_STACK_OK;
+     }
+-
++#endif
+     addCredRes = OC_STACK_NO_MEMORY;
+     //Generate PIN based credential
+     pinCred = (OicSecCred_t*)OICCalloc(1, sizeof(OicSecCred_t));
 ```
 
 After iotivity build succeeds, copy the following package to GBS-ROOT.