iotivity.git
11 months agoUpdate notification sample build. 21/16021/2 notification-service
KIM JungYong [Fri, 30 Dec 2016 01:55:11 +0000 (10:55 +0900)]
Update notification sample build.

When building sample of notification,
it has seperated codes for each target_os.
but, tizen, linux, windows has same codes but has different build environment.
So tizen, linux, windows sample application codes was merged
by specified each build environments.

Change-Id: Ia8938dad2b791b4435a144d330693c9a81242447
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agoFix build warning of notification service. 49/15949/3
KIM JungYong [Sun, 25 Dec 2016 23:44:49 +0000 (08:44 +0900)]
Fix build warning of notification service.

In this patch, implicit declaration of function is resloved.
and it is fixed that different environments were specified for target.

Change-Id: Icd6dabc2557da2acc24fc7141d3e8ce0481b80fe
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15933
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 99ac43a2b8a51dbc0b025c4d554c3b5899b7d932)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15949

11 months ago[IOT-1558] Add notification provider for windows. 31/15931/9
KIM JungYong [Fri, 23 Dec 2016 08:44:56 +0000 (17:44 +0900)]
[IOT-1558] Add notification provider for windows.

Building of notification provider service is enabled for windows.
And sample application building is enabled for windows.

Improvement:https://jira.iotivity.org/browse/IOT-1558
Change-Id: I3069982e3b25d789edc4e5394c44f9cc6926091c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15931
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months ago[IOT-1558] Add notification consumer for windows. 29/15929/2
KIM JungYong [Fri, 23 Dec 2016 04:26:52 +0000 (13:26 +0900)]
[IOT-1558] Add notification consumer for windows.

Building of notification consumer service is enabled for windows.
And consumer service sample is added for windows.

Improvement:https://jira.iotivity.org/browse/IOT-1558
Change-Id: I6226aade0d3c9683db203b188030ea0118cd0f1b
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agoMerge branch 'master' into notification-service. 23/15823/1
KIM JungYong [Tue, 20 Dec 2016 04:01:41 +0000 (13:01 +0900)]
Merge branch 'master' into notification-service.

Change-Id: I25f603eecd5bc7a855d669378c30302e6bb2717e
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
11 months agotizen: relocate all liboc*.so to resource subpackage 75/15775/6
Philippe Coval [Tue, 6 Dec 2016 14:40:54 +0000 (15:40 +0100)]
tizen: relocate all liboc*.so to resource subpackage

iotivity.pc bring those libs so they should come along.
This was observed while porting Tizen's iotcon to iotivity-1.2.1

Change-Id: I82e7121520c1a7ed8d79e7b85089bec2b0b5012b
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15775
Reviewed-by: Jooseok Park <jooseok.park@samsung.com>
11 months ago[IOT-1622] Use PBKDF2 code from mbedTLS 03/15803/2
Greg Zaverucha [Tue, 6 Dec 2016 22:25:12 +0000 (14:25 -0800)]
[IOT-1622] Use PBKDF2 code from mbedTLS

Replace the PBKDF2 implementation in IoTivity
(resource\csdk\security\src\pbkdf2.c) that uses TinyDTLS\92s
implementation of HMAC, with the implementation from mbedTLS.

Add test vectors created with the old implementation to make sure
the new implementation will interoperate.

Change-Id: I8d7e7c5e9ff0cfc8a2a149dee5aa765fc6e00a9c
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15727
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
(cherry picked from commit cbb3e4e08dce06798ef8122c0ab945ee67973aea)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15803

11 months agobuild: Enable provisioning tests again 41/15641/6
Philippe Coval [Fri, 9 Dec 2016 23:09:48 +0000 (00:09 +0100)]
build: Enable provisioning tests again

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: I64f6e771aa838d067ae834545c5a95e9c5593db7
Origin: https://gerrit.iotivity.org/gerrit/#/c/15389/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
11 months agotizen: Reformat subpackages specs files to align master one 87/15287/10
Philippe Coval [Tue, 4 Oct 2016 12:41:58 +0000 (14:41 +0200)]
tizen: Reformat subpackages specs files to align master one

To avoid confusion, of configuration flags,
 each configuration change is welcome to be done in all spec files at once.

Change-Id: I4a35d7129719c8bfa29455f41624e1231158c62d
Origin: https://gerrit.iotivity.org/gerrit/#/c/12773/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15287

11 months ago[IOT-1679] Modify package name for notification consumer and provider sample. 07/15607/5
nikhil.a [Fri, 16 Dec 2016 06:10:56 +0000 (11:40 +0530)]
[IOT-1679] Modify package name for notification consumer and provider sample.

Change-Id: I3501d0cf0cdf3f360b86836868dbf1b2243bdfcf
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agoSeparate MOT-disabled/enabled SVR DB files for enrollee 97/15597/3
Jihun Ha [Tue, 13 Dec 2016 05:20:54 +0000 (14:20 +0900)]
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>
11 months ago[IOT-1676]Removing Unreachable code from Notification Service JNI 67/15567/6
abitha.s [Tue, 13 Dec 2016 13:43:14 +0000 (19:13 +0530)]
[IOT-1676]Removing Unreachable code from Notification Service JNI

Change-Id: If28fb835a94f67f2d37f50ab721ae68ed9234559
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agotizen: Remove deprecated libresource_hosting.so 05/15105/6
Philippe Coval [Thu, 1 Dec 2016 13:54:29 +0000 (14:54 +0100)]
tizen: Remove deprecated libresource_hosting.so

To be squashed into:
https://gerrit.iotivity.org/gerrit/15003

Change-Id: I512cc51a9ad53929a57d30034cb70f1d153789ea
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15029
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
(cherry picked from commit 0c90ca6ffcbb6a2c56c977ec11bebb7b1d14053b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15105
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agoRemove resource-hosting service which is deprecated. 45/15245/4
KIM JungYong [Thu, 1 Dec 2016 08:26:45 +0000 (17:26 +0900)]
Remove resource-hosting service which is deprecated.

Current resource-hosting service is deprecated because
concept of resource proxy can cover with functionality of cloud or relay server.
And this service would not handled for previous releases.
So this service can't cover for recent basic protocols.
If needs is arised for this concept, will be develop on the new service.

Change-Id: Ie14482924b7ccbebbd2512f017ad4b6039d72dd2
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15245
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
11 months agoFix defects detected by static analysis 65/15665/3
Parkhi [Thu, 15 Dec 2016 02:10:11 +0000 (11:10 +0900)]
Fix defects detected by static analysis

Change-Id: Ie07051e70f2b78fc9cdca6e1c1c0d59d7e5bc231
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15465
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit ebce9d66d37228f8a91975d635f9b4c13036ef67)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15665
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
11 months agoDoxyGen file update. 39/15739/3
Jaehong Jo [Fri, 16 Dec 2016 04:11:31 +0000 (13:11 +0900)]
DoxyGen file update.

CPP APIs
  ../../include/OCException.h \

C APIs
  ../../c_common/ocrandom/include/ocrandom.h \
  ../../c_common/oic_malloc/include/oic_malloc.h \
  ../../c_common/oic_string/include/oic_string.h \
  ../../c_common/oic_time/include/oic_time.h \

Change-Id: If123688d3aaa050ece8b2cc994eed589ed111d26
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15739
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
11 months ago[IOT-1682] Windows: fix linker error for SECURED=0 27/15627/3
Dan Mihai [Wed, 14 Dec 2016 17:42:17 +0000 (09:42 -0800)]
[IOT-1682] Windows: fix linker error for SECURED=0

Linking with static LIB octbstack_test on Windows requires linking
with static LIB ocsrm too.

Also, ocsrm has been removed from the list of LIBS of this test,
for non-Windows platforms. On these platforms, octbstack_test is a
shared LIB, that already includes static LIB ocsrm.

Change-Id: I4a73029689f137e615ecf721fa89d9498904301d
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15627
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
11 months ago[Android]Fix wrong class path on CA BLE adapter 79/15679/3
bg.chun [Thu, 15 Dec 2016 07:49:34 +0000 (16:49 +0900)]
[Android]Fix wrong class path on CA BLE adapter
Fix wrong class path on CA BLE adapter jni header

Change-Id: I71b3641505625de7596ea58f4685283d7c9b9e1a
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15679
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
11 months ago[IOT-1686] InProcServerWrapper/InProcClientWrapper Initialization. 21/15721/3
Larry Sachs [Thu, 15 Dec 2016 20:30:32 +0000 (12:30 -0800)]
[IOT-1686] InProcServerWrapper/InProcClientWrapper Initialization.

With the change https://gerrit.iotivity.org/gerrit/#/c/13649/
m_threadRun must be explicitly initialized.

Change-Id: Ic40d9a56e4fac7ec520b522c2a8c559b5b72627d
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15721
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
11 months agoadd debugging log related CoAP pdu in CA Layer 87/15587/4
jihwan.seo [Wed, 14 Dec 2016 07:44:42 +0000 (16:44 +0900)]
add debugging log related CoAP pdu in CA Layer

Change-Id: I14726ad78054e2fa605f68373f3d31bea3602135
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15587
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
11 months ago[IOT-1586] Changed the policy key name for tcp discovery 33/14733/3
hyuna0213.jo [Tue, 22 Nov 2016 08:16:53 +0000 (17:16 +0900)]
[IOT-1586] Changed the policy key name for tcp discovery

The name of "x.org.iotivity.tcp" key was changed from
"x.org.iotivity.tcp" to "tcp".

Change-Id: I7bae43f823bdbe744a1cda28b27b9c72d22af996
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 37c7550bc5c1c032bd4ed7a5853c98c536914782)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14733
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
11 months agobuild: Enable resourceCache test again 99/15399/3
Philippe Coval [Sat, 10 Dec 2016 12:02:58 +0000 (13:02 +0100)]
build: Enable resourceCache test again

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: Ibc3200ae0c16447720d5ec4aacd801940d616e2e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15399
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
11 months agoFix RD_SERVER flag 05/15705/2
Habib Virji [Thu, 6 Oct 2016 13:33:25 +0000 (14:33 +0100)]
Fix RD_SERVER flag

Small fix for the build with RD_SERVER flag.

Change-Id: I96eb60e05202635f595c3d1edc82aa634908c95b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15705
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
11 months agoMinor change - make log info for format options more specific. 67/15367/2
Ziran Sun [Fri, 9 Dec 2016 15:00:45 +0000 (15:00 +0000)]
Minor change - make log info for format options more specific.

Change-Id: Ib3e524d452e5b6df2255820fcd8f06c61805c70a
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15367
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
11 months agoTrival: update documentation on OCResource attribute. 17/15617/2
Ziran Sun [Wed, 14 Dec 2016 15:50:19 +0000 (15:50 +0000)]
Trival: update documentation on OCResource attribute.

Change-Id: Ibb92a32c4f604107be178c23a67e4cf63b5de46f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15617
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
11 months agosvcresource.c return handler 63/15363/7
Habib Virji [Fri, 9 Dec 2016 13:38:55 +0000 (13:38 +0000)]
svcresource.c return handler

SendSRMResponse response was ignored in the default case handler of svcentityhandler in svcresource.

BUG: https://jira.iotivity.org/browse/IOT-1661
Change-Id: I1c37b8789893d9de46863bfb931047a3c43c473c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
11 months ago[Tizen]change flag which used for detect ip changed 77/15677/4
bg.chun [Wed, 14 Dec 2016 08:41:26 +0000 (17:41 +0900)]
[Tizen]change flag which used for detect ip changed
change netlink interface flags to addr flags
which used for detect network IPv4/6 changed

Change-Id: I827db082879aafdc3e8bd688917180af09531ab2
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15677
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
11 months agoadd checking logic of pdu data length. 43/15743/2
jihwan.seo [Fri, 16 Dec 2016 04:29:24 +0000 (13:29 +0900)]
add checking logic of pdu data length.

unneccessary parsing logic is running
when received data is wrong.
it should be prevented.

Change-Id: Ic36359ae96f0aaa7321a1f1e8ed2d5d086ba1198
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
11 months agoChanged the type of data added in ca_threadpool_pthreads list. 91/15591/7
hyuna0213.jo [Wed, 14 Dec 2016 08:02:30 +0000 (17:02 +0900)]
Changed the type of data added in ca_threadpool_pthreads list.

If u_arraylist_add() failed, pthread_join() should be called to
release its resources in ca_thread_pool_add_task().
but If the state of target thread is blocked on a condition variable,
there is no way to release its resource. (pthread_join() function
will wait for the thread to terminate.)
So, I changed the type of data added in ca_threadpool_pthreads list
to release its resource when ca_thread_pool_free() is called.

Change-Id: Ieae5d920368e46230ca312817ed1726bb08e0f2d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15591
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
11 months agoFixed double free issue when destroying endpoint 47/15447/4
hyuna0213.jo [Thu, 8 Dec 2016 02:50:27 +0000 (11:50 +0900)]
Fixed double free issue when destroying endpoint

- after destroying memory, set NULL value to prevent double free
- add the usage of oc_mutex_lock() when block data is updated

Change-Id: I07dbdff8288888ece8f89f7b278e979c09cf8e51
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15447
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
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>
11 months ago[IOT-1621] Add custom config.h file mbedtls build options 07/15707/2
Greg Zaverucha [Fri, 9 Dec 2016 01:58:24 +0000 (17:58 -0800)]
[IOT-1621] Add custom config.h file mbedtls build options

Adds a new version of the mbedtls config.h file specialized to IoTivity.
Library features that are not required by IoTivity are removed from the build.
The new file is extlibs/mbedtls/config-iotivity.h. Changes to config.h made by
ocf.patch are now made directly in config-iotivity.h. Update the scons file to
copy this to mbedtls/include/mbedtls/config.h. Update ssaladapter tests so that
they don't allow unsupported TLS versions.

TLS renegotiation was being disabled at runtime, now it is disabled at build.

To review the changes that IoTivity makes to config.h relative to the default,
diff extlibs/mbedtls/config-iotivity.h and
extlibs/mbedtlsmbedtls/include/mbedtls/config.h.

Change-Id: I9e6190e7c0e145443d5e164ccf47314a3bfcf53e
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
(cherry picked from commit 91cbd73ce34e72cad01b9912c471164a8abb3cb2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15707

11 months agobug fix about related memory and security resource. 93/15593/4
jaesick.shin [Wed, 14 Dec 2016 08:30:55 +0000 (17:30 +0900)]
bug fix about related memory and security resource.

1. I did not copy the memory,
   but I freed the memory while I was using it.
2. The initial value of the securityResource variable
   used by the provider was wrong.

second patch include,
1. change OICCalloc to OICMalloc.
2. removed the initialization code from the previous commit,
   so added it again.

Change-Id: I189eb720785a74e39955640484e795170be3b010
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15593
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
11 months agoremoved unreachable code in cloud 45/15545/3
jihwan.seo [Tue, 13 Dec 2016 04:53:29 +0000 (13:53 +0900)]
removed unreachable code in cloud

Change-Id: I55b6befa400722561032b37891c2eda42d386846
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15545
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
11 months agoAdd "accessToken" and "acceessTokenType" property in cloudserver resource. 57/15657/2
Jihun Ha [Wed, 14 Dec 2016 08:27:51 +0000 (17:27 +0900)]
Add "accessToken" and "acceessTokenType" property in cloudserver resource.

Rather than authCode, some of IoT Cloud servers may use an access token for
enrollee to do sign-up. For example, after a mediator got issued
an auth code from account server, it can send a request to change it
to its corresponding access token which is going to deliver to Enrollee.
Additionally, AccessTokenType property is added, which indicates ,for example,
an given access token is "bearer" type token.

Change-Id: I6feb2b4f1582b5c9ee9b104b3592267247f97f99
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15657
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
11 months agoUpdate Android Sample App to enable findResource on unicast BLE 59/15559/3
jihwan.seo [Tue, 13 Dec 2016 08:43:17 +0000 (17:43 +0900)]
Update Android Sample App to enable findResource on unicast BLE

since findResource on multicast in BLE is not supported anymore,
it should be updated

Change-Id: Ie26c3b50d9f9624a392931027d546bd7a040d6bc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15559
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
11 months agoAdd support files to run SmokeTest 75/15575/2
Larry Sachs [Tue, 13 Dec 2016 20:47:57 +0000 (12:47 -0800)]
Add support files to run SmokeTest

Change-Id: I8dc9cce7b79119c2138646e687740c25de8f3e08
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15575
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
11 months agoresource: Fix build break on randomtest 19/15619/4
Dan Mihai [Wed, 14 Dec 2016 16:17:08 +0000 (08:17 -0800)]
resource: Fix build break on randomtest

Fix conflict between commits 80a131603151b1666c092ac03e76af399b500b9d
and 4333f4c5cc1578449afbc04dce1bd890f7017cfa.

Change-Id: I29b343b92b27fd819bac0275bfbc4ae1b931cb23
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15619/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15619
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
11 months agobuild: Bypass easy-setup unit test 15/15615/4
Philippe Coval [Tue, 13 Dec 2016 00:08:22 +0000 (01:08 +0100)]
build: Bypass easy-setup unit test

Bug: https://jira.iotivity.org/browse/IOT-1428
Change-Id: Idb4540ed07fc9ebcea0bbc753830bffbf9a31152
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15615/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15615

11 months agoadd null checker related some parmaters in CA layer 93/15493/2
jihwan.seo [Mon, 12 Dec 2016 10:43:35 +0000 (19:43 +0900)]
add null checker related some parmaters in CA layer

Change-Id: Idd29912d0dff5022809f72586ebef913a84b55bc
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15493
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
11 months agoMerge "Merge branch 'notification-service' to master branch."
Uze Choi [Wed, 14 Dec 2016 10:42:29 +0000 (10:42 +0000)]
Merge "Merge branch 'notification-service' to master branch."

11 months agoocrandom test: ensure generated data is different 09/11709/3
David Antler [Mon, 12 Sep 2016 16:41:42 +0000 (09:41 -0700)]
ocrandom test: ensure generated data is different

Change-Id: Id415a6119d89cc27eff95b0e0171d6dd50a9f76d
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11709
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>
11 months agoDouble free of OCServerRequest 03/15503/2
Habib Virji [Mon, 12 Dec 2016 12:20:55 +0000 (12:20 +0000)]
Double  free of OCServerRequest

OCServerRequest was deleted once in SendListObserverNotification and HandleSingleResponse.

Change-Id: I2964a6a65d760369afaf3e1325eae825d4ce3345
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
11 months agoFix OCParseArray passed value treated as array 61/15361/3
Habib Virji [Fri, 9 Dec 2016 12:43:08 +0000 (12:43 +0000)]
Fix OCParseArray passed value treated as array

OCParseArray was incremented the passed CborValue. The passed value was incrementd by one.

BUG: https://jira.iotivity.org/browse/IOT-1660
Change-Id: I96fcd27714989732278627b0d61fb68683112b8a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
11 months ago[IOT-1665] Fix bug for invalid input of constructResourceObject() in RE layer. 35/15535/2
KIM JungYong [Mon, 12 Dec 2016 12:51:46 +0000 (21:51 +0900)]
[IOT-1665] Fix bug for invalid input of constructResourceObject() in RE layer.

When RCSRemoteResourceObject::toOCResource() method called,
inside RE layer, constructResourceObject() was called
with invalid parameter on OCConnectityType.
So, it is due to mismatch with response type and request type.
the above result, ocstack layer couldn't parse payload.

In this patch, fixed parameter for OCConnectityType is modified valid type.

Change-Id: Ic924d9a892227377406e2b3ecfe666c41f1f0b04
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15507
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 51c33d5fc29083cfe17667f5cc33e4e82cd0a0f5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15535

11 months agoremoved unreachable code in android JNI 43/15543/3
jihwan.seo [Tue, 13 Dec 2016 04:49:57 +0000 (13:49 +0900)]
removed unreachable code in android JNI

Change-Id: Ie193980b00bbab996357c9011d15e9f612fd32b0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15543
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
11 months agoremoved unreachable code in coap http 41/15541/2
jihwan.seo [Tue, 13 Dec 2016 04:32:15 +0000 (13:32 +0900)]
removed unreachable code in coap http

Change-Id: I4ca17ced9d83d9624b948aefba60f01057652ae0
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15541
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
11 months agoFix defects detected by static analysis 57/15557/2
Parkhi [Fri, 9 Dec 2016 06:44:07 +0000 (15:44 +0900)]
Fix defects detected by static analysis

Change-Id: Iee6f843db1602d0a6fcc0bd43841d306d4a7257c
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f36c71f082f9e5eca0249a30d3f8104f726d27b1)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15557

11 months ago[IS] Sync simulator with changes in cJSON. 53/15453/2
Senthil Kumar G S [Fri, 9 Dec 2016 16:45:39 +0000 (22:15 +0530)]
[IS] Sync simulator with changes in cJSON.

Some changes in cJSON external library affected the Simulator's
JSON Schema Parser. Due to this, resource creation was failed.
This code check-in handles those cJSON changes in simulator.

Change-Id: I11173b39c61651c1459cb45b5e5cf886dafbabdd
Signed-off-by: Senthil Kumar G S <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15369
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit c29d63038da023bce2de1b95c073fe9b181f6c9d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15453

11 months agoAdd an additional callback in security provisioning of easy setup 67/15467/2
Jihun Ha [Fri, 9 Dec 2016 06:08:54 +0000 (15:08 +0900)]
Add an additional callback in security provisioning of easy setup
after secure resource is discovered.

Right after a target secure resource is discovered, Mediator may need to
confirm which ownership tranfer method is used or set a pre-configured pin
number for MOT use case.
For that, it adds an additional ESResult, ES_SECURE_RESOURCE_IS_DISCOVERED,
which indicates the event. And if some user inputs are needed, user can
pass its inputs as a form of ESOwnershipTransferData object which can store
an ownership transfer method to be used and pre-configured pin to be used
for a MOT case.

Note that, related APIs for MOT was merged
: https://gerrit.iotivity.org/gerrit/#/c/14221/

Change-Id: Ic17f50693a6c4073eb5208da861506230f817f0e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15161
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 80884027f52113cdeb2673877d2a3d338630e371)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15467

11 months ago[IOT-1652] Fix Doxm Handler to check ehRet during ownership transfer 39/15539/2
Jongmin Choi [Mon, 12 Dec 2016 07:42:47 +0000 (16:42 +0900)]
[IOT-1652] Fix Doxm Handler to check ehRet during ownership transfer

Kevin noted that ehRet value set at lines 1120 or 1125 of doxmresource.c
will be overwritten and never checked if __WITH_DTLS__ or __WITH_TLS__ is defined
due to the patch https://gerrit.iotivity.org/gerrit/#/c/14739
This patch fixes the issue.
https://jira.iotivity.org/browse/IOT-1652

Patch #1: Initial upload

Change-Id: Ieda643f10d3116d785f293604393e8709c94fe80
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15463
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 8e088ff2f9e41f339b0cef663b9d8cb688840e14)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15539

11 months ago[IOT-1652] Modify confirmed certificate OTM to use vendor namespace 37/15537/2
Jongmin Choi [Mon, 12 Dec 2016 07:16:57 +0000 (16:16 +0900)]
[IOT-1652] Modify confirmed certificate OTM to use vendor namespace

Confirmed Certificate OTM is vendor-specific OTM
and hence oic.sec.namespace is replaced by x.org.iotivity.
https://jira.iotivity.org/browse/IOT-1652

Patch #1: Initial upload

Change-Id: Ifa3c4f9119307064e27c90f2581cdb6d4765be13
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15461
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 7d1493d3288a5b121c70b429d26218ec91ff664c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15537

12 months agoPlatform ID must be UUID 73/15573/2
Larry Sachs [Tue, 13 Dec 2016 20:41:13 +0000 (12:41 -0800)]
Platform ID must be UUID
Change sleep() to wait()/notify()

Platform ID change was due to this commit https://gerrit.iotivity.org/gerrit/#/c/14991/
wait()/notify() improves performance

Change-Id: I5c1bca6939243eec9cbb52893c7e376ac422cb7c
Signed-off-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15573
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
12 months agoIOT-1656: Removing -fPIC compiler option for unsupported builds. 95/15295/4
Pawel Winogrodzki [Thu, 8 Dec 2016 03:16:13 +0000 (19:16 -0800)]
IOT-1656: Removing -fPIC compiler option for unsupported builds.

One extlibs/mbedtls/SConscript was passing -fPIC for all compilers,
even the ones, which didn't support it.

Change-Id: Ib946da6f73d3e811e05b8b92bc5315e95a5a3d67
Signed-off-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15295
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
12 months ago[IOT-1089] Fixed paths in gradle build files 71/15571/2
George Nash [Tue, 13 Dec 2016 18:09:10 +0000 (10:09 -0800)]
[IOT-1089] Fixed paths in gradle build files

Change-Id: I15261d813de636c1ed9dec6bed7a5e0392897924
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15571
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
12 months ago[IOT-1313, IOT-1300] Improve random number generation 43/15243/5
Greg Zaverucha [Tue, 13 Dec 2016 00:20:45 +0000 (16:20 -0800)]
[IOT-1313, IOT-1300] Improve random number generation

Update ocrandom.c to use platform specific, secure random number
generators instead of rand(). Update the API in ocrandom.h, and make
corresponding updates to callers. Avoid using FP arithmetic in
OCGetRandomRange.

Change-Id: Ic0476dc69f1c649c4a07a46b99643cf7206f83af
Signed-off-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15243
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agoRemove unused function to resolve build warnings in catcpserver 41/15341/4
hyuna0213.jo [Fri, 9 Dec 2016 07:46:13 +0000 (16:46 +0900)]
Remove unused function to resolve build warnings in catcpserver

Remove unused function after merging below patchset
link: https://gerrit.iotivity.org/gerrit/#/c/14827/
commit message:
[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP

Change-Id: I79ddc0167e62e5601c81bb432bd3c1af750b69a1
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15341
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agobuild: Extend unit_tests to all (including service) 91/15291/12
Philippe Coval [Wed, 30 Nov 2016 22:14:03 +0000 (23:14 +0100)]
build: Extend unit_tests to all (including service)

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I89426d04e0b05c49470c059ffe60cf90fcb95582
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14971
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15291/
Reviewed-on: https://gerrit.iotivity.org/gerrit/15291
Reviewed-by: Habib Virji <habib.virji@samsung.com>
12 months agoIndicate intentional fall through in switch statments 39/15239/2
George Nash [Wed, 7 Dec 2016 20:51:27 +0000 (12:51 -0800)]
Indicate intentional fall through in switch statments

Add comments to clearly indicate that these cases that lack
a `break` statement is intentional

The lack of `break` statment shows up in many analysis tools.
Adding the comments helps when evaluating reports from analysis
tools.

Change-Id: I24f0e4ee7b8d651bed6a8a0f8179d0ec789521a4
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15239
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
12 months agobuild: Bypass and/or fix suspicious service tests (workaround) 77/15377/9
Philippe Coval [Tue, 29 Nov 2016 14:07:08 +0000 (15:07 +0100)]
build: Bypass and/or fix suspicious service tests (workaround)

- Run tests using tools.scons.RunTest
- Add a file parameter to enable valgrind check
- Disable failed test, to make verifier sane again

To be tracked at:
http://wiki.iotivity.org/1.2-rel

Droped Conflicts:
resource/csdk/connectivity/test/SConscript
resource/csdk/security/provisioning/unittest/SConscript
resource/provisioning/unittests/SConscript
service/easy-setup/mediator/richsdk/unittests/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f00000001
Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Origin: https://gerrit.iotivity.org/gerrit/#/c/15377
Reviewed-on: https://gerrit.iotivity.org/gerrit/15377
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoFix deadcode execution in ocserverrequest.c 73/15373/2
Habib Virji [Fri, 9 Dec 2016 18:39:35 +0000 (18:39 +0000)]
Fix deadcode execution in ocserverrequest.c

There was a deadcode.

It has goto statement which is only called when memory allocation fails.

In the goto statement, it was trying to free the variable that failed in memory allocation.

BUG: https://jira.iotivity.org/browse/IOT-1664
Change-Id: I36ea779ee5bae131a10f55dafcb45728c1e7dc9b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoNULL pointer check in cbor_test 65/15365/4
Habib Virji [Fri, 9 Dec 2016 13:55:46 +0000 (13:55 +0000)]
NULL pointer check in cbor_test

cbor_test directly uses value returned by OCRepPayloadGetPropeString in memcmp .

The value is not checked before calling memcmp.

BUG: https://jira.iotivity.org/browse/IOT-1662
Change-Id: Ia998ab4154d0b2efb69dff232532d2b8b7f4f5de
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15365
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoBuffer overrun in ocstack.c 53/15353/4
Habib Virji [Fri, 9 Dec 2016 11:05:21 +0000 (11:05 +0000)]
Buffer overrun in ocstack.c

UUID length is 37, but CA was setting it as 32.
Since UUID length was set in octack, the correct
size has to berelatively in CA layer too.

BUG: https://jira.iotivity.org/browse/IOT-1638
Change-Id: I4c8713acf9329fe8ace64d1da56093c1126d9c19
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15353
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agobuild: Enable unit testing in SECURED=1 mode for resource 91/14691/18
Philippe Coval [Fri, 9 Dec 2016 23:05:33 +0000 (00:05 +0100)]
build: Enable unit testing in SECURED=1 mode for resource

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I38e593d49401f7e14bfa26dd980938d36e66ac68
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 7be23fe785dffb5bf4ce022c882bdd235434ebb8)
Origin: https://gerrit.iotivity.org/gerrit/#/c/14691/
Reviewed-on: https://gerrit.iotivity.org/gerrit/14691
Reviewed-by: George Nash <george.nash@intel.com>
12 months agobuild: Bypass and/or fix suspicious resource tests (workaround) 75/12075/12
Philippe Coval [Tue, 29 Nov 2016 14:07:08 +0000 (15:07 +0100)]
build: Bypass and/or fix suspicious resource tests (workaround)

- Run tests using tools.scons.RunTest
- Add a file parameter to enable valgrind check
- Disable failed test, to make verifier sane again

To be tracked at:
http://wiki.iotivity.org/1.2-rel

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f27487f4e
Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Origin: https://gerrit.iotivity.org/gerrit/#/c/12075/
Reviewed-on: https://gerrit.iotivity.org/gerrit/12075
Reviewed-by: George Nash <george.nash@intel.com>
12 months agoMerge branch 'notification-service' to master branch. 97/15497/4
KIM JungYong [Mon, 12 Dec 2016 10:52:30 +0000 (19:52 +0900)]
Merge branch 'notification-service' to master branch.

in this patch, Notification MQ functionality is added

Improvement:https://jira.iotivity.org/browse/IOT-1523
Change-Id: I59a102b6a188371c293accf55f3df872752705b9
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
12 months ago[IOT-1670]Removing Unreachable code from Provider sample app 01/15501/2
abitha.s [Mon, 12 Dec 2016 10:43:54 +0000 (16:13 +0530)]
[IOT-1670]Removing Unreachable code from Provider sample app

Change-Id: I4a21cfb86bf474f1e8609f0288560509d6538e14
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1089] Merge remote-tracking branch 'origin/generic-java' 31/14931/5
George Nash [Mon, 12 Dec 2016 20:44:38 +0000 (12:44 -0800)]
[IOT-1089] Merge remote-tracking branch 'origin/generic-java'

Change-Id: Icad0fdf58b85b23fa1d47a900bfd81b278592749
Signed-off-by: George Nash <george.nash@intel.com>
12 months agodisable enum value of OCResourceProperty related Local(D2D) MQ Broker 07/15207/2
jihwan.seo [Wed, 7 Dec 2016 01:37:31 +0000 (10:37 +0900)]
disable enum value of OCResourceProperty related Local(D2D) MQ Broker

since local mq broker is not supproted yet.
it is better to disable some value of OCResourceProperty
related MQ local broker until define it on OCF spec.

this issue from CTT vertification.

Change-Id: I37715a8e763084cb33f9b7fea794346152c29704
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15207
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agoFix for crash in InProcClientWrapper destructor. 69/15169/3
jihwanseo [Fri, 2 Dec 2016 11:40:41 +0000 (20:40 +0900)]
Fix for crash in InProcClientWrapper destructor.

InProcClientWrapper::stop() throws an exception when stack
is already stopped. Not catching this exception would terminate
application.

Change-Id: I50bb6befb716049da275c16a4fdbf96437c2ad03
Signed-off-by: Harry <h.marappa@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15169
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months ago[IOT-1628] fixed TC failure in the resource discovery in the cloud RD 59/15259/2
yeonghun.nam [Thu, 1 Dec 2016 09:59:36 +0000 (18:59 +0900)]
[IOT-1628] fixed TC failure in the resource discovery in the cloud RD

- According to the latest RD implementation, the resource discovery TC is fixed where the device presence information is stored in the DB in advance

Change-Id: I85c2c848cf3b0a60fa22014faa09e00985fe6688
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit fbedeaf326cfd49446ba3a28d599a4cb54824d10)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15259
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoRemoved href from device and platform payload 65/15265/3
Habib Virji [Wed, 30 Nov 2016 22:09:30 +0000 (22:09 +0000)]
Removed href from device and platform payload

- Created a separate function to handle Device and Platform payload.
- rt, if and attribute information are the only included in the payload.
- BuildResponseRepresentation updated to avoid information about device and platform payload.
- Updated dmv value from res.1.1.0,sh.1.2.0 to res.1.1.0,sh.1.1.0.

Change-Id: I59059997f170d177663e87eddea9df32275ca882
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15265
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1614] Test for NULL a single time. 71/15071/2
Dan Mihai [Fri, 2 Dec 2016 16:03:49 +0000 (08:03 -0800)]
[IOT-1614] Test for NULL a single time.

Change-Id: Id3b07eb93ebc0d888c27f3629acc93ec7c4925dc
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15071
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IOT-1626] Added BSD 3-Clause License in SCons. 51/14951/13
Jaehong Jo [Thu, 1 Dec 2016 09:55:41 +0000 (18:55 +0900)]
[IOT-1626] Added BSD 3-Clause License in SCons.

Because SCons has dual license.

From https://github.com/flashpixx/Storage/tree/master/Scons

Change-Id: If45a359bb41efb3bdd93d33d20e6d26ec28847c5
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoSupport unicast discovery of secure resource for BLE transport in easy setup 19/15319/3
Parkhi [Wed, 7 Dec 2016 05:32:42 +0000 (14:32 +0900)]
Support unicast discovery of secure resource for BLE transport in easy setup

In a patch, https://gerrit.iotivity.org/gerrit/#/c/15183/, an api to discover
a secure resource in unicast is being developed. So if an OCResource object
given for easy setup is BLE transport, this patch will make a secure resource
discovery happen in unicast due to its better efficiency.

Change-Id: I65bacf090b6ef5cebdb101a705a58ebdb6d8b645
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 1b17f573c2ae4accb5888d69b6038cc252e43554)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15319

12 months ago[IOT-1593] TLS ports and CA_SECURE flag added for secure socket accept 45/15345/2
Minji Park [Wed, 23 Nov 2016 10:53:28 +0000 (19:53 +0900)]
[IOT-1593] TLS ports and CA_SECURE flag added for secure socket accept

- TLS port and secure flag added in tcp server
- TLS port information added in discovery payload

Change-Id: Ib409e069869c52e10f1bd99d35cd6f94ab90fff2
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14667
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: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15345
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IoT-1603] Restrict unittest with SECURED mode 43/15343/2
cc [Fri, 25 Nov 2016 07:39:49 +0000 (16:39 +0900)]
[IoT-1603] Restrict unittest with SECURED mode

Fixed segmentation fault from notification-service unit test
when building option with SECURED=1.
The unit test is not allowed with SECURED mode,
becuase provisioning steps are required to detect providers and consumers
for running the test cases.

Change-Id: I02ebfbc8f3afdd2b06d66b87976773fcdc37b030
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14783
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15343

12 months ago[IOT-1659] Fix JNI static analysis issue for Notification Service 51/15351/4
nikhil.a [Fri, 9 Dec 2016 11:41:55 +0000 (17:11 +0530)]
[IOT-1659] Fix JNI static analysis issue for Notification Service

It is required to fix static analysis issue and improve code quality

Change-Id: Ic5afa823196ef83fb2ee62bb799dda093c13485b
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoModified the usage of the u_arraylist_remove() 33/15333/2
hyuna0213.jo [Fri, 9 Dec 2016 06:47:36 +0000 (15:47 +0900)]
Modified the usage of the u_arraylist_remove()

-Modified the usage of the u_arraylist_remove()
-Add log message for catcpserver.
 It will help to resolve the future problems.

Change-Id: If5ee7157cbf1536b3cafdd9885a8533c91aef505
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15333
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IOT-1575] Update to manage connection state of tcp session 67/14067/7
hyuna0213.jo [Mon, 7 Nov 2016 08:24:22 +0000 (17:24 +0900)]
[IOT-1575] Update to manage connection state of tcp session

If network interface is down, the socket of the connecting/connected
state will be closed.

Change-Id: I9f9cda2e3ab5672c336ed165ec4f189ab846f054
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14067
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agomodified searchUser() API on OCAccountManager 47/15347/2
Jaewook Jung [Mon, 21 Nov 2016 05:31:17 +0000 (14:31 +0900)]
modified searchUser() API on OCAccountManager

Since the account server spec has been changed, it needs some modifications.
 - modified uri "/oic/account/user" to "/oic/account/search"
 - modified query form to search more than one user.
 - removed searchUser() API for searching a specific user.

Change-Id: I431d6a4750d7a0772831da1865de2e8c5498ed09
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14545
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15347
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoFix static analysis issue in keepalive 39/15339/3
Minji Park [Wed, 30 Nov 2016 01:16:50 +0000 (10:16 +0900)]
Fix static analysis issue in keepalive

- add return value checking logic after memory allocation

Change-Id: I1c28e13e01c2dd7bf4b78585adf0ffdc0e6ecdfd
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 64b44c48ab8944c7cae1cabf64aa0e1e98ada932)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15339
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
12 months agoPatch for discovery unowned device by BLE MAC address 17/15317/3
junghun kim [Tue, 6 Dec 2016 07:25:26 +0000 (16:25 +0900)]
Patch for discovery unowned device by BLE MAC address

Patch for discovery unowned device by BLE MAC and
Device ID.
This is a patch for CONPRO-245.
There is a patch at the iotivity with commit
https://gerrit.iotivity.org/gerrit/#/c/14629/

Change-Id: Iddbf32bfb93fbeb5ffa8654358e538952bd3ae02
Signed-off-by: junghun kim <jhun1105.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15183
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15317

12 months agolinux: Use system sqlite3 59/15359/2
Philippe Coval [Fri, 9 Dec 2016 01:12:04 +0000 (02:12 +0100)]
linux: Use system sqlite3

Problem was discovered on yocto

Change-Id: I5274bed9e4b7ddcdc1b17a265a1886cd78cb631f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 08b403572985a70fe5d652378e1cfa2b72ac6a3d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15359
Reviewed-by: Habib Virji <habib.virji@samsung.com>
12 months agoModify the SRMRequestHandler to use the CAEndpoint_t's infomation 23/14823/2
Chul Lee [Fri, 28 Oct 2016 05:51:16 +0000 (14:51 +0900)]
Modify the SRMRequestHandler to use the CAEndpoint_t's infomation
for identify a secure channel connection.

Change-Id: I91caf27ba7b08ee69623a960bb8df4da0acfefd9
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit b321d908218d5c2fdf1807b47c9da0c85bdbefa5)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14823
Reviewed-by: Kevin Kane <kkane@microsoft.com>
12 months agofix crash issue related transmission for large data 67/15167/3
jihwan.seo [Mon, 5 Dec 2016 22:25:23 +0000 (07:25 +0900)]
fix crash issue related transmission for large data

Change-Id: I88dbef87f5e02a0d4e0c0903a3d1734088d82401
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agoPrevent out-of-bounds memory access 73/15173/7
George Nash [Mon, 5 Dec 2016 23:33:17 +0000 (15:33 -0800)]
Prevent out-of-bounds memory access

prevent the snprintf function from accessing outside the
queryParam char array.

If the resulting uri exceeds the max uri length indicate the
failure by returning OC_STACK_INVALID_URI from the function.

Found using static analysis tool.

Change-Id: I81ee4cc932c70942ff65dcf8390529279e36dc4a
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15173
Reviewed-by: Pawel Winogrodzki <pawelwi@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agoAdd new connectGatt API for Level 23 for android. 89/15189/5
jihwan.seo [Tue, 6 Dec 2016 10:42:55 +0000 (19:42 +0900)]
Add new connectGatt API for Level 23 for android.

Change-Id: I5bb170c92b1df48d767f96dddecdb9b86fc85945
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months ago[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java 93/15293/5
George Nash [Fri, 9 Dec 2016 00:07:49 +0000 (16:07 -0800)]
[IOT-1089] Merge remote-tracking branch 'origin/master' into generic-java

Change-Id: Ic21559c8bb95f93ab82d8b2d8f443e14ae470654
Signed-off-by: George Nash <george.nash@intel.com>
12 months agoAdd links and rep in the response for the collection 99/13999/8
Habib Virji [Wed, 30 Nov 2016 21:24:52 +0000 (21:24 +0000)]
Add links and rep in the response for the collection

- Use common ExtractParamFromQuery in ocresource and occollection to extract query parameters.
- Added links tag to the oic.if.ll and oic.if.baseline.
- Added rts tag in the payload for the baseline. - Added rep tag for oic.if.b response.
- occollection was using extra structure to differentiate ll, baseline, batch and group. Simplified the code to use
a simpler code and removed unwanted structure.
- oic.wk.col added in the types.
- OCStackIfTypes is removed as it was used only internally. This is not needed due to usage of ExtractParamFromQuery.
- BuildResponseRepresentation is updated as it is used in collection. For inner payload, these
values were not being used by ocpayloadconvert.
- oic.if.ll has been updated to give response in form of {links:[{href:"", rt:[""], if:[""]}]}
- oic.if.baseline has been updated to give response in form of {rt:[], if:[], rts:[], links:[{href:"", rt:[""], if:[""]}]}
- oic.if.b has been to response in form of [{"href": "", "rep": {""}}]
- in case of wrong query it will respond with error message.

Change-Id: I98489ac9923ab3c63012ddfe6b55c2b3064c3f28
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13999
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1625] Fix a logic to terminate CA in case of failure of init 27/15327/3
hyuna0213.jo [Wed, 30 Nov 2016 04:29:36 +0000 (13:29 +0900)]
[IOT-1625] Fix a logic to terminate CA in case of failure of init

- If CAInitializeMessageHandler() fails, we should call
CATerminateMessageHandler() to terminate the main thread successfully.
- Calling u_arraylist_reserve before creating the thread

Bug: https://jira.iotivity.org/browse/IOT-1625
Change-Id: If291d90bbe69abbf967a7f0014c6e5d44644131d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14941
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15327
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
12 months ago[IOT-1605][tizen]Fix obs ocserver.cpp deregistration coredump issue 61/15261/2
bg.chun [Mon, 28 Nov 2016 04:09:40 +0000 (13:09 +0900)]
[IOT-1605][tizen]Fix obs ocserver.cpp deregistration coredump issue

Fix ocserver.cpp obs deregistration coredump issue in tizen.

Change-Id: Iba3f1288482cd20aac585eec599b45764499b09d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14825
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit bf3a3f25f8bfcdb2508cf0e44d165c8ef6e5d6fe)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15261

12 months ago[IOT-1608] Support PUT,POST,DELETE method type for /oic/ping 21/15321/2
hyuna0213.jo [Mon, 28 Nov 2016 08:11:34 +0000 (17:11 +0900)]
[IOT-1608] Support PUT,POST,DELETE method type for /oic/ping

If PUT,DELETE methoed type is received for /oic/ping,
HandleKeepAliveRequest() function will respond to remote device
with error code.
bug: https://jira.iotivity.org/browse/IOT-1608

Change-Id: I47d81222cebced3505cafec8eabfe0604c94d8a3
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14835
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15321
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoUpdate the keepalive response payload for the ping request 49/13849/6
hyuna0213.jo [Mon, 24 Oct 2016 07:23:24 +0000 (16:23 +0900)]
Update the keepalive response payload for the ping request

- add resource type/interface name to response payload
- add interval value to response payload
- POST method is used to send ping message

Change-Id: I6c74122bdb4a726a5c77f8a8e742d202f639972b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 4444b92de6df210c62a2b7d463f74eb0793238f7)
Reviewed-on: https://gerrit.iotivity.org/gerrit/13849
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agodisable scan interval logic in initialize step for android BLE 53/15253/2
Jaehong Jo [Thu, 8 Dec 2016 04:37:16 +0000 (13:37 +0900)]
disable scan interval logic in initialize step for android BLE

Change-Id: I662aef453b109f13556e2eb79accfde17f61188b
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agomodified uri for searching user on account server 07/14507/3
Jaewook Jung [Thu, 17 Nov 2016 10:40:17 +0000 (19:40 +0900)]
modified uri for searching user on account server

modified uri since the account server specification has been changed.

Change-Id: I25771bca72803fe88a09631611194baf73a28181
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14455
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit ef8dbb0fb89274b24159d0258e1daa3fe198b313)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14507
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
12 months agomodified OCAccountManager APIs 11/15211/2
Jaewook Jung [Wed, 19 Oct 2016 04:49:45 +0000 (13:49 +0900)]
modified OCAccountManager APIs

modified some APIs on OCAccountManager since the OCF cloud specification
has been changed.
(C++/Android API, sampleApp and unittest are modified)

- added a string parameter for accessToken on signOut() and deleteDevice().
- removed AclGroupType for createGroup() and added new overloaded one
  that has a map parameter for optional property values.
- changed getGroupList() to getGroupInfoAll() because it does not get a
  list anymore but information of all my group from account server.
- removed joinGroup(), deleteInvitation() and added replyToInvitation().
- removed addDeviceToGroup(), deleteDeviceFromGroup(), leaveGroup() and
  added addPropertyValueToGroup(), deletePropertyValueFromGroup(),
  updatePropertyValueOnGroup().

Change-Id: Ibf462a6667990c1786d8b4111263d96e5c618166
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14335
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15211

12 months agoAdd C++ API for UnsetInputPinCB. 13/15313/2
Sandeep Sharma [Thu, 8 Dec 2016 07:42:38 +0000 (13:12 +0530)]
Add C++ API for UnsetInputPinCB.

Change-Id: I0a3285d906d250a932a6cb98daff0b34ba6bff79
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 194d25ca4d7dccbe2201d0db563a785b4f838d9c)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15313

12 months agoFix Doxm Handler for Manufacturer Cert OTM 11/15311/2
Jongmin Choi [Wed, 7 Dec 2016 08:21:37 +0000 (17:21 +0900)]
Fix Doxm Handler for Manufacturer Cert OTM

Fix error due to confirmable cert OTM

Change-Id: Id191ae12e3842e910a44b9d025794caf6aaaf16b
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
(cherry picked from commit 50a09e72b62edc9179fdc8b824a0cc6bfbeee88f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15311

12 months agoUpdate provisioning client dat file for mfg otm 09/15309/2
Jongmin Choi [Thu, 1 Dec 2016 10:13:46 +0000 (19:13 +0900)]
Update provisioning client dat file for mfg otm

Update dat file for provisioningclient to include key
used for manufacturer cert ownership transfer

Patch #1: Initial upload
Patch #2: Update to latest dat file

Change-Id: I9897266306e398ea683deaa07f480f2b6ce48e17
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15019
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.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>
(cherry picked from commit 37ca18297c3ed65275eb033a55190eec423da200)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15309

12 months agoAdded API to reset SVR DB 07/15307/2
Jongmin Choi [Fri, 25 Nov 2016 09:44:55 +0000 (18:44 +0900)]
Added API to reset SVR DB

OCResetSVRDB() added to reset the SVR DB of the device

Patch #1: Initial upload
Patch #2: Fix based on Chul's comments

Change-Id: I2b55eaad5dd4c81f45373ca1dbde113c01d0a93d
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14791
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Chul Lee <chuls.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>
(cherry picked from commit 2de9ab10e67d24111202aa8e255b5bfb2634cee2)
Reviewed-on: https://gerrit.iotivity.org/gerrit/15307