Update README.md

- update iotivity patches

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

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