platform/upstream/iotivity.git
8 years agoRE ServerBuilder always included "oic.if.baseline" interface.
jaesick.shin [Tue, 8 Mar 2016 03:09:48 +0000 (12:09 +0900)]
RE ServerBuilder always included "oic.if.baseline" interface.

If User don't setting "oic.if.baseline" interface.
but, RE ServerBuilder always support "oic.if.baseline" interface.

setDefaultInterface API(Modified comment of header) and Modified Initialize of Builder Constructor
If it is not called, the interface passed to the constructor is the default.

Added, Duplicate check the resource property of interface and resourcetype.

Change-Id: Ie25f1135cc7c99fbf5fe1b04f3121b9e2707be21
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed build issue by including condition_variable header
Philippe Coval [Mon, 7 Mar 2016 11:05:12 +0000 (12:05 +0100)]
Fixed build issue by including condition_variable header

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):

    error: 'condition_variable' in namespace 'std' does not name a type
    std::condition_variable cond;

Change-Id: Ieaff9bb24e0dd44e6660c7e2ac2d5d718e4270e2
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5495
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFixed build issue by implicitly capture by reference (of Scene)
Philippe Coval [Mon, 7 Mar 2016 10:58:19 +0000 (11:58 +0100)]
Fixed build issue by implicitly capture by reference (of Scene)

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):

    error: capture of non-variable 'OIC::Service::Scene::m_name'
    [&actions, &m_name](const SceneMemberResource::Ptr& member)

Futher explanation from Thiago Macieira <thiago.macieira@intel.com> :

  Looking up the C++ standard, it says that :
  "An entity that is designated by a simple-capture [...]
  shall be this or a variable with automatic storage duration".
  That means you cannot capture non-static members by name and you
  have to capture the whole object.
  Using [&] accomplishes capturing of "this".

Change-Id: Id9db9ca55b858b5c39cee48a5eb9b25ad9e59b41
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5497
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoOICSensorBoard: make configuration variables able be overriden from outside
Philippe Coval [Thu, 31 Dec 2015 17:23:11 +0000 (17:23 +0000)]
OICSensorBoard: make configuration variables able be overriden from outside

This still can be forced as :

  make CLIENTARCH=x86_64 BUILDTYPE=debug

Or by exporting CLIENTARCH in parent Makefiles or env

Change-Id: Iccf271ce0a5108a4c4c2f8c2d2187b7c02e00d34
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4745
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoOICSensorBoard: update includepath to new location of platform_features.h
Philippe Coval [Thu, 31 Dec 2015 17:22:00 +0000 (17:22 +0000)]
OICSensorBoard: update includepath to new location of platform_features.h

Change-Id: I13426ea38bd88db1ecd2de8d354755185de1c352
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4743
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFix issues reported by SVACE tool in CKM module 2
i.pazderskyy [Wed, 9 Mar 2016 11:59:12 +0000 (13:59 +0200)]
Fix issues reported by SVACE tool in CKM module 2

Change-Id: Ied98d297287e3e1dad6bc51b19889c6647e097b9
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5627
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFixed bugs reported SVase checking on |provisioningclient|
Kyungsun Cho [Wed, 9 Mar 2016 09:41:41 +0000 (18:41 +0900)]
Fixed bugs reported SVase checking on |provisioningclient|

Change-Id: I7f0c7fc2ecd6f1fa410f40fbe96dc3226531e92c
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5621
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix initialization in PKIX
Dmitriy Zhuravlev [Wed, 9 Mar 2016 12:40:59 +0000 (14:40 +0200)]
Fix initialization in PKIX

Change-Id: I752659624cba73d138936d1038913dd7ba19825d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5633
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoModify OTM & SRM according to spec CR document.
leechul [Thu, 3 Mar 2016 08:36:08 +0000 (17:36 +0900)]
Modify OTM & SRM according to spec CR document.

NOTE : This patch is modified based on ownership transfer CR document.
Please refer to https://workspace.openinterconnect.org/apps/org/workgroup/security_tg/download.php/4703/STG008_OIC%20CR%20Ownership%20Transfer%20sequence%20diagram%20v2.docx
This CR document seems to be applied to next spec.
I'd like to apply CR to save time for prepare 1.1.0 release.

This patch includes the following modifications :
   1. Modify not to include private data when OBT sends owner credential.
        - Please see the step 19 of CR document.

   2. Modify to re-establish secure session using owner credential
      when owner credential was successfully exchanged.
        - We can verify owner credential through re-establish secure session.
        - Please see the step 38,39 of CR docuemnt.

   3. Add logic to handle errors that occurred during ownership transfer.

[Patch #1] Initial upload.
[Patch #2] Add logic to handle errors
[Patch #3] Remove the compile errors and warnings.
[Patch #4] Retrigger
[Patch #5] Retrigger
[Patch #6] Rebase
[Patch #7] Rebase
[Patch #8] Update based on self-review.
[Patch #9] Rebase
[Patch #10] Retrigger
[Patch #11] Modify according to Mr.JongSung Lee's comment.

Change-Id: If3d8f21ef686db86dbfcc1b15382eeebaa232a9d
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5341
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix issues reported by SVACE tool in CKM module.
Ivan Pazderskyy [Wed, 2 Mar 2016 15:19:49 +0000 (17:19 +0200)]
Fix issues reported by SVACE tool in CKM module.

Change-Id: I995b4b6f0f58f9db0be2eb9703a80052b69523b2
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix static analysis issues in PM
Ashwini Kumar [Thu, 3 Mar 2016 11:05:16 +0000 (16:35 +0530)]
Fix static analysis issues in PM

Change-Id: I1a079333d7636b52f8ae9d4ab0609656a5395278
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoUpdated Address max size
Randeep Singh [Fri, 4 Mar 2016 07:07:26 +0000 (12:37 +0530)]
Updated Address max size

Max array of size 40 is not adequate for storing address ipv6 address.
Thus increased the value from 40 to 56.

Change-Id: Icd63c11365cefc2576043c87ef54802b5028c971
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5411
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix a problem in SceneCollectionResource.cpp file for 64bit environment
Jihun Ha [Mon, 7 Mar 2016 08:00:42 +0000 (17:00 +0900)]
Fix a problem in SceneCollectionResource.cpp file for 64bit environment

I found when a capture paramter in LAMDA operation is a reference type, an unexpected error happens.
So I've changed it to the parameter to be copied.

Change-Id: Id4b7ef68d85d0800df84331210c85fa035441229
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5483
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoModified const variable of baseline interface and excetion class.
jyong2.kim [Tue, 8 Mar 2016 04:10:24 +0000 (13:10 +0900)]
Modified const variable of baseline interface and excetion class.

When adding already has scene and scene member,
throw exception class is changed to RE layer exception class.
And const variable of baseline interface is changed at create RCSResourceObject.

Change-Id: I94c9d48e6d7dc9843d028130360c42fabb931191
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5531
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModified Exception and Doxygen in SceneManager Local-side Excepiton
wonny [Tue, 8 Mar 2016 01:41:21 +0000 (10:41 +0900)]
Modified Exception and Doxygen in SceneManager Local-side Excepiton

- InvalidAddMemberRequestException -> RCSBadRequestException
- Adds API doxygen of excepiton

Change-Id: Ie520f84bc6895c57e0bef9ed0ee6adb97154681d
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoremove build warnings for resource container
Minji Park [Tue, 8 Mar 2016 04:38:54 +0000 (13:38 +0900)]
remove build warnings for resource container

Change-Id: Ic2216bb76bcd16ac410e78a321b1d92cb3241596
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5533
Reviewed-by: Markus Jung <markus.jung85@gmail.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
8 years agoremoved unnecessary cafragmentation files
hyuna0213.jo [Mon, 7 Mar 2016 07:40:39 +0000 (16:40 +0900)]
removed unnecessary cafragmentation files

because fragmentation was not used, I deleted related code

Change-Id: Ic5bbfdc731a3157235c2ca59d061e54575916c78
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoFix CKM build error
Dmitriy Zhuravlev [Mon, 7 Mar 2016 13:49:21 +0000 (15:49 +0200)]
Fix CKM build error

Fix build error with "scons SECURED=1 DTLS_WITH_X509=1"

Change-Id: I317427bd8818e6f7f28edcdf7ff7957a9b78022d
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5501
Reviewed-by: Ivan Pazderskyy <i.pazderskyy@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFixed build issue by generating ~DiscoveryTask code
Philippe Coval [Fri, 4 Mar 2016 23:50:05 +0000 (00:50 +0100)]
Fixed build issue by generating ~DiscoveryTask code

If declared as default (and not defined), this function will be inlined,
but in some cases (using shared libraries?) inlining is not appropriate,
so it's preferred to make a regular declaration and still use the default
capabilities for definition.

Problem was observed while building using tizen-sdk :

    libresource_hosting.so: undefined reference to \
    `OIC::Service::RCSDiscoveryManager::DiscoveryTask::~DiscoveryTask()'

This message apeared while building RHSampleApp using tizen-sdk 2.4.0 Rev4
with imported libs (built with gbs from Tizen:2.4:Mobile repo)

Used toolchain for Tizen:2.4:Mobile is arm-linux-gnueabi-g++ (GCC) 4.9.2

Change-Id: I708812404b01c35f09e8aa68afad962c7d6e0df3
Origin: https://github.com/TizenTeam/iotivity/tree/sandbox/pcoval/for-upstream
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5445
Reviewed-by: Robert Spielmann <spielmann@kellendonk.de>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoOCPayloadConvert cbor payload size
Habib Virji [Mon, 7 Mar 2016 11:15:32 +0000 (11:15 +0000)]
OCPayloadConvert cbor payload size

CBOR payload conversion by default is set to 255. When memory failure occurs it
uses encoder->ptr - encoder->end to increase the payload size.

The recent error checking resulted in returning immediately and that result in
encoder->end having a wrong value set. Close container results in setting end
encoder->value correctly.

Changes include to not exit immediately if it fails. It fails after close container
call.

It also introduces the max size of the payload. It is set of 1530, which is based on
6 times of default paylaod size.

Change-Id: I9448a5beea9d3f906dd5f5647d0b6adcbea2cb37
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5491
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years ago[Mediator] Removed hard-coded Secure Flag from android application
lankamadan [Mon, 7 Mar 2016 04:46:53 +0000 (13:46 +0900)]
[Mediator] Removed hard-coded Secure Flag from android application

Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5441
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit 815da513484596845e08fb0ac80346930b662343)

Change-Id: Ifa96ff1d2a2a3e11a2916755495af2c32106d79e
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5449
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoMerge "Merge branch 'simulator'."
Madan Lanka [Mon, 7 Mar 2016 14:20:09 +0000 (14:20 +0000)]
Merge "Merge branch 'simulator'."

8 years agoMerge branch 'simulator'.
Harish Kumara Marappa [Mon, 7 Mar 2016 10:30:52 +0000 (16:00 +0530)]
Merge branch 'simulator'.

Change-Id: I7566052325446e1887fa531af4e6f47c4f4089db
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
8 years agoMerge "Merge branch 'cloud-interface'"
Jee Hyeok Kim [Mon, 7 Mar 2016 10:06:57 +0000 (10:06 +0000)]
Merge "Merge branch 'cloud-interface'"

8 years agoAdditional unit tests for the resource container component
Markus Jung [Thu, 3 Mar 2016 09:19:05 +0000 (18:19 +0900)]
Additional unit tests for the resource container component

Change-Id: I90b7b8c6dcc2075bdf30aad2b7fd6395deb1c328
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5347
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
8 years agoModified RCSResourceObject to eliminate its inheritance from enable_shared_from_this.
coderhyme [Thu, 3 Mar 2016 08:02:47 +0000 (00:02 -0800)]
Modified RCSResourceObject to eliminate its inheritance from enable_shared_from_this.

Change-Id: I7950249ad1ad132693ee93cb11794bf3b90c6e48
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5337
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMerge branch 'cloud-interface'
Jee Hyeok Kim [Mon, 7 Mar 2016 07:02:32 +0000 (16:02 +0900)]
Merge branch 'cloud-interface'

Change-Id: Icc8c35a45a75ab2e1703db95a9312fbdce746b44
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years agoResolved issues and concerns found during overall functionality testing.
G S Senthil Kumar [Thu, 3 Mar 2016 20:24:50 +0000 (01:54 +0530)]
Resolved issues and concerns found during overall functionality testing.

1. Handled the array type value validation.
2. Handled the redundant resource discovery callbacks.
3. Added more information in UI to show the array properties
   when updating array type values.
4. Added more log messages.

Change-Id: I95bf65ad4bd7b9cfcfe02141832b281065bd0f99
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoAdded UI Support for updating model arrays.
G S Senthil Kumar [Wed, 2 Mar 2016 12:48:15 +0000 (18:18 +0530)]
Added UI Support for updating model arrays.

Implemented changes in ServiceProvider and ClientController simulator
plug-ins for adding/removing items to/from array of complex attribute
value types.

Change-Id: I0f590fbbcf8dca7cbfaf9ca68eaecf55fd0a5626
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5279
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoMerge "Merge branch 'master' into cloud-interface" into cloud-interface
Jee Hyeok Kim [Mon, 7 Mar 2016 06:31:39 +0000 (06:31 +0000)]
Merge "Merge branch 'master' into cloud-interface" into cloud-interface

8 years agoMerge "Merge branch 'group-manager'"
Uze Choi [Mon, 7 Mar 2016 05:49:37 +0000 (05:49 +0000)]
Merge "Merge branch 'group-manager'"

8 years agoFixed build issue by implicitly capture by value (of RCSResourceObjectTest)
Philippe Coval [Sun, 6 Mar 2016 10:50:19 +0000 (11:50 +0100)]
Fixed build issue by implicitly capture by value (of RCSResourceObjectTest)

I assume this what the author meant, with the previous version it failed to build from source.

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2):

    service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:\
    In member function 'virtual void ResourceObjectInterfaceHandlerTest_GetResponseForBaselineContainsAllPropertiesOfServer_Test::TestBody()':
    service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:613:18:\
    error: capture of non-variable 'ResourceObjectTest::server'
    [server](const shared_ptr<OCResourceResponse> response)

    service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp:134:28:\
    note: 'OIC::Service::RCSResourceObject::Ptr ResourceObjectTest::server' declared here
    RCSResourceObject::Ptr server;

    (...)

Change-Id: I30f905bc983bbfad5e54ce60f5ccce4573cb2f78
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed unit tests for resource container
Markus Jung [Wed, 2 Mar 2016 08:04:04 +0000 (17:04 +0900)]
Fixed unit tests for resource container

Change-Id: Ib8d25140d08b538cb9d376f3e76bb390c8d0758e
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5291
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: JungHo Kim <jhyo.kim@samsung.com>
8 years agoUpdate ocstack.c cbData comments
Habib Virji [Sun, 6 Mar 2016 20:29:17 +0000 (20:29 +0000)]
Update ocstack.c cbData comments

C API cbData currently implies response is only when whole process is completed.

C++ API OCPlatform.h holds the details correctly for resourceHandler.

Jira Issue: IOT-678
Change-Id: I5ce19a03fe44189679ae05346fdfcb21f72d1b37
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5467
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoFix to notify connected state to Tizen LE client from network monitor
vimala.v [Thu, 3 Mar 2016 08:32:29 +0000 (14:02 +0530)]
Fix to notify connected state to Tizen LE client from network monitor

Change-Id: I6d0c0cbf1c6c48f07c39b1d01c48ac0f29396eaa
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agocorrected spelling mistakes
Manoj Gupta [Fri, 4 Mar 2016 04:11:34 +0000 (09:41 +0530)]
corrected spelling mistakes

Change-Id: Ia4e0f2fe476760f9050648726281ab8899509215
Signed-off-by: Manoj Gupta <manoj.g2@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5389
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agomodified timing issue associated with data transmission.
jihwan.seo [Fri, 4 Mar 2016 12:20:52 +0000 (21:20 +0900)]
modified timing issue associated with data transmission.

when gatt is disconnected during data transmittion.
there is some crash since some global variable was available.

Change-Id: I65cbedea1f1646c4636b507171a98c35dea76d4e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoMerge branch 'master' into cloud-interface
Jee Hyeok Kim [Mon, 7 Mar 2016 02:01:34 +0000 (11:01 +0900)]
Merge branch 'master' into cloud-interface

Change-Id: I7c493903fabad7e9444c5d1d16bd0d5cfca0c3fb
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
8 years agoMerge branch 'group-manager'
Jihun Ha [Mon, 7 Mar 2016 01:27:55 +0000 (10:27 +0900)]
Merge branch 'group-manager'

Conflicts:
service/SConscript

Change-Id: I583ef696a20ee406c2d6c17a79daabb0cbbf83d5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
8 years agoSample client for IoTivity Cloud feature
Jee Hyeok Kim [Fri, 4 Mar 2016 02:41:40 +0000 (11:41 +0900)]
Sample client for IoTivity Cloud feature

Change-Id: I7221324f6423b1b86c5a89aa228645f4f4b79221
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoDestroy ap handle after use
Saurav Babu [Fri, 4 Mar 2016 07:05:07 +0000 (12:35 +0530)]
Destroy ap handle after use

wifi_get_connected_ap() returns ap handle with allocated memory which
needs to be destroyed after use.

Change-Id: Ic157ddd973504b0a20ae87d2286fab5bc42de3f4
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5409
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFixed build issue caused by merge of 2 similar changes on DiscoveryManagerTest
Philippe Coval [Sun, 6 Mar 2016 11:57:06 +0000 (12:57 +0100)]
Fixed build issue caused by merge of 2 similar changes on DiscoveryManagerTest

Revert "Fixed a compilation error in DiscoveryManagerTest.cpp."

This reverts commit d3f7b087e2d272dfbfba4f1114fd030c9d7219a2.

Problem was observed while building on Tizen:2.4:Mobile (g++ 4.9.2)

Change-Id: I374236826587d67a07a0dd1ba39ac977b1943d29
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoIoTivity Cloud feature
Jee Hyeok Kim [Fri, 26 Feb 2016 10:57:03 +0000 (19:57 +0900)]
IoTivity Cloud feature

Change-Id: I27cb0613e65341f2b60570b63132e0b02549a629
Signed-off-by: jk13 <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFixed tests in resource-encapsulation by using move ctor
Philippe Coval [Thu, 3 Mar 2016 17:25:47 +0000 (18:25 +0100)]
Fixed tests in resource-encapsulation by using move ctor

DiscoveryTaskPtr is a unique_ptr, therefore it is a move-only object,
which is why ScopeTask's copy constructor is deleted.

This change Fix FTBFS by declaring move constructor (C++11 &&) in Task class
and also use it also in instance declaration to avoid copies.

Issue appeared with g++-4.9.2 on Tizen:Common and probably other setup

Reported error message is in this form :

  service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp: \
  In member function 'virtual void DiscoveryManagerTest_CallbackWouldNotBeCalledForSameRemoteResource_Test::TestBody()':

  service/resource-encapsulation/unittests/DiscoveryManagerTest.cpp:139:33: \
  error: use of deleted function 'ScopedTask::ScopedTask(const ScopedTask&)'
             onResourceDiscovered);
                                 ^

Change-Id: I0fe6d5c4037ddf90e83185d96f99c9378c56caa7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoRemove duplicated statements in sceneclient application
Jihun Ha [Sun, 6 Mar 2016 03:22:31 +0000 (12:22 +0900)]
Remove duplicated statements in sceneclient application

Change-Id: Ia67bdc441a162be1578f334b3e4932f79b09ef93
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix Tizen Repo URL
jyong2.kim [Fri, 4 Mar 2016 01:06:48 +0000 (17:06 -0800)]
Fix Tizen Repo URL

The Tizen repo URL should point to a version that exists. 'latest' is
designated to track current releases.

Change-Id: I2408f8ca46c3baf1f244df4953770be52b73f7ab
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
(cherry picked from commit cc097a1890195d3611ae413a2501fb29fd136e07)
Reviewed-on: https://gerrit.iotivity.org/gerrit/5405
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd API doxygen and Code Refactoring of SceneManager Local-side Interface
jyong2.kim [Thu, 3 Mar 2016 11:58:14 +0000 (20:58 +0900)]
Add API doxygen and Code Refactoring of SceneManager Local-side Interface

- add API doxygen
- change API name in SceneAction (resetExecutionParameter)
- change getSceneAction logic for modifying resource handling module

Change-Id: I35a44b8c67ceb69c1a0728ba9ca4e2303b577ef1
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5359
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoadd doxygen comments for scene manager remote apis, and change interface name of...
jyong2.kim [Thu, 3 Mar 2016 05:43:23 +0000 (14:43 +0900)]
add doxygen comments for scene manager remote apis, and change interface name of remote scene action

- add doxygen comments for scene manager remote apis
- remove unsupported apis(apis for collection, scene, action remove)
- change api name in RemoteSceneAction
 (setExecutionParameter-> resetExecutionParameter)

Change-Id: I74fae9164a5a081cc17cefd59b8d2b2713dbb27a
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5319
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix issue related SVACE in C provisioningclient sample
js126.lee [Thu, 3 Mar 2016 06:20:30 +0000 (15:20 +0900)]
Fix issue related SVACE in C provisioningclient sample

- Patch 1; Init.
- Patch 2,3: Applying Chul's review comment.
- Patch 4: Modify file permission

Change-Id: I15f914ef000ac95ca33bdb80ea16a25d15bd14bf
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5325
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoImprove some components for simple and performance.
jyong2.kim [Thu, 3 Mar 2016 07:47:30 +0000 (16:47 +0900)]
Improve some components for simple and performance.

This patch is for apply offline code review comments by JungHo.

several method is made by duplicated code.
unnecessary valiable is removed.
lamda functions is used instead std::bind for reduce std::bind.
logic simplify for performance and readable.

Change-Id: Iefb0f4b3ee5ae99201127cd3343ea819f9f7fd3d
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5335
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoMinor bug fixes.
G S Senthil Kumar [Fri, 4 Mar 2016 11:38:00 +0000 (17:08 +0530)]
Minor bug fixes.

Added code to parse "oneOf" property from JSON file.
Edited UI hint comment shown during resource creation.

Change-Id: Ieec60675657e0b8ae8b2ed5d878f300b68ba7775
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5431
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for SVACE and Klocwork issues.
Harish Kumara M [Sat, 5 Mar 2016 06:49:09 +0000 (12:19 +0530)]
Fix for SVACE and Klocwork issues.

1. Fix for SVACE reported issues.
2. Fix for Klocwork reported issues.
3. Fix the resource creation issue when "rt" property is having null value.
4. Added to code to check the uniqueness property of array for primitive types int,
    double, boolean and string.

Change-Id: Ib869361f0ffa1dac5d3f7b36ebf76754661e2a7f
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoAdded Unittests for RE InterfaceHandler
jaesick.shin [Fri, 4 Mar 2016 08:52:48 +0000 (17:52 +0900)]
Added Unittests for RE InterfaceHandler

About generate response according to the interface of requests.
Check the resource property(uri, resource type, resource interface) and attributes.

Change-Id: Icbc13f2b8a24ca56d887115d9f0e355caafbef28
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoError handling for the cbor handling in ocpayload
Habib Virji [Fri, 13 Nov 2015 14:40:24 +0000 (14:40 +0000)]
Error handling for the cbor handling in ocpayload

Defines a macro for error handling cbor load.
Any error leads to freeing and error details.
Some common functions has been created to ease
in freeing of memory in case of error.

OCDiscoveryCollectionPayloadAddResource is updated to
pass one parameter OCCollectionPayload instead of two
parameter. This is to ease passing param to MACRO.

Change-Id: I58e6c843fcacd8d952dad7b3a14c6327befcf77d
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4237
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoremoved warning in connectivity abstraction.
jihwan.seo [Fri, 4 Mar 2016 02:21:21 +0000 (11:21 +0900)]
removed warning in connectivity abstraction.

there are many warning unused parameter.

Change-Id: Icabfcc5cd31ed24a4c6e8fdd8628212f89565f4c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5379
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoMerge "Merge branch 'easysetup'"
lankamadan [Sat, 5 Mar 2016 04:34:02 +0000 (04:34 +0000)]
Merge "Merge branch 'easysetup'"

8 years agoAdd new operations to RCSResourceAttributes
coderhyme [Fri, 4 Mar 2016 08:45:47 +0000 (00:45 -0800)]
Add new operations to RCSResourceAttributes

A new public function, erase with iterator, is added. This is fundamental operation for using iterator.
A new feature is added, which is a new visitor with rvalue.

Change-Id: If2d5db51badfc3821f3b74a547c1f7251fb39126
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5419
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFixed a compilation error in DiscoveryManagerTest.cpp.
coderhyme [Fri, 4 Mar 2016 08:48:41 +0000 (00:48 -0800)]
Fixed a compilation error in DiscoveryManagerTest.cpp.

The issue occurs when compiled with the newer compiler(i.e. gcc 4.8)

Change-Id: Ia36ebc705f29085d794910714cf24cc6999a85da
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5421
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 agoRemove group manager APIs from Doxygen and JavaDoc
Jihun Ha [Fri, 4 Mar 2016 08:45:28 +0000 (17:45 +0900)]
Remove group manager APIs from Doxygen and JavaDoc

The current group manager APIs will be replaced with scene manager APIs.
So I just hide group manager APIs from API document.
Removing the codes for the replacement will be planed in the future.

Change-Id: Ie2086a974d50bb7b46ac40fa85e99ad85bfc8409
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5417
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix issues reported by SVACE tool in Security module
Andrii Shtompel [Wed, 2 Mar 2016 12:43:04 +0000 (14:43 +0200)]
Fix issues reported by SVACE tool in Security module

Change-Id: I04966f191eb8d0c1a11c7b51b9f209688874a047
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5303
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoFix for issues reported on SVACE tool for PKIX
Dmitriy Zhuravlev [Wed, 2 Mar 2016 11:42:41 +0000 (13:42 +0200)]
Fix for issues reported on SVACE tool for PKIX

Fixed issues reported on running svace analysis to PKIX

Change-Id: I84af37b59c45061371ead13a5adc990aa8e8a755
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5299
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
8 years agoMerge branch 'easysetup'
lankamadan [Fri, 4 Mar 2016 09:41:03 +0000 (18:41 +0900)]
Merge branch 'easysetup'

Conflicts:
android/android_api/base/jni/Android.mk
resource/csdk/security/provisioning/SConscript
tools/tizen/iotivity.spec

Change-Id: I85b5e3daad5055a1f1c36f3951476e84d0a05285
Signed-off-by: lankamadan <lanka.madan@samsung.com>
8 years agoModified RCSSeparateResponse to send the response built by interface handlers.
coderhyme [Wed, 2 Mar 2016 04:08:57 +0000 (20:08 -0800)]
Modified RCSSeparateResponse to send the response built by interface handlers.

RCSResourceObject has interface handlers in order to build proper responses by the interfaces of the requests.
Separate response should use them to build the response.

Change-Id: Ic2b9af279acbecf025a06b493347d6d5cbdea20c
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoFix Tizen Repo URL
Trevor Bramwell [Fri, 4 Mar 2016 01:06:48 +0000 (17:06 -0800)]
Fix Tizen Repo URL

The Tizen repo URL should point to a version that exists. 'latest' is
designated to track current releases.

Change-Id: I2408f8ca46c3baf1f244df4953770be52b73f7ab
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5377
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for SVACE and Klocwork issues in RAML parser module.
Harish Kumara Marappa [Thu, 3 Mar 2016 20:24:50 +0000 (01:54 +0530)]
Fix for SVACE and Klocwork issues in RAML parser module.

This includes code changes for following issues
1. SVACE reported issues.
2. Klocwork reported issues.
3. Setting array minimum, maximum, unique and additional items property properly.

Change-Id: I7ffd8f985ff6db02c1469c6c86884f9c5baadaf5
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for issue of allowed values property of IntegerProperty, DoubleProperty
Harish Kumara Marappa [Thu, 3 Mar 2016 20:32:38 +0000 (02:02 +0530)]
Fix for issue of allowed values property of IntegerProperty, DoubleProperty

and StringProperty not converting from Java to C++ objects.

Change-Id: I1a639bbfd52e2c548d7ffad3e8fc000cf7fc982a
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5375
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoResolved an issue related to array value validation.
G S Senthil Kumar [Thu, 3 Mar 2016 20:12:40 +0000 (01:42 +0530)]
Resolved an issue related to array value validation.

Handled unique property when validating an array type attribute value.

Change-Id: Ifbe6e8f4d8077b410780adc7b517e203043a2ecd
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoChanged PUT to POST, fix for not sending SSID/PWD in the get response & added a trigg...
lankamadan [Thu, 3 Mar 2016 10:27:00 +0000 (19:27 +0900)]
Changed PUT to POST, fix for not sending SSID/PWD in the get response & added a trigger for network connection

- Changed PUT to POST
- Fix for not sending SSID/PWD in the get response
- Added a trigger for making Enrollee connect to network

Change-Id: I4e041bb1ea3543c595f37a6b59dbc55b420ae838
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoTo add "coap+tcp://" header to url for EDR and BLE
jihwan.seo [Thu, 3 Mar 2016 07:59:29 +0000 (16:59 +0900)]
To add "coap+tcp://" header to url for EDR and BLE

since CoAP over TCP was applied to EDR and BLE transport type,
coap+tcp:// header has to be used.

Change-Id: I682d7b4adcb9be51fa811461b8eb24bc7522c211
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoChange iotivity.com to iotivity.org
Jaehong Jo [Thu, 3 Mar 2016 07:43:12 +0000 (16:43 +0900)]
Change iotivity.com to iotivity.org

We don't own the .com domain.

Change-Id: I03ab8ddf82988b2d764cb472270593543e8d6ac7
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoChange file mode.
Jaehong Jo [Thu, 3 Mar 2016 06:16:12 +0000 (15:16 +0900)]
Change file mode.

Remove execute permission from source code.

Change-Id: Ib40693012c88952c069381e4361a9ef63cc0905a
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5323
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agomodified connection state callback for cleaing recv buffer.
jihwan.seo [Wed, 2 Mar 2016 08:42:39 +0000 (17:42 +0900)]
modified connection state callback for cleaing recv buffer.

and removed wrong callback logic for bond state.

Change-Id: I6dbfe286a10b644fb180dd4b5a8e62b309946d42
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5295
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
8 years agoResolved build error for SECURED=1 in Android
lankamadan [Thu, 3 Mar 2016 06:55:03 +0000 (15:55 +0900)]
Resolved build error for SECURED=1 in Android

- Added missed security library for android when building with SECURED=1

Change-Id: I3282c1b0ec40d825c0c1cafd8528582b8b157ce4
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5327
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoEnrich a sceneclient sample application for executing an existing scene at remote...
Jihun Ha [Thu, 3 Mar 2016 06:12:54 +0000 (15:12 +0900)]
Enrich a sceneclient sample application for executing an existing scene at remote device

Add one more scenario in a sceneclient sample, which executes an existing
scene created by sceneserver sample application.

Step1: Construct a SceneCollection with light and fan resources with
sceneserver application
Step2: Discover its SceneList resource
Step3: Check the exsiting SceneCollection resource and Scenes
Step4: Execute one of the Scenes

Change-Id: I58bd8eb5b3913c8a180de509b56605051d54ecc0
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoModified util functions to call oc functions.
coderhyme [Thu, 3 Mar 2016 03:00:58 +0000 (19:00 -0800)]
Modified util functions to call oc functions.

This is to prevent oc function from being called after the instances of oc apis are destroyed.
It happens when the process is in termination state.

Change-Id: I4c87a62e15a8b909c6aa21c408575e84fcd52470
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5315
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd API doxygen to SceneManager Local-side interface
wonny [Wed, 2 Mar 2016 13:51:21 +0000 (22:51 +0900)]
Add API doxygen to SceneManager Local-side interface

- SceneList/SceneCollection/Scene/SceneAction

Change-Id: I555fc6f92ca097cb0c982fd374aa47f31a79d1c1
Signed-off-by: wonny <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agomodify scene manager(remote) for exception handling
Minji Park [Wed, 2 Mar 2016 14:10:52 +0000 (23:10 +0900)]
modify scene manager(remote) for exception handling

- add exception handling for callback null check
- add mutex for name of scenelist, scenecollection
- remove unused code

Change-Id: Ib2c1c260cc9efc8372393dd08331be435d2c5c7e
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoAdd collection payload to include each resource information separately
Habib Virji [Tue, 23 Feb 2016 00:45:29 +0000 (00:45 +0000)]
Add collection payload to include each resource information separately

- Each resource information is stored separately.
[{"href":"", "rt": "", "if":"", <property>}, .. ]
- Compared to previous approach where all resource where stored together.
- It fixes issue related to checking map before finding value, duplicated information in the payload of rt and if.
- Adds unit test when empty array is passed as a parameter.
- Adds unit test for checking values not containing rt and itf.

Jira-Issue: 923, 950, 962
Change-Id: I0692018c13d295d6a28d289819835c525dc08cf5
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
8 years agoAdded UI Support to change resource type.
G S Senthil Kumar [Tue, 1 Mar 2016 15:15:53 +0000 (20:45 +0530)]
Added UI Support to change resource type.

Allowing the resource type to be changed after resource creation.
Removed unused data maintained by the ServiceProvider plug-in.

Change-Id: I2e7b617888bd2fe866a84fee920d2e327a9f9597
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5283
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoAdded a Java API required and updated Javadoc comments.
G S Senthil Kumar [Tue, 1 Mar 2016 11:33:48 +0000 (17:03 +0530)]
Added a Java API required and updated Javadoc comments.

Java API added to change the attribute name after creation.

Change-Id: I94a29031aeb9ad9441430eaf5ef7cb8041e550f6
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
8 years agoFix for send failure via Non-IP adapters
vimala.v [Wed, 2 Mar 2016 11:52:08 +0000 (17:22 +0530)]
Fix for send failure via Non-IP adapters

Change-Id: I16338d4ba55b8dfb21957ec0084fc731cfd02c3a
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years ago[IOT-955] To separate of pairing BT
jihwan.seo [Sun, 21 Feb 2016 07:17:18 +0000 (16:17 +0900)]
[IOT-955] To separate of pairing BT

If there were a number of BT devices near the user device,
user device will try to request pairing key exchange regardless
BT device owner.

it can cause very serious user experience problem.
so. i have added BT pairing from discovery procedure.
then the iotivity tries to find resources from
already paired BT devices provided each platform.

Change-Id: I8adee751c8e66e87a54ccc1b27ec0800c1c1edb3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoTo support autoconnect flag of connectGatt(..) for multi-connection.
jihwan.seo [Wed, 2 Mar 2016 07:31:14 +0000 (16:31 +0900)]
To support autoconnect flag of connectGatt(..) for multi-connection.

suitable autoconnect flag will be suppored as per devices
for backgound connection and first connection.

Change-Id: Ib8b3bb7ab6cedd8553d2b3ed51ea15dbc8caff68
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5289
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoTo add connection manager for client for android BLE.
jihwan.seo [Fri, 19 Feb 2016 03:03:33 +0000 (12:03 +0900)]
To add connection manager for client for android BLE.

Change-Id: I54557c69c58d4f3dd4a1434d492d40c1d25a5ffa
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFixing error return type of OTMDoOwnershipTransfer API in case of NULL callback
sahil bansal [Wed, 2 Mar 2016 04:58:15 +0000 (10:28 +0530)]
Fixing error return type of OTMDoOwnershipTransfer API  in case of NULL callback

Change-Id: I832c4c8e5b2361cb122473b1cd9b0c0b8c24a8da
Signed-off-by: sahil bansal <sahil.bansal@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5287
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoModify OTM & SRM to resolve gap in ownership transfer sequence.
leechul [Wed, 24 Feb 2016 00:29:35 +0000 (09:29 +0900)]
Modify OTM & SRM to resolve gap in ownership transfer sequence.

According to OIC security spec B,
Current IoTivity security module(OTM/SRM) has gap in ownership transfer sequence.

This patch includes the following modifications to remove the gap :
  1. Modify to update the 'Owned' as TRUE after owner credential is determined.
  2. In case of PIN based OxM, We should not create a temporal credential.
     It will be handled directly in dtls layer.
     It means we should use another get_psk_info callback
     instead of GetDtlsPskCredentials during PIN based OxM.
  3. The PT(OBT) transmits the owner credential(OwnerPSK) directly to the client.
     The client will only need to verify recevied OwnerPSK.
  4. Modify to include the 'cm' when update pstat in end of security provisioning.

NOTE1 : Please refer to the Figure 9, Table 3 and Figure 10, Table 4 in Spec B.
NOTE2 : IMHO, The current spec B document is not perfect in implementation perspective.
So we've proposed a updated ownership transfer sequence in details through CR document.
And it is expected to be accepted.
We should be update again when spec document is released or CR codument is accepted.
Please keep this in mind.

[Patch #1] : Initial upload.
[Patch #2~#4] : Remove the compile errors and warnings.
[Patch #5] : Retrigger
[Patch #6] : Remove the compile error in doxmresource for arduino
[Patch #7] : Modify according to review comments.
[Patch #8~#9] : Retrigger

Change-Id: If88e7028b55d830d21643a915444a81dc912a948
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5149
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
8 years agoModified query interface on request for resource creations.
jyong2.kim [Mon, 29 Feb 2016 10:17:57 +0000 (19:17 +0900)]
Modified query interface on request for resource creations.

When request resource creation, it will send by LINK_BATCH interface.
but as of now, LINK_BATCH dose not define by Stack.
So, LINK-BATCH is defined in SceneCommons.h
and query interface is changed to LINK_BATCH from OC::BATCH_INTERFACE.

Apply sceneValues in query Attributes at creation of scene collcention resource.

Change-Id: I887456a85e33c05c515859f4acd52bbad957f3d5
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5269
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
8 years agoUpdated unit test for Resource Hosting.
jyong2.kim [Mon, 29 Feb 2016 09:31:49 +0000 (18:31 +0900)]
Updated unit test for Resource Hosting.

a couple of unit test is added at RH unit test.
disable install of unit test file to build root path.

Change-Id: I1882973addf5eb3a86132dd9d0ccfda6fc10199c
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5267
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFix for defects detected by static analysis in Scene Utils/Samples.
jyong2.kim [Mon, 29 Feb 2016 09:21:40 +0000 (18:21 +0900)]
Fix for defects detected by static analysis in Scene Utils/Samples.

Check to allocated memory using OICMalloc().
Fix execution with path of system command.
Catch exception in Sample app'.

Change-Id: I313d5a3fadf473f6cac355cb0b8cc5e49248dea0
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5265
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoFix to resolve discovery issue when built with "scons"
vimala.v [Mon, 29 Feb 2016 11:37:30 +0000 (17:07 +0530)]
Fix to resolve discovery issue when built with "scons"

TARGET_TRANSPORT=ALL is the default value and TCP support is
enabled in this case.  As currently multicast is not supported via TCP,
Discovery is not working.  This patch resolves the issue by sending UDP based
packet via IP adapter while TCP based packet via other adapters.

Change-Id: I6fb7556c2d5053c4c14c8fc21892b23c06602608
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5271
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoNFC Adapter initialization error
Ashok Babu Channa [Tue, 1 Mar 2016 13:55:03 +0000 (19:25 +0530)]
NFC Adapter initialization error

NFC Adapter is not able to initialize during selection of network. It is modified to initialize on
NFC_ADAPTER definition during build for all target transport or individual selection

Change-Id: I19f716b4f3ab20b267f38e8585e418e501be7a72
Signed-off-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoFix in Tizen 2.4 BLE client to discover services when the remote device is already...
vimala.v [Wed, 24 Feb 2016 04:27:41 +0000 (09:57 +0530)]
Fix in Tizen 2.4 BLE client to discover services when the remote device is already connected via GATT profile.

Change-Id: I834c110425beaec330368eb6a5a1b1e79213213f
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
8 years agoadded the logic to clean receive buffer when disconnected
jihwanseo [Mon, 29 Feb 2016 06:26:35 +0000 (15:26 +0900)]
added the logic to clean receive buffer when disconnected

when connection state is disconnected,
received data has to be removed.

Change-Id: I05c5a0142549e3c3fac2fb83d6fd038487ec70c2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoto add error checker for gatt connection state
jihwan.seo [Thu, 25 Feb 2016 06:25:40 +0000 (15:25 +0900)]
to add error checker for gatt connection state

- it handles to process retry as per states for gatt connection state.
- to add code which waiting for target device for unicast.

Change-Id: Idc558154895792027a9535bb61558d483fb04148
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoadded CA interface to monitoring network status for android ble.
jihwan.seo [Wed, 17 Feb 2016 22:50:15 +0000 (07:50 +0900)]
added CA interface to monitoring network status for android ble.

add new CA interface for network status changes delivery to android
for ble connection manager

Change-Id: I21d5e1d134fc09fc38cb7e3706fc628f6e18a039
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoCoAP over TCP transmission over BLE support for arduino
vimala.v [Fri, 26 Feb 2016 08:46:15 +0000 (14:16 +0530)]
CoAP over TCP transmission over BLE support for arduino

Change-Id: I5b7a775a85fab47c04c8dbbf45b064e796985209
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5225
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
8 years agoUpdated api description for response classes of RE.
coderhyme [Mon, 29 Feb 2016 02:12:12 +0000 (18:12 -0800)]
Updated api description for response classes of RE.

Change-Id: I3bf6047ebe7f9b84f83438ce8093ce31e173c443
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5251
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
8 years agoFix for issues reported on SVACE tool for CA
koushik.girijala [Mon, 29 Feb 2016 13:08:05 +0000 (18:38 +0530)]
Fix for issues reported on SVACE tool for CA

Fixed issues reported on running svace analysis to CA

Change-Id: I761aeccd576744c179da2042917cacf57d6e473b
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoRC Configuration: fixing potential dereference of null pointers
Markus Jung [Mon, 29 Feb 2016 08:17:12 +0000 (17:17 +0900)]
RC Configuration: fixing potential dereference of null pointers

Checks to make sure if certain configuration values are not
provided no null dereferenciation happens.

Issues reported by SVACE tool.

Change-Id: If4b7466dc2faca9447457784fb54d9990c3a15e4
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
8 years agoIoTivity Security bug fix and enable security api usage in easysetup Android app
saurabh.s9 [Mon, 29 Feb 2016 08:10:52 +0000 (13:40 +0530)]
IoTivity Security bug fix and enable security api usage in easysetup Android app

- IoTivity bug is fixed by changing IoTivity security libraries from static to dynamic
  https://jira.iotivity.org/browse/IOT-956
- Enabled Security api usage in Easysetup Android app

Change-Id: Id4296c724968cdfe52c673e5ea1696afa0346238
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5181
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>