From 6099bf3be1e3dc9af7315c6f8635b751b5840e6b Mon Sep 17 00:00:00 2001
From: Jihun Ha <jihun.ha@samsung.com>
Date: Tue, 13 Dec 2016 14:20:54 +0900
Subject: [PATCH] Separate MOT-disabled/enabled SVR DB files for enrollee

MOT-disabled Enrollee should not have "PRECONFIG_PIN(0xFF00)" method
in oxms property, e.g. "oxms" : [0, 65280]. If SVR db file include the value
and Mediator can not know the value, Ownership transfer will be failed
because mediator presume that enrollee can support unknown method for
ownership transfer.

Change-Id: I8b50677215105244ad351dc1791c88a34a7cff77
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15547
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit cee9ccbb44d8cff3dd17fdf01a519209d4ad131c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15597
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
---
 service/easy-setup/sampleapp/enrollee/linux/SConscript |   6 +++++-
 .../easy-setup/sampleapp/enrollee/linux/enrolleewifi.c |   4 ++++
 .../sampleapp/enrollee/linux/oic_svr_db_server.dat     | Bin 2167 -> 977 bytes
 .../sampleapp/enrollee/linux/oic_svr_db_server_MOT.dat | Bin 0 -> 2167 bytes
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server_MOT.dat

diff --git a/service/easy-setup/sampleapp/enrollee/linux/SConscript b/service/easy-setup/sampleapp/enrollee/linux/SConscript
index 8918906..e647c22 100644
--- a/service/easy-setup/sampleapp/enrollee/linux/SConscript
+++ b/service/easy-setup/sampleapp/enrollee/linux/SConscript
@@ -68,5 +68,9 @@ i_enrollee = enrollee_env.Install(env.get('BUILD_DIR'), enrollee)
 justworksdat = enrollee_env.Install(env.get('BUILD_DIR') + '/service/easy-setup/sampleapp/enrollee/linux/',
                                     env.get('SRC_DIR') + '/service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server.dat')
 
-Alias('enrollee', [i_enrollee, justworksdat])
+MOTdat = enrollee_env.Install(env.get('BUILD_DIR') + '/service/easy-setup/sampleapp/enrollee/linux/',
+                                    env.get('SRC_DIR') + '/service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server_MOT.dat')
+
+
+Alias('enrollee', [i_enrollee, justworksdat, MOTdat])
 env.AppendTarget('enrollee')
diff --git a/service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c b/service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c
index 555deba..2f0c6f2 100755
--- a/service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c
+++ b/service/easy-setup/sampleapp/enrollee/linux/enrolleewifi.c
@@ -39,7 +39,11 @@ pthread_t thread_handle = NULL;
  * It contains Server's Identity and the PSK credentials
  * of other devices which the server trusts
  */
+#ifdef MULTIPLE_OWNER
+static char CRED_FILE[] = "oic_svr_db_server_MOT.dat";
+#else
 static char CRED_FILE[] = "oic_svr_db_server.dat";
+#endif
 
 OCPersistentStorage ps;
 
diff --git a/service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server.dat b/service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server.dat
index ae81a11f75fe30127833e9a6df0434b79e348f9d..135d7b343bf6d4cf9596ec39bce200b9a1ac4f71 100644
GIT binary patch
delta 282
zcmew^aFJbne{y1SP9&52k~AQlSzNL(B{4a*xM}hOCdthOEN2)Evx@S|^HPgSOEXg{
zRLm01P0fwXO?1u8&C+zujm(mCO-#&8b<NF8P0dZsEX_=e4JH>dDNUZhtP?_vVp2_?
lEWo15my(iSksEP!KZq)BoG7G3l)EOzIw%w2q{#ssY5*%RPSXGY

delta 371
zcmcb}{#`(5e@aSzMQ+61{UEBii9z!JWF}@MP16+fBy)4K6x|dfb93Ef!z5!}3&SJ>
zU1JNgRI@}20~3oBgXG-&T*k>B%np;onN=pQVO9}KPE5{;WLmN$4M=Aemn=+4OinFs
z-YEW*(PD9SacNRkYH~?wX=X~IR%TIZaeiqLP`YtRN=8v?T9JNYGLTnXke``XQmkKA
ztZ$H1RMMC*IgwFv@&`t4W~Qv7$v({blXaQ=fc6=J?F?j8QA!7zlv+}d7Rh3^e*o+k
Q#2S7e*Ri69k1FGT0HB$KrvLx|

diff --git a/service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server_MOT.dat b/service/easy-setup/sampleapp/enrollee/linux/oic_svr_db_server_MOT.dat
new file mode 100644
index 0000000000000000000000000000000000000000..ae81a11f75fe30127833e9a6df0434b79e348f9d
GIT binary patch
literal 2167
zcmeHI%TmHH6a|LyAKbfgrVm6Zp8`9YM<u0cI!SnJL4U)ABOAYhFYzzfV{S@mMFC~y
zf-aig-kjvzlbmElh?w!-#|j#?s9kSr5q#04h85OzDyAtV>zL39!*o1mWOnmF0u%%t
z;*h%_aBvH?oo);HPP^Noov`cQcZrX=;Pu3y055Z#zkM8N_g+OVmVX2wspqj^*p)7n
zfLJsa5VFWcp(%r<bb~{j^c%}%WLl>5D+w`GPj4eNMlr=2*oC)DQYFR`GD|X)G#Ywl
z9MAmSO)(w05Sl62c8Vmyk|u*35Lp0$?nB6%?!<In?DMfn!%u$0W>su<8XIR+a;6j$
zY2#oy&pA78*(r)WtJ7)OD(uo7Hd8v(z;Xl?N;i*x5WRv<c4(tNV6A%6h3Gi4<ZOns
z!fuz^hKH~fRjv-IGS5|!UWm<-t4y#|D{rDa9~ce}5~~c}IBT;WFP>UKdoS;VDUq!a
z<_)BI4GG>viZ{Rbu<*>Dm26n#&Z2l~Z6A#bsLrB(v$MK*%N!NuKD~I$xas08uwQA*
Z!i>K;H_y0_i{Z-&%daB$ukPc`<`cka2gm>b

literal 0
HcmV?d00001

-- 
2.7.4