platform/upstream/iotivity.git
8 years agoRemove NSMessage Storage of consumer service.
KIM JungYong [Wed, 7 Sep 2016 05:33:14 +0000 (14:33 +0900)]
Remove NSMessage Storage of consumer service.

NSMessage storage is removed reason by unnecessariness functionality.
But, for the prevent of duplicated message, messageId and NSSyncType need to store.
So, linked list of information for message sync state is added.

Change-Id: Iea80b20a4ca44d9b17b2d3f0746d1f33212d9a3e
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Unittest for topic.
jaesick.shin [Wed, 7 Sep 2016 05:11:50 +0000 (14:11 +0900)]
Add Unittest for topic.

1. Unregister topic case.
2. setTopic case.
3. unSet Topic case.

second patch,
remove warning code.

Change-Id: I8f918bcc23297311d86fcb7f4c13419b99b02d36
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11477
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd setting the icon image.
jaesick.shin [Thu, 8 Sep 2016 07:36:02 +0000 (16:36 +0900)]
Add setting the icon image.

Add setting the icon image in NSSetMessagePayload.
Add NS_ATTRIBUTE_ICON_IMAGE in NSConstants.h

Change-Id: Ia1327da32c80737283ea54f8b2e9f2d4f376efb5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11559
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoChange while condition in resource broker
Hun-je Yeon [Wed, 7 Sep 2016 14:16:58 +0000 (23:16 +0900)]
Change while condition in resource broker

Removing possible infinite loop with while(1) condition

Change-Id: I07a85de3a38fad3265fd8712a8ce1c912fccf690
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11517
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate logic of callback when provider discovered.
KIM JungYong [Wed, 7 Sep 2016 07:38:28 +0000 (16:38 +0900)]
Update logic of callback when provider discovered.

When consumer discover already discovered provider as unsubscribing,
does not callback to upper layer before,
but we decide to callback to upper layer, so related logic is updated.

Change-Id: Iddeb4577f94f941473452ad035949aaf7c135914
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11499
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoremove scons build warning from sample app
ch79.cho [Wed, 7 Sep 2016 05:56:42 +0000 (14:56 +0900)]
remove scons build warning from sample app

gets function is changed to input function to remove warining.

Change-Id: I1f2ad5c1962f81a2321597f078baf513a1b83227
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd Macro for related resource and bug fixes for Topic.
jaesick.shin [Wed, 7 Sep 2016 06:36:29 +0000 (15:36 +0900)]
Add Macro for related resource and bug fixes for Topic.

1. Add Macro - createResource, deleteResource
2. Add NS_FAIL for fail case in NSAddTopics Function.

Change-Id: Ic94403298cf824e9d7a47de91d8c42bfa84b1460
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix bug for callback as seperated thread.
KIM JungYong [Wed, 7 Sep 2016 06:55:02 +0000 (15:55 +0900)]
Fix bug for callback as seperated thread.

Problem: It is degined that consumer service executes
     the registered callback function in different thread
But, the registered callback function for ProviderChanged event
      is called in same thread.

Fix: Separate the thread for this callback function execution
     from main thread

Change-Id: Ic4c9edce1c058a7e04aa7a38fad8f66f2e586d3d
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11493
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd condition for topic of sendNotification.
jaesick.shin [Wed, 7 Sep 2016 00:32:52 +0000 (09:32 +0900)]
Add condition for topic of sendNotification.

topic case is Null or '\0'.

Change-Id: I216fd165145bd7523810e8636919c95f89470ef0
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11465
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge "Merge remote-tracking branch 'origin/master' into notification-service" into...
Uze Choi [Thu, 8 Sep 2016 04:59:26 +0000 (04:59 +0000)]
Merge "Merge remote-tracking branch 'origin/master' into notification-service" into notification-service

8 years agoRemoved build warning: Two different environments in C++ wrapper
Abitha Shankar [Wed, 7 Sep 2016 11:54:05 +0000 (17:24 +0530)]
Removed build warning: Two different environments in C++ wrapper

Removed unUsed variable warnings
Removed warnings for printing variables

Change-Id: I5d6ba48df298c91f46ba7388ea355bc6a833a679
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11501
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoMerge remote-tracking branch 'origin/master' into notification-service
cc [Thu, 8 Sep 2016 01:29:09 +0000 (10:29 +0900)]
Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: I46af88cce1a821841baa1fe3f5226537ae1eb83b
Signed-off-by: cc <ch79.cho@samsung.com>
8 years agoAdd dependency to build Easy setup android application
Jihun Ha [Wed, 7 Sep 2016 13:46:40 +0000 (22:46 +0900)]
Add dependency to build Easy setup android application

Before building Android Mediator sample application, Easy setup SDK should
be built. This patch makes such a dependency.

Change-Id: I8e9ddbeac1f5f9a3ad12e4505de4423469b94bb5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11515
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agotizen: Link to systemwide's sqlite
Philippe Coval [Wed, 7 Sep 2016 08:15:46 +0000 (10:15 +0200)]
tizen: Link to systemwide's sqlite

Without this change, error may occurs and display this message:

   Linking resource/csdk/liboctbstack.so
   out/tizen/x86_64/release/libocsrm.a(provisioningdatabasemanager.o): In function `createDB':
   provisioningdatabasemanager.c:(.text+0x2c): undefined reference to `sqlite3_open_v2'

Bug: https://jira.iotivity.org/browse/IOT-1260
Change-Id: I6fbb51d5746f7d02bb3fd15d337d5d91c592b4ec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd connectivity_abstraction lib to randomtests build script
George Nash [Thu, 1 Sep 2016 21:54:53 +0000 (14:54 -0700)]
Add connectivity_abstraction lib to randomtests build script

This fixed a build issue seen on fedora linux

Change-Id: Ia9e2bdcba55f4af90891b03f8247608b0920095b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11309
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
8 years agoparseChain() PEM update
Oleksii Beketov [Thu, 25 Aug 2016 14:38:07 +0000 (17:38 +0300)]
parseChain() PEM update

parseChain() from ca_adapter_net_tls.c modified in order to parse
PEM certificates. Input buffer may contain either PEM or DER
certificates in a jumble. Each PEM format certificate in a chain
must be terminated with null byte.

Change-Id: Id0e7ff5dddf4af4213dfb0ffe8a8ca05f96581a7
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10741
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
8 years agoChanged svr db file for certification provisioning.
Parkhi [Wed, 7 Sep 2016 06:12:45 +0000 (15:12 +0900)]
Changed svr db file for certification provisioning.

Change-Id: I189cd935ca3255f3b7823f59040cb17a0cb55443
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11487
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agocorrected menu option
amar [Wed, 7 Sep 2016 04:19:11 +0000 (09:49 +0530)]
corrected menu option

Change-Id: Iaaf88464ca1eca36edc78707dce826688ba1b7f9
Signed-off-by: amar <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11471
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years ago[IOT-1246] Resolved exception error
Randeep Singh [Tue, 6 Sep 2016 13:11:45 +0000 (18:41 +0530)]
[IOT-1246] Resolved exception error

Change-Id: I69a1c072634e688d35617708aec3e7c32acd3878
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11441
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
8 years agoupdate TCP & ARDUINO filter in secure mode
jihwan.seo [Wed, 7 Sep 2016 06:50:15 +0000 (15:50 +0900)]
update TCP & ARDUINO filter in secure mode

Change-Id: I14a9d6a24b8dcac6acd7f92fbe5afee58297fdca
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agolinux: Fix ./autobuild.py linux to build only for linux
Philippe Coval [Mon, 29 Aug 2016 14:06:33 +0000 (16:06 +0200)]
linux: Fix ./autobuild.py linux to build only for linux

Change-Id: Id40055ef67c1d86ec92b7939cb757f9865b12262
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11075
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ajay Saini <ajay.saini@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
8 years agoAdd WITH_TCP and WITH_CLOUD option in common build script files for tizen easy-setup...
sy01.youn [Tue, 6 Sep 2016 07:51:22 +0000 (16:51 +0900)]
Add WITH_TCP and WITH_CLOUD option in common build script files for tizen easy-setup sample app.

Change-Id: I909dc85679693342ae840bc229d1157a9f250d7a
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11421
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoRevert "Enable disabled Configure unit tests in OCPlatformTest."
jihwan.seo [Tue, 6 Sep 2016 08:17:53 +0000 (17:17 +0900)]
Revert "Enable disabled Configure unit tests in OCPlatformTest."

This reverts commit 3e1e7340107bbbd6cffe4e4159b5fd2c5e1e9fc0.

Change-Id: I751a67d585bafeaf075e3718429836eb89c8a27e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11425
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years ago1. Added sendMessage without Topics in sample application
Abitha Shankar [Tue, 6 Sep 2016 08:48:57 +0000 (14:18 +0530)]
1. Added sendMessage without Topics in sample application

2. Removed Discovered state from ProviderState
3. Added null checks

Change-Id: I23713dae5a610df37543776c1892927b3377a5fe
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11419
Reviewed-by: jaesick shin <jaesick.shin@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoremove build warning: Two different environments..
ch79.cho [Wed, 7 Sep 2016 04:42:21 +0000 (13:42 +0900)]
remove build warning: Two different environments..

Scons warning is removed:
"Two different environments were specified for target"

Change-Id: Iba5dc62b891bb12712e4f049545008bef00b5a7a
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11475
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix Arduino CI
David Antler [Thu, 1 Sep 2016 21:46:06 +0000 (14:46 -0700)]
Fix Arduino CI

This should fix an issue with Arduino CI introduced through a
false-positive result.

Change-Id: I0255e8f78038557ececc7e0a1ff9741a9140f346
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd a path for header inclusion for security provisioning manager functionality.
Jihun Ha [Wed, 7 Sep 2016 01:49:59 +0000 (10:49 +0900)]
Add a path for header inclusion for security provisioning manager functionality.

Within https://gerrit.iotivity.org/gerrit/#/c/11283/, provisioningdatabasemanager.h
has been moved to resource/csdk/security/provisioning/include/internal/.
To cope with this change, this path should be included to one of our SConcript.

Change-Id: I27c97c3d2b50394a6892d6fd94641042e4640fb4
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11467
Reviewed-by: Jongho Park <jh8397.park@samsung.com>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded SetDoxmDeviceId() API.
Randeep Singh [Tue, 6 Sep 2016 12:42:34 +0000 (18:12 +0530)]
Added SetDoxmDeviceId() API.

 - Patch #1 : Initial upload.
 - Patch #2 : 1. Move the PDM related files to SRM layer.
              Becuase PDM PAI is required from DOXM to check owned device list.
              2. Add logic to check OTM state.

Change-Id: Ib21a2984fde0f1aa4fc98e5fc246d56ef15456c8
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11283
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoBuild scripts updated for android build issue for connectivity layer
saurabh.s9 [Mon, 5 Sep 2016 06:52:44 +0000 (12:22 +0530)]
Build scripts updated for android build issue for connectivity layer

Change-Id: Ia8781f4adbf39529c763521bc6dcfb5c5b4a78c1
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11399
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoUpdated cloud provisioning retry logic.
Heewon Park [Fri, 2 Sep 2016 05:39:43 +0000 (14:39 +0900)]
Updated cloud provisioning retry logic.

 - For mediator can retry cloud-provisioning process, when missed response packet of post.

Change-Id: Id38ab1b2fe37580f590880ff8b96d28eea948a19
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix a logic to filter out an exception in createRemoteEnrollee API for Android
Jihun Ha [Mon, 5 Sep 2016 05:54:36 +0000 (14:54 +0900)]
Fix a logic to filter out an exception in createRemoteEnrollee API for Android

If a resource does not have a "oic.wk.prov" resource type, createRemoteEnrollee
API should return a NULL pointer. However, this exception has not been
handled in jni implementation. To resolve this problem, this patch make
this exception returned to android layer, properly.

Change-Id: I70d9dfbcd6cd21757e4f594abbc99902dc367681
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11395
Reviewed-by: Jongho Park <jh8397.park@samsung.com>
Reviewed-by: Sijae Kim <sijae.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate parse logic of introspectProvider result.
KIM JungYong [Sun, 4 Sep 2016 04:49:44 +0000 (13:49 +0900)]
Update parse logic of introspectProvider result.

When received introspect provider result,
consumer service expect to get provider policy as type of boolean.
But, policy is integer type although provider side set boolean type.
So, parse logic of policy is updated to parse for given type by received payload.

Change-Id: I695e81179172376499345f9b1f6323a04325a015
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11359
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix bug for sample and remove unused functions.
KIM JungYong [Sun, 4 Sep 2016 07:36:47 +0000 (16:36 +0900)]
Fix bug for sample and remove unused functions.

1) Bug of consumer sample app is fixed.
2) Unused function of consumer service is removed.

Change-Id: Idc7f7decdde34d8067177d84410af979f173a279
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate unit test of consumer service.
KIM JungYong [Mon, 5 Sep 2016 07:46:51 +0000 (16:46 +0900)]
Update unit test of consumer service.

negative test case is added.
some of test case is updated.
presence stop case is added.

Change-Id: I86f1e50e6208e5a603f40b57f2d9a10e24d237ea
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoRequired to check consumer unitest
cc [Fri, 2 Sep 2016 13:57:35 +0000 (22:57 +0900)]
Required to check consumer unitest

Consumer unittest will be upgraded.

Change-Id: I758fa0ffc1e54874858fda23e76d34293c18dbd2
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 81ac23211bdd85e636e197a2cba0cf03de2b9c40)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11377
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
8 years agochange warning code for scanf.
jaesick.shin [Mon, 5 Sep 2016 04:45:57 +0000 (13:45 +0900)]
change warning code for scanf.

add condition for scanf.
remove warning only.

Change-Id: If4912d286b6c7d78dac0bda5ffe05d6e1cdfb0cc
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoHold GetTopics API return until related code finishes in the other thread
jaesick.shin [Sun, 4 Sep 2016 22:17:02 +0000 (07:17 +0900)]
Hold GetTopics API return until related code finishes in the other thread

Issue: Crash happen Get Topic just after Topic registration.
 (between RegistrerTopic and GetTopics/GetConsumerTopic APIs)

Fix: apply condition variable to RegistrerTopic API logic and
     GetTopics/GetConsumerTopic API logic.

Other Fixes:
 locking the NSProviderInterface.
 modify unittest for functions of 1 and 2.

Change-Id: Ia8e75d7b21198b3d4c3810050baa0867d60eeb78
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11365
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoGet back to the previous code.
jaesick.shin [Sun, 4 Sep 2016 22:00:10 +0000 (07:00 +0900)]
Get back to the previous code.

change input logic for example.

second patch included,
change fgets to input function.

Change-Id: Id763ae718db2daaeaeac9cc55149f6eb58183361
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoLogic was added when the topic list has not been registered yet.
jaesick.shin [Mon, 5 Sep 2016 04:17:49 +0000 (13:17 +0900)]
Logic was added when the topic list has not been registered yet.

Logic was added when consumer request of OC_REST_GET.

Change-Id: I510959517c7f1e1c506f081eb6d59b88c6f9cd22
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11385
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agofix resource-container unit test
Minji Park [Tue, 6 Sep 2016 04:09:04 +0000 (13:09 +0900)]
fix resource-container unit test

- default callback waiting time
  and test resource type for discovery test changed.

Change-Id: I1f659d488b418a7359ccfce857deb3eff6a8bb3c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11411
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoEnable disabled Configure unit tests in OCPlatformTest.
Ziran Sun [Tue, 23 Aug 2016 14:08:26 +0000 (15:08 +0100)]
Enable disabled Configure unit tests in OCPlatformTest.

Since all the functionalities called in these unit tests
are now available, enable these tests. Verification via
local tests has been done before enable any of these tests.

Change-Id: Ie5086e3394460452dd92199629017b30f1ef0030
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sungkyu Ko <sungkyu.ko@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agogtest: Hotfix to prevent download failure
Philippe Coval [Tue, 30 Aug 2016 07:38:22 +0000 (09:38 +0200)]
gtest: Hotfix to prevent download failure

gtest-1.7.0.zip (md5=2d6ec8ccdf5c46b05ba54a9fd1d130d7) is gone from:
  https://googletest.googlecode.com/files/gtest-1.7.0.zip

So let's switch to a mirrored file:
  http://pkgs.fedoraproject.org/repo/pkgs/gtest/gtest-1.7.0.zip/2d6ec8ccdf5c46b05ba54a9fd1d130d7/gtest-1.7.0.zip

Note, now upstream project moved to:
  https://github.com/google/googletest/archive/release-1.7.0.zip

But archive structure is different (configure is missing),
 so a additional works are needed,
 maybe it worth to be done on latest release instead (1.8.0 ATM).

Change-Id: Ib1cf308fb2d3a15bdf69246cccfd379234bbce22
Bug: https://jira.iotivity.org/browse/IOT-820
Origin: https://gerrit.iotivity.org/gerrit/#/c/11119/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRevert "Generate iotivity_config.h at build time"
Jaewook Jung [Mon, 5 Sep 2016 05:50:30 +0000 (14:50 +0900)]
Revert "Generate iotivity_config.h at build time"

This reverts commit dbcc3f47fe5abd2102750cdd3ace7f92619e8dd0.

Change-Id: I1fe54489a0d73940ca74f4abd293608c255fe645
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11393
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd ifdef the code which utilizes TLS-supported APIs
Heewon Park [Fri, 2 Sep 2016 05:33:37 +0000 (14:33 +0900)]
Add ifdef the code which utilizes TLS-supported APIs

provisionTrustCertChain API of Provisioning Manager is ONLY defined where TLS is supported. In easy setup, that API is used for transferring a certificate to Enrollee. So if TLS is not supported, this procedure SHOULD be skiped and not defined, even.

Change-Id: I2006d2025c794aab616cea8fb3e6144cace86b49
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoResolved Tizen build issue
Ashwini Kumar [Thu, 1 Sep 2016 14:20:44 +0000 (19:50 +0530)]
Resolved Tizen build issue

Link issue for privisioning sample in C++
undefined reference to OCLog

Change-Id: I49b0d5197dc164c7d132af88e9a3250387850b14
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11297
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix for build of resource container.
KIM JungYong [Sun, 4 Sep 2016 23:06:10 +0000 (08:06 +0900)]
Fix for build of resource container.

When build of resource container occurred build fail
by reason of can not found strlen function.
For the above reason, Standard string header is included on Configuration file.

Change-Id: I102d0e7ca5925fba59ebe95ae860517dc65328ab
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago[RE] Android Application build error fix.
Jay Sharma [Thu, 1 Sep 2016 11:02:50 +0000 (16:32 +0530)]
[RE] Android Application build error fix.

Change-Id: Id04435b3a34ebcc0fb06f001c16b6fa63674a57a
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11275
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRequired to check consumer unitest
cc [Fri, 2 Sep 2016 13:57:35 +0000 (22:57 +0900)]
Required to check consumer unitest

Consumer unittest will be upgraded.

Change-Id: I758fa0ffc1e54874858fda23e76d34293c18dbd2
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'notification-service'
Hun-je Yeon [Sat, 3 Sep 2016 15:57:18 +0000 (00:57 +0900)]
Merge branch 'notification-service'

This patch includes the updated C++ and Android API for notification-service

Change-Id: Id25a4c1aed886a1e77c29625aac895054cb397cc
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
8 years agoUpdated Android for new API Changes
nikhil.a [Sat, 3 Sep 2016 13:33:53 +0000 (19:03 +0530)]
Updated Android for new API Changes

1. Modified the Consumer and Provider design and callbacks mechanism in JAVA and JNI.
2. Updated the API name changes.
3. Refracted the code

Change-Id: I51ea2eab73b575e67f336c46af9d330d0f8f8941
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated C++ wrapper for new API Changes
abitha.s [Sat, 3 Sep 2016 07:08:39 +0000 (12:38 +0530)]
Updated C++ wrapper for new API Changes

1. Modified the Consumer and Provider design and callbacks mechanism for adding subscribtion controlability .
2. Updated the API name changes.
3. Refracted the code
4. Added Provider State and Policy Info for Provider Object.
5. Added copy constructors for Topic and Provider object
6. Added Doxygen comments
7. Updated the Sample application to use Updated APIs

Change-Id: If071b098a9dd836c335d1d621e2e561845b593e6
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11353
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agobuild: Propagate log facilities using pkgconfig
Philippe Coval [Tue, 26 Jul 2016 17:10:02 +0000 (19:10 +0200)]
build: Propagate log facilities using pkgconfig

If built with LOGGING option,
 logging facilities will be available to user using pkgconfig.

Refactored SConscript to be more extensible using a defines list too.

Bug: http://lists.iotivity.org/pipermail/iotivity-dev/2016-July/005104.html
Change-Id: I93c92dd35f4060e46d31bbe80e773b548d92fcd8
Origin: https://gerrit.iotivity.org/gerrit/#/c/9783/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agobuild: Update version to 1.2.0
Philippe Coval [Thu, 1 Sep 2016 07:30:34 +0000 (09:30 +0200)]
build: Update version to 1.2.0

As master is now based on 1.2.0-RC1, match planned release number.

Change-Id: Id16c97b76b92aabf0699ca81d70a3abb3bdb0cf0
Bug: https://jira.iotivity.org/browse/IOT/fixforversion/10501
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoclean up some string parameter for MQ callback
jihwan.seo [Thu, 1 Sep 2016 12:02:49 +0000 (21:02 +0900)]
clean up some string parameter for MQ callback

Change-Id: Ia721b4efd2d9c18514f8e1ce3025f63952902b6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoGenerate iotivity_config.h at build time
David Antler [Fri, 26 Aug 2016 21:39:56 +0000 (14:39 -0700)]
Generate iotivity_config.h at build time

This patch lightens the burden for those wishing to integrate the
IoTivity CSDK into their project.

 - Remove (almost) all HAVE_*_H from the command line.
 - Build new file: resource/c_common/iotivity_config.h
 - Include "iotivity_config.h" in headers which #include
   platform-specific header files.
 - Added out/*/*/*/include/c_common/iotivity_config.h which will
   include the HAVE_*_H build flags.
 - Export files from out/*/*/*/include/c_common/windows/include/*.h

Change-Id: Ib8a7e83c8ceb025c29b11284ee2912f95c930ca6
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10989
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoMerge "Merge branch 'master' into notification-service" into notification-service
Uze Choi [Fri, 2 Sep 2016 13:02:03 +0000 (13:02 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service

8 years agoFix bug about string input
cc [Fri, 2 Sep 2016 11:35:26 +0000 (20:35 +0900)]
Fix bug about string input

Unexpected topic message is set by fgets operation.

Change-Id: I4a7ac3d1a91baa0025426967fb54a13d3f58156d
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11341
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate resource protocol specification
cc [Thu, 1 Sep 2016 13:53:53 +0000 (22:53 +0900)]
Update resource protocol specification

Resource attributes are updated as the resource model
defined by spec document.

Change-Id: Ia20601345c4b327bf002c515696837bd84893fa5
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11293
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'master' into notification-service
cc [Fri, 2 Sep 2016 11:57:41 +0000 (20:57 +0900)]
Merge branch 'master' into notification-service

Presence patch is adapted

Change-Id: Id4aa4ac5e0ff7dbbec2ca788f215b7d329a3a29e
Signed-off-by: cc <ch79.cho@samsung.com>
8 years agoUpdate Consumer C APIs.
KIM JungYong [Fri, 2 Sep 2016 09:58:29 +0000 (18:58 +0900)]
Update Consumer C APIs.

1) Parameter as NSProvider structure is changed C string providerId.
2) NSTopicLL is seperated from NSProvider structure.
3) Topic releated API is renamed and changed return type.
4) NSUnsubscribe API is commented out.

Conflicts:
        service/notification/examples/linux/notificationconsumer.c

Change-Id: Ib46ed952cdab58cb9f95eaeb4e405b7da4adeb2f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11335
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify to call of provider state callback.
KIM JungYong [Fri, 2 Sep 2016 05:23:42 +0000 (14:23 +0900)]
Modify to call of provider state callback.

When incomming the subscription result,
consumer service callback to upper layer every result message
although some of message was duplicated.

Provider state callback is fixed for call once as provider state(allow/deny) changed.

Change-Id: I5a8094092b33e569716475aa60b574ee5eb0e913
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11325
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify Notification Consumer Example
YounghyunJoo [Fri, 2 Sep 2016 04:05:44 +0000 (13:05 +0900)]
Modify Notification Consumer Example

- After deciding to remove discovry callback, discovery info is notified throgh the Provider Changed CallBack.
- we modify example code to possible to check its functionality.

Change-Id: I36af6597fa15b31d5665f2e4a0c4db2c11a8319c
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11315
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agochange strcpy to strncpy.
jaesick.shin [Fri, 2 Sep 2016 06:17:59 +0000 (15:17 +0900)]
change strcpy to strncpy.

strcpy function is unsafe.

Change-Id: Ifd679a4b9804861da409d4318b69502992d8ef90
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11327
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd logic for NS_FAIL Case in API.
jaesick.shin [Fri, 2 Sep 2016 05:43:02 +0000 (14:43 +0900)]
Add logic for NS_FAIL Case in API.

Add NS_FAIL case in API.

Change-Id: I597cf9ed3c76aa2621aacef36305beb01130d11a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11323
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoBug fixes for Unlock.
jaesick.shin [Fri, 2 Sep 2016 04:40:48 +0000 (13:40 +0900)]
Bug fixes for Unlock.

Bug fixes unlock logic for NSProviderDeleteConsumerTopic Function.

Change-Id: Ibe27134f38b8e12b0d767df03aabd049f16431b9
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11317
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoChange dereference code.
jaesick.shin [Fri, 2 Sep 2016 04:02:22 +0000 (13:02 +0900)]
Change dereference code.

Added check logic for dereference code.

Change-Id: If34fe346803b7ccc9c3eb21056790c1e030bd14a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11313
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoReplace conditional compilation marcro WITH_CLOUD and bug fixed.
jaesick.shin [Fri, 2 Sep 2016 03:50:56 +0000 (12:50 +0900)]
Replace conditional compilation marcro WITH_CLOUD and bug fixed.

Macro RD_CLIENT is replaced with WITH_CLOUD.
The codes related to cloud service is not compiled according to
the conditional compilation with the marcro.

modify topic notification filter for remote message
This patch is bug-fix which adds topic notification filter for remote msg.

Change-Id: Ib61957dac3a193706386be5e121e5efdb2bbada8
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11311
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoResolve memory leak for unittest.
jaesick.shin [Thu, 1 Sep 2016 01:18:59 +0000 (10:18 +0900)]
Resolve memory leak for unittest.

change strdup to global variables.

Change-Id: Ida35b98ad5fb5be8add9fa12b481cb8a2bee4dcb
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11235
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify subscribe presence query.
KIM JungYong [Thu, 1 Sep 2016 11:53:11 +0000 (20:53 +0900)]
Modify subscribe presence query.

Changed query is calculated to receive presence message on ipv6.

Change-Id: I53db76230b96dc12a3174de37b14fa0044eafc67
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11279
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 44e8750f7f2aa96d8c313cd757c96211ddc65571)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11321

8 years agoFix bug for Cloud service of consumer service.
KIM JungYong [Tue, 30 Aug 2016 07:04:29 +0000 (16:04 +0900)]
Fix bug for Cloud service of consumer service.

For connect to Cloud, making uri, parsing address, constructing query was fixed.

Address converter is modified for TCP requests.

Change-Id: I714ce22e53ba05aab7f1be1512ccddfe46cdeb78
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11113
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdded CreateMessage API in Android APIs
nikhil.a [Mon, 29 Aug 2016 12:49:21 +0000 (18:19 +0530)]
Added CreateMessage API in Android APIs

1) CreateMessage API added for ProviderService
2) Addition of JNI code for the respective API
3)Refactoring of code

Change-Id: I53c44c09580028b4ec0631b47f31c5b8abb47535
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit dfb5ff844c058fdbbafb530326e1935cae17673e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11277
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMove non-public struct
cc [Thu, 1 Sep 2016 05:41:23 +0000 (14:41 +0900)]
Move non-public struct

TopicList struct and Attribute keys are moved to internal struct module.

Change-Id: Iab8d9c7a308eb107f12f59cc5cf999d092f58642
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify Svace Issue
YounghyunJoo [Thu, 1 Sep 2016 05:46:28 +0000 (14:46 +0900)]
Modify Svace Issue

- Fix bug for checking NSResult is validate
- Fix bug for value null check

Change-Id: Ie0cab2ae4d7487a3f0ef310fda938893f4fe84ef
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11251
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify subscribe presence query.
KIM JungYong [Thu, 1 Sep 2016 11:53:11 +0000 (20:53 +0900)]
Modify subscribe presence query.

Changed query is calculated to receive presence message on ipv6.

Change-Id: I53db76230b96dc12a3174de37b14fa0044eafc67
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11279
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify consumer logic for updating provider information
YounghyunJoo [Mon, 29 Aug 2016 12:56:43 +0000 (21:56 +0900)]
Modify consumer logic for updating provider information

- Add synchronization logic for cache update in NSConsumerInternalTaskController.
- Adapt its synchronization logic, when subscription succeed is checked/updated.

Change-Id: I746a3d3602eab3ac570a6d2ddfcdd4b7dce8e18a
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate consumer logic for stopped provider.
KIM JungYong [Tue, 30 Aug 2016 00:22:53 +0000 (09:22 +0900)]
Update consumer logic for stopped provider.

When the provider was stopped service,
consumer service will feedback to upperlayer on ProviderChangedCallback but non-feedback before.
This patch enable feedback when stopped provider service.

And enum value of NS_STOPPED is added.
NSResponse enum structure is renamed with NSProviderState.

Change-Id: I7fdd2ca1d3ba0b534c74b0fbc6719616daab2f67
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoCoap Over TCP support for Tizen
Abhishek Sharma [Thu, 18 Aug 2016 05:50:50 +0000 (11:20 +0530)]
Coap Over TCP support for Tizen

Change-Id: If1a7d61aa6499282182138d188b0e600133f49c1
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10583
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoUpdate QoS configuration to HIGH in Mediator android app
Jihun Ha [Wed, 31 Aug 2016 14:15:31 +0000 (23:15 +0900)]
Update QoS configuration to HIGH in Mediator android app

High QoS makes CoAP request to be CON message.

Change-Id: I14cfcf0304a095cdc5947a224f734856a72629da
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11223
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoCAIsTlsMessage fix
Andrii Shtompel [Thu, 1 Sep 2016 02:12:49 +0000 (11:12 +0900)]
CAIsTlsMessage fix

Wrong param was put to CAIsTlsMessage
This causes problems with TLS

Change-Id: Ie65bc9c2fea10d7741ce14c24b0d723b58f098f1
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11239
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoAdd unittest for NSUnregistertopic Case.
jaesick.shin [Wed, 31 Aug 2016 08:00:36 +0000 (17:00 +0900)]
Add unittest for NSUnregistertopic Case.

check the Unregistertopic case.

Change-Id: I0f182ce9b9e8b60b708740a35ea0880f1c537344
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd unitest and change invalid function name.
jaesick.shin [Wed, 31 Aug 2016 06:57:04 +0000 (15:57 +0900)]
Add unitest and change invalid function name.

1. Add unittest for NSProviderRegisterTopic case.
2. change invalid function name in NSProviderInterface.h

second patch is comment changed only.

third patch included,
change invalid testcase name.

Change-Id: Iacbc8466c1f2f204b81ff5db28015ef9f5762858
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRemove warning code in Provider Side.
jaesick.shin [Wed, 31 Aug 2016 08:05:21 +0000 (17:05 +0900)]
Remove warning code in Provider Side.

remove warning code only.

Change-Id: I12f4ffc235817110e8a71c42f80d642569efb7f2
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoBug fixes for mutex unlock.
jaesick.shin [Thu, 1 Sep 2016 00:56:05 +0000 (09:56 +0900)]
Bug fixes for mutex unlock.

Add mutex unlock for NSProviderDeleteConsumerTopic function
in NSPrvoiderMemoryCache.c

Change-Id: I9286c3fdb897409f298defab40d7479db13a2f06
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdate response payload parser for samples
Jee Hyeok Kim [Thu, 1 Sep 2016 06:43:09 +0000 (15:43 +0900)]
Update response payload parser for samples

1. Update response payload parser for samples
   to print all variables

2. Cleanup code

Change-Id: I7fc6f583c43ce4dd6f5a4bf43a3990b4f86d5371
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoChanged OcException message in JniOcPlatform
hyuna0213.jo [Wed, 31 Aug 2016 04:39:01 +0000 (13:39 +0900)]
Changed OcException message in JniOcPlatform

If the function is not supported, we return Not supported message
not fail.

Change-Id: I43b96d6a7c1948a629dfc07a0b557e67987c8733
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11175
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoModify topic notification filter for remote message
cc [Thu, 1 Sep 2016 01:45:29 +0000 (10:45 +0900)]
Modify topic notification filter for remote message

This patch is bug-fix which adds topic notification filter for remote msg.

Change-Id: I90ae060ab2a5385fdd3c66c2614c5dd4933d83ab
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify consumer logic for updating provider information
YounghyunJoo [Mon, 29 Aug 2016 12:56:43 +0000 (21:56 +0900)]
Modify consumer logic for updating provider information

- Add synchronization logic for cache update in NSConsumerInternalTaskController.
- Adapt its synchronization logic, when subscription succeed is checked/updated.

Change-Id: I746a3d3602eab3ac570a6d2ddfcdd4b7dce8e18a
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix bugs for copy provider
YounghyunJoo [Wed, 31 Aug 2016 08:50:55 +0000 (17:50 +0900)]
Fix bugs for copy provider

- Modify incompatible type casting

Change-Id: Ic2695c85c1b4c6070089d46dbb9179d6cb9baae1
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModify bug which is related provider copy issue
YounghyunJoo [Tue, 30 Aug 2016 05:32:03 +0000 (14:32 +0900)]
Modify bug which is related provider copy issue

some APIs which is received NSProvider pointer as an API parameter
after calling and Processing these APIs, NSProvider was removed.
to prevent this problem, as a first step in the API, we added the logic to copy provider.

Change-Id: I3523691ec4992dc9dbf0b0824a4e2ff4df133568
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years ago1. Modified the Accepted Providers Consumers list to return references
abitha.s [Fri, 26 Aug 2016 11:52:21 +0000 (17:22 +0530)]
1. Modified the Accepted Providers Consumers list to return references

2. Added API to setTopic in Message for setting via application

3. Updated Logs

Change-Id: Id3b37c148c3e96d391224ccb5cf75a57c40ced6f
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 4bc6feed319d383524a70662318d25eb4bb14266)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11041

8 years agoAdded CA BLE packet format changed codes
jaehyun Cho [Fri, 5 Aug 2016 02:16:15 +0000 (11:16 +0900)]
Added CA BLE packet format changed codes
description : https://jira.iotivity.org/browse/IOT-1210

Change-Id: I6f886989e8fdc14fd5128e0c96f1de3f7687bffe
Signed-off-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9979
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoUpdate Android sample app related to group&invite
Jaewook Jung [Tue, 30 Aug 2016 11:29:38 +0000 (20:29 +0900)]
Update Android sample app related to group&invite

Change-Id: I5b0fd0e1c2297b50bd72cbcba53745cfc6b58329
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoFix crash issue when called unsubscribePresence.
hyuna0213.jo [Thu, 1 Sep 2016 00:12:08 +0000 (09:12 +0900)]
Fix crash issue when called unsubscribePresence.

Adding null initialization code.

Change-Id: I2d52b1fa479dd1956f089d202aa01fcc7da09e52
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11069
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoModify cloud URI for sample
cc [Tue, 30 Aug 2016 05:04:59 +0000 (14:04 +0900)]
Modify cloud URI for sample

The default URIs are changed for sign-up, sign-in, token and refresh.

Change-Id: I06e60ba7733b59089c89fd031ab811e7a4191760
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11103
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix defects detected by SVACE system in easy setup
Heewon Park [Wed, 31 Aug 2016 06:25:51 +0000 (15:25 +0900)]
Fix defects detected by SVACE system in easy setup

Change-Id: I8f69f7d083bd5b7a77c146e67b471614a911b7a3
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11191
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix wrong comparison statement in Easy setup.
Jihun Ha [Tue, 30 Aug 2016 13:15:04 +0000 (22:15 +0900)]
Fix wrong comparison statement in Easy setup.

mRemoteEnrollee can not be converted to boolean. Thus, it should
be changed to null checking statement.

Change-Id: Iec38fa2995fbc70b97e37e7b9318a19a82f0c2fb
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11157
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd message queue, group&invite sample for cloud
Jee Hyeok Kim [Mon, 29 Aug 2016 03:56:35 +0000 (12:56 +0900)]
Add message queue, group&invite sample for cloud

1. Add message queue clients
2. Add group & invite samples
3. cleanup existing clients

Change-Id: Ibe107a979e3cee253c4a74bbbc991da934371bc2
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11099
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoUpdate unit test for cloud RD
Minji Park [Tue, 30 Aug 2016 08:35:51 +0000 (17:35 +0900)]
Update unit test for cloud RD

- fix unit test for resource presence in RD

Change-Id: I658e8952723d49a849a8c8b148790546979e2fd3
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11123
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years agoUpdate SConscript of connectivity-abstraction
hyuna0213.jo [Tue, 30 Aug 2016 04:20:17 +0000 (13:20 +0900)]
Update SConscript of connectivity-abstraction

currently bt_edr_adapter is not supported on linux platform.
but if TARGET_TRANSPORT=ALL is used, all adapters are included.

Change-Id: I4439154a4f08c5e040b7a63f104052c6a5aa1097
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11111
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoremoved #ifdef preprocessor wrapping #define
Jaewook Jung [Thu, 11 Aug 2016 08:28:50 +0000 (17:28 +0900)]
removed #ifdef preprocessor wrapping #define

Wrapping #define preprocessor with #ifdef doesn't have any influence.
It is unnecessary. Rather it could have a riskiness for redefinition.

Change-Id: I8262b288d75988de0b96d6879358d830d5de848a
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>