iotivity.git
3 years agoMerge branch 'master' into notification-service 69/9269/1
uzchoi [Mon, 11 Jul 2016 02:39:29 +0000 (11:39 +0900)]
Merge branch 'master' into notification-service

Change-Id: I968cfa282e3ef1e3132ea0fbe93a7098115c7193
Signed-off-by: uzchoi <uzchoi@samsung.com>
3 years agoBuild: disable shared library of gtest as suggested 47/9147/4
Philippe Coval [Mon, 4 Jul 2016 11:58:15 +0000 (13:58 +0200)]
Build: disable shared library of gtest as suggested

As suggested by Jon A. Cruz "
 "GTest in general is more focused away from the shared.
  System-wide pre-compiled shared libs were deprecated a while back.
  Sets of programs built at the same time *might* be OK
  with a local shared version,
  but static linkage makes it safer."

So this patch explicitly disable dynamic library of gtest,
it can be reverted on trouble as there is no "hard requirement" for it.

For the record, I came to this once I noticed
that using default shared library
caused troubles on some Yocto distros (LfAgl) :

  relocation R_X86_64_PC32 \
  against undefined hidden symbol
  `__init_array_start'
  can not be used  ...

I suspect this problem is not related to gtest or iotivity.

Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: I9e4798aa3a579020255e8f53a8da8926dc4dee4f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9147
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agopackaging: gbs: use git tags from upstream 48/248/4
Philippe Coval [Mon, 19 Jan 2015 15:01:37 +0000 (16:01 +0100)]
packaging: gbs: use git tags from upstream

Change-Id: I3875e3761e982dd0d7af7ad8c40f37ff610e4857
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/248
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agotizen: Bump to 1.1.1 93/9093/2
Philippe Coval [Fri, 1 Jul 2016 21:45:20 +0000 (23:45 +0200)]
tizen: Bump to 1.1.1

Change-Id: I0a5a0ba9c8d1f82af01e7ed9bae54209af67e582
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoFixed issue where "oic.wk.d" was removed from array of device types. 07/9107/3
Joseph Morrow [Sat, 2 Jul 2016 23:33:39 +0000 (16:33 -0700)]
Fixed issue where "oic.wk.d" was removed from array of device types.

Change-Id: I54ee75be4e7bbb9ce4de2b656dabff4c6386d58f
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoFor some reason, changes in ocserverrequest.c in 83/9183/2
Ziran Sun [Tue, 5 Jul 2016 15:17:30 +0000 (16:17 +0100)]
For some reason, changes in ocserverrequest.c in
https://gerrit.iotivity.org/gerrit/#/c/8815/
was not picked up when merging. This patch added
the missed line back in.

JIRA issue: https://jira.iotivity.org/browse/IOT-1122

Change-Id: I3ac7bf447a66971e7ae05eade5a18d8afc344137
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9183
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
3 years ago[IOT-1185] Add OCResultToSuccess to ensure success. 17/9217/2
Jaehong Jo [Thu, 7 Jul 2016 12:47:53 +0000 (21:47 +0900)]
[IOT-1185] Add OCResultToSuccess to ensure success.

If just check only OC_STACK_OK, it can cause problems.
Below value is success like OC_STACK_OK.
OC_STACK_RESOURCE_CREATED,
OC_STACK_RESOURCE_DELETED,
OC_STACK_CONTINUE.

BUG : https://jira.iotivity.org/browse/IOT-1185

Change-Id: I60b369138df00b98c4dbeb952ffba140aa902b27
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9217
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoChange the name of dpc property of doxm to the vendor-defined name 97/9197/7
Chul Lee [Thu, 7 Jul 2016 14:52:52 +0000 (23:52 +0900)]
Change the name of dpc property of doxm to the vendor-defined name

Apply a patch to change the name of "dpc" property of doxm resouce to "x.com.samsung.dpc" as the vendor-defined name.

Patch #1: Initial patch
Patch #2: Fix unittest on CredResource in windows machine
Patch #3: Rebase and fix minor bugs.
Patch #4: Fix minor bug in unittest.
Patch #5: Remove the printf().

Change-Id: I8c9dd0483e090ceb00ed3d7208d9ca1f3897e432
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9197
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoupdate version number to 1.1.1 53/9153/2
Hauke Mehrtens [Mon, 4 Jul 2016 16:51:44 +0000 (18:51 +0200)]
update version number to 1.1.1

The next release is version 1.1.1, change the version number.

Change-Id: I0e74f5a919574c0f9730eb623117a548e8ffcd53
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoUpdate ACL data-structure based on RAML spec. 41/8241/20
leechul [Fri, 20 May 2016 00:41:00 +0000 (09:41 +0900)]
Update ACL data-structure based on RAML spec.

   1. Change the OicSecAcl_t according to RAML spec
   2. Add OicSecAce_t according to RAML spec
   3. Update ACL realted modules(PolicyEngine, DirectPairing, json2cbor)
   4. Update unit-test and samples

[Patch 13] Retrigger
[Patch 14] Update 'if' and 'rt' property as array according to core spec.
            * Security RAML spec should be updated.
[Patch 15-16] Remove the compile error for arduino.
[Patch 17-18] Remove the cimpile error for arduino and windows.
[Patch 19] Update missed SVR DB.

Change-Id: I7a213ff0843020324a408dd1ceded31b01affa54
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8241
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years ago[IOT-1179] Adding rt and if into response of Get request to doxm and pstat 67/9167/6
js126.lee [Tue, 5 Jul 2016 08:04:46 +0000 (17:04 +0900)]
[IOT-1179] Adding rt and if into response of Get request to doxm and pstat

Issue: Response of GET request to /oic/sec/doxm resource has problem(no "rt" and "if" property)
       Per the core spec, every Resource shall have both rt and if.
Solution : Adding rt and if into response payload of Get request to doxm and pstat

Patch1,2 : Apply patch
Patch 3,4,5: Apply dongik's review

Change-Id: I6f9ad75194f9baa6c9dda25f742e38b790cd6cb7
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoservice is terminated when repeated starts and stops. 39/9139/2
jaesick.shin [Mon, 4 Jul 2016 04:52:50 +0000 (13:52 +0900)]
service is terminated when repeated starts and stops.

The reason for this issue is due to deallocate the
variables that are created as char array when the nsstopprovider operating.
so, that bug is fixed.

Change-Id: I6d8fc5ca9f719b8236f9660376604ed41a04ef81
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9139
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoBuild: Bump version to 1.1.1 87/9187/2
Philippe Coval [Tue, 5 Jul 2016 16:46:08 +0000 (18:46 +0200)]
Build: Bump version to 1.1.1

To generate correct iotivity.pc

Bug: https://jira.iotivity.org/browse/IOT-1117
Change-Id: I9e671c151044c3336edc576b2ee5f093872c2027
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agozigbee_wrapper: fix format string 97/4897/4
Hauke Mehrtens [Fri, 15 Jan 2016 23:03:24 +0000 (00:03 +0100)]
zigbee_wrapper: fix format string

use correct type for variable called result.

Change-Id: I9029b4150f9b5cab3cb2d41a50314c5747f45a39
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoFix tcp adapter build issue related to CAEndpoint_t 13/9113/2
hyuna0213.jo [Mon, 4 Jul 2016 04:54:32 +0000 (13:54 +0900)]
Fix tcp adapter build issue related to CAEndpoint_t

resolved the build issue caused by merge of
https://gerrit.iotivity.org/gerrit/#/c/8441/

Change-Id: If0caf9d116440025c60ae6ee019890947ceebe3d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years ago[IOT-1152] Clear static global data in OCStop. 19/8819/2
Todd Malsbary [Tue, 21 Jun 2016 17:03:52 +0000 (10:03 -0700)]
[IOT-1152] Clear static global data in OCStop.

This prevents subsequent calls to OCInit or OCStop from referencing
freed memory.

Change-Id: I9a20b72582920b5767c7617680b3b665093576b0
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoChange request method to POST on updating cred in OTM 61/9161/3
js126.lee [Tue, 5 Jul 2016 06:10:18 +0000 (15:10 +0900)]
Change request method to POST on updating cred in OTM

the issue is that the /cred resource will actually exist, just will have no creds in it (empty array).
So this is really an UPDATE, to update the "creds" property of the oic.r.cred resource.
Once CTT has changed to POST on OTM, OC_REST_PUT case will be removed in CredEntityHandler

Patch1: apply patch
Patch2: Add comment

Change-Id: Iaa4b7d72e5855575be1f91b48997ee445941df03
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9161
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years ago[IOT-986] Not send response to multicast message for resource not existing 73/9073/3
Habib Virji [Fri, 1 Jul 2016 14:09:57 +0000 (15:09 +0100)]
[IOT-986] Not send response to multicast message for resource not existing

The resource not existing, it should not return any response for multicast packet.
There was no check for multicast request, this has been added and it does not send
any response.

Also add OC_MULTICAST type in octypes.h.
octypes.h transport flag should correspond to flags set in the CA layer. In the CA
layer (1 << 7), 7 bit is set for Multicast. In the RI layer, the type were differing,
hence was not possible to check if it is multicast packet. Please note the OC_RESERVED1
was not used anywhere and was wrong, it should match the transport flag of the CA layer.

BUG: http://jira.iotivity.org/browse/IOT-1126,
     http://jira.iotivity.org/browse/IOT-1107,
     http://jira.iotivity.org/browse/IOT-986

Change-Id: Ia8a7d1bdacf4e9a8a8d6cb21c49ad830cce7c3cc
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoDisable OC_SECURE flag in case of SECURED=0 build. 75/8875/4
Chul Lee [Wed, 22 Jun 2016 12:19:17 +0000 (21:19 +0900)]
Disable OC_SECURE flag in case of SECURED=0 build.

Change-Id: I53b8a05fc1bc84ea9b32bd8c5c312616b7c3f5c6
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8875
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoModify Consumer Logic 17/9117/5
YounghyunJoo [Tue, 5 Jul 2016 06:12:36 +0000 (15:12 +0900)]
Modify Consumer Logic

- Modify name of the internal member values (ex> _addr->i_addr).
- Modify data type for message ID & message TTL (uint64_t: %ld->%llu).
- Modify storage(NSMessage/NSProvider) logic
- Remove unnecessary task logic (TASK_RECV_READ/TASK_RECV_DISMISS).
- Remove unnecessary comments & Modify typo

 . patch#1: initial commit
 . patch#2: modify typo
 . patch#3: remove tab
 . patch#4: update review comment

Change-Id: Iedafc2c6f605656d38b5e5354f1d57b6827566ca
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9117
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoPrevent the duplicate PIN output in case of retransmission message. 97/8897/2
Chul Lee [Thu, 23 Jun 2016 00:56:49 +0000 (09:56 +0900)]
Prevent the duplicate PIN output in case of retransmission message.

[Patch #1] Initial upload.

Change-Id: I3f69865a5fccaef9775d0200c0afaa7ce7247c20
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoreplaced previous coap header for BT with 'coap+gatt' and 'coap+rfcomm' 11/8911/4
jihwan.seo [Thu, 23 Jun 2016 05:14:00 +0000 (14:14 +0900)]
replaced previous coap header for BT with 'coap+gatt' and 'coap+rfcomm'

Change-Id: Ic78a27f34d2cc967344c5d7baae76f9a6415942e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoFixed the missed returned_length on |credresource| 27/9127/2
Kyungsun Cho [Mon, 4 Jul 2016 08:34:08 +0000 (17:34 +0900)]
Fixed the missed returned_length on |credresource|

Change-Id: I7098520a88c224f62c711917f3db1b139be064bf
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoocpayload: in DMV remove undesired trailing separator 69/9069/5
Philippe Coval [Fri, 1 Jul 2016 20:58:37 +0000 (22:58 +0200)]
ocpayload: in DMV remove undesired trailing separator

Also add more tests cases too.

Suggestion for improvements:

Note the test uses a different message container to prevent ambiguity:
 same one could be used but accessed at next indice
 because MessageContainer::setPayload
 actually adds given payload to internal list.

It would makes sense to rename method to MessageContainer::addPayload
 and eventually add a new different method like :
 MessageContainer::set(Payload) to reset list.

Bug: https://jira.iotivity.org/browse/IOT-1174
Change-Id: I9e7bf3c9eb7a311214e438ec2434d53b4ae0f313
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoFix issue where double array was not fetched from CBOR correctly. 01/9101/2
Joseph Morrow [Sat, 2 Jul 2016 23:17:51 +0000 (16:17 -0700)]
Fix issue where double array was not fetched from CBOR correctly.

Change-Id: I7d7f9ac4fe216d883ddb26d624136d098a8a7a14
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9101
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
3 years agoMerge branch 'windows-port' 41/8441/20
David Antler [Fri, 1 Jul 2016 21:28:42 +0000 (14:28 -0700)]
Merge branch 'windows-port'

Add support for Visual Studio 2015 and 2013 builds.

Change-Id: I3ce9bee6b3e57ccd548b849b5d147ca0babd872e
Signed-off-by: David Antler <david.a.antler@intel.com>
3 years agoPrepare for merge. Improved consistency and style. 41/9041/7 windows-port
David Antler [Tue, 28 Jun 2016 21:50:16 +0000 (14:50 -0700)]
Prepare for merge. Improved consistency and style.

* Reformat Windows SConscript to use spaces and add TODO
* Add TODO about most critical warnings to re-enable
* Fix unassigned declarations, use designated initializer when possible
* Fix various spacing and doxygen issues
* Improve consistency of macro definitions in platform_features.h
* Include failure codes on assert conditions for win_sleep.c

Change-Id: I0e88cf2a3fa0ed6e2f8822a6ce0b606a9070af64
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9041
Reviewed-by: Daniel Jay Ferguson <daniel.j.ferguson@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
3 years agoFixed svase-warnings for iotivity-product's SQA on |credresource| 61/9061/2
Kyungsun Cho [Fri, 1 Jul 2016 04:49:55 +0000 (13:49 +0900)]
Fixed svase-warnings for iotivity-product's SQA on |credresource|

Change-Id: I48452b2b0e634d2d7b6cf7643ba9a27ede4877e5
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years ago[IOT-1133] Fix size setting for CA URI buffer 19/9019/3
Inga Stotland [Wed, 29 Jun 2016 06:15:33 +0000 (23:15 -0700)]
[IOT-1133] Fix size setting for CA URI buffer

Use common define CA_MAX_URI_SIZE instead of hardcoded magic number

Change-Id: I61f6f39d1646166be92775e25419c1749f946c76
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoFixed Security Resource Flags and Interface 51/8951/6
Jongmin Choi [Fri, 24 Jun 2016 09:33:22 +0000 (18:33 +0900)]
Fixed Security Resource Flags and Interface

OCResourceProperty Fixed for Following Security Resources
- doxm: OC_OBSERVABLE Removed
- cred, pstat: changed from OC_RES_PROP_NONE to OC_SECURE

Patch #2: OC_DISCOVERVABLE added to pstat
Patch #4: oic.mi.def removed

Change-Id: I35978a242636754977724045780af0082562b525
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoDownload boost automatically on Windows 21/8821/5
David Antler [Tue, 21 Jun 2016 18:52:52 +0000 (11:52 -0700)]
Download boost automatically on Windows

Change-Id: I5782b99f3a84898e5da71de94f19f9b9c7eabb0a
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
3 years agoClean up compiler warnings 69/8969/2
George Nash [Mon, 27 Jun 2016 16:56:01 +0000 (09:56 -0700)]
Clean up compiler warnings

ocresource.c: (-Wunused-variable)
Fix the waring by moving the tcport inside the #ifdef

amsmgr.c (-Wunused-variable)
b64Ret, outLen, and base64Buff were all local variables that were
unused. They are removed since they are unused.

amaclresource.c (-Wunused-function)
OicSecAmaclCount function is unused anywhere. Since it is unused
it is not being maintained so it was removed.

Change-Id: Ia0327aec1feb484f084b2ce0d6608738ef5f6ad9
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
3 years agoRemove the endianness dependency in cbor conversion. 29/8829/4
Chul Lee [Wed, 22 Jun 2016 03:40:21 +0000 (12:40 +0900)]
Remove the endianness dependency in cbor conversion.

A similar bug reported from https://gerrit.iotivity.org/gerrit/#/c/8755/

Change-Id: I631bab77f7486f1f45eaff96c67d39606e37c6b6
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8829
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoSvace Defects Fixes. 31/9031/6
Vinay Bhatia [Wed, 29 Jun 2016 12:41:07 +0000 (18:11 +0530)]
Svace Defects Fixes.

Removed Tab and extra space.

Fixed Remaining Defects.

Fixed Defect in provisioning/unittest/otmunittest.cpp

Change-Id: I1d163b1a39fe858323c5c799f9e26ba6a1a3f620
Signed-off-by: Vinay Bhatia <vinay.bhatia@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9031
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoFixed SVACE report defects. 29/9029/4
i.pazderskyy [Wed, 29 Jun 2016 11:25:41 +0000 (14:25 +0300)]
Fixed SVACE report defects.

Change-Id: I90bef9beb9619b1fba1ce03f96a6873d6fc31594
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9029
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agomodified coding style for parenthesis for Android JNI 11/9011/8
jihwan.seo [Wed, 29 Jun 2016 02:24:55 +0000 (11:24 +0900)]
modified coding style for parenthesis for Android JNI

and some variable is declared with initial value

Change-Id: I44977ced60dfd2f15f162e5beac0461840f72ef6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9011
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoChange observe option header behaviour to be in line with spec 15/8815/4
Ziran Sun [Tue, 21 Jun 2016 13:30:35 +0000 (14:30 +0100)]
Change observe option header behaviour to be in line with spec
at the following points:

1. If the resource can't register the client as observer,
or the resource does not support observe, then the resource
sends back normal GET Response with NO observe option field.

2. Upon successfully removing the client from observer list,
the resource sends back a normal GET response with NO observe
option field

3. This patch also reverted https://gerrit.iotivity.org/gerrit/#/c/8901/
after discussed with the author to be inline with spec.

JIRA issue: https://jira.iotivity.org/browse/IOT-1122

Change-Id: I36510baa69a8ef3be9e0d9aef3fbd40d31488b0f
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
3 years agoocpayload: Set default DMV values and only use comma as delim 73/8973/6
Philippe Coval [Mon, 27 Jun 2016 21:33:40 +0000 (23:33 +0200)]
ocpayload: Set default DMV values and only use comma as delim

For IoTivity-1.1.1: "res.1.1.0,sh.1.1.0" are used
as default Data Model Versions.

Now only use ',' as CSV separator (so ';' must be avoided).

This change has been tested on Debian jessie
and can be squashed into :

https://gerrit.iotivity.org/gerrit/#/c/8707/

Bug: https://jira.iotivity.org/browse/IOT-1101
Change-Id: I8e79776a8fc6c6112db9d5a9ab9a2008e9ea426e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8973
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoremoved build warning for android 85/8985/6
jihwan.seo [Tue, 28 Jun 2016 08:01:21 +0000 (17:01 +0900)]
removed build warning for android

- removed unused method
- removed 'write to static field' warning

Change-Id: I1964dbae99b01c62a739cca34de57304ac79a434
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8985
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoremove build warning for linux 89/8989/6
hyuna0213.jo [Tue, 28 Jun 2016 09:05:11 +0000 (18:05 +0900)]
remove build warning for linux

- remove unused parameter
- remove 'implicit declaration of function' warning
- adjusted code style

Change-Id: If1a2bb525f293e2425122019bcf42199cd6c40c3
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8989
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoJira Issue-964: Add more types for OCEntityHandlerResult 91/8991/2
Habib Virji [Tue, 28 Jun 2016 10:09:09 +0000 (11:09 +0100)]
Jira Issue-964: Add more types for OCEntityHandlerResult

OCEntityHandlerResult includes more type that matches with
CAResponseResult_t.

This patch does not modify the return value of the exisitng code
and neither changes the enum value of the existing code.
It appends to the existing list based on the CoAP return values.

Change-Id: I2be12bb5f80ab751c9afc4e89c48446479c8f565
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8991
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoFixed policy response in /oic/res discovery 87/8987/3
Jongmin Choi [Tue, 28 Jun 2016 08:02:20 +0000 (17:02 +0900)]
Fixed policy response in /oic/res discovery

Added "sec": false to response in case of unsecure resource
Removed "port" information in case of unsecure resource

This patch is based on the Core Spec CR on resource policy.
If "sec" is false, it may or may not be included in /oic/res discovery response.
If "sec" is false, "port" shall be omitted in the response.
This patch should be used together with
Disable OC_SECURE flag in case of SECURED=0 build patch
(https://gerrit.iotivity.org/gerrit/#/c/8875/)

Change-Id: I8e0f3b39896c8856ab659f966e1227196e0f2153
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8987
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agofix warning test cond always true by removing unnecessary test 79/8479/3
Gregg Reynolds [Mon, 6 Jun 2016 05:58:31 +0000 (00:58 -0500)]
fix warning test cond always true by removing unnecessary test

Change-Id: I4753c69049295379f85641638b3ece4ca09da5c1
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years ago[JIRA-1151] IoTivity Blockwise transfer is sort of broken when 95/8895/3
hyuna0213.jo [Thu, 23 Jun 2016 00:10:34 +0000 (09:10 +0900)]
[JIRA-1151] IoTivity Blockwise transfer is sort of broken when
paired with slow response

- When a resource is set as slow response resource,
and it has a large enough payload to be sent as blockwise
transfer data, and a CON retrieve message is sent to the resource,
the coap messaging mechanism break down.
- Remove the unnecessary code

Change-Id: I4bfabc4f457f637a8a88e6c237c25831c7b6c776
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8895
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoUpdate Logic to manage Provider list. 99/8799/3
YounghyunJoo [Wed, 22 Jun 2016 10:25:13 +0000 (19:25 +0900)]
Update Logic to manage Provider list.

- Add storage to store Provider List & Logic to manage Provider List
- Modify type of Message format in consumer to NSSyncType(delete existing type(NSConsumerMessageTypes))
- Modify way to sending syncInfo to use providerId
- Modify to set providerId when send acceptance response in Provider.

Change-Id: Id667403c70c88e6bce16bc92a3ec6605e36e9dc5
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8799
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoocpayload: Supports multiple data model versions (DMV) using CSV 07/8707/10
Phil Coval [Thu, 16 Jun 2016 08:25:44 +0000 (10:25 +0200)]
ocpayload: Supports multiple data model versions (DMV) using CSV

DMV can be CVS if multiple values are supplied.

OIC 1.1 has a single value but future spec is expected to have multiple values

For more details about this specification please refer to:

  20160531-OIC_Core_Specification_v1.1.0_r0.13.docx
  Section 11.3.4,
  Table 18 for property description
  & Section D.3.4 for RAML definition.

For now it's supporting simple patterns like "one-1,two-2"
In the longer term a full implementation of rfc4180 might be desired.

Internally those items are stored in OCStringLL (linked list of strings),
and later it would make sense to relocate those helper functions
in a common place.

This change has been tested on Tizen:3.0:IVI

Bug: https://jira.iotivity.org/browse/IOT-1101
Change-Id: I7274d74ba525aedda49b78398743aa24a7999c00
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
3 years ago[Tizen] Resolved build warnings 93/8993/2
vimala.v [Tue, 28 Jun 2016 10:24:34 +0000 (15:54 +0530)]
[Tizen] Resolved build warnings

Change-Id: Ic1fb1d3e5b12f3e9f7c548f7b00969ee19c1d00c
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8993
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agotizen: Bump to 1.1.1 53/8953/2
Philippe Coval [Thu, 23 Jun 2016 19:52:14 +0000 (21:52 +0200)]
tizen: Bump to 1.1.1

Change-Id: I4ba6addba481b3180f6ebb6969caf86115589c48
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoUse oic_time inside provisioning 23/8823/5
David Antler [Tue, 21 Jun 2016 22:23:06 +0000 (15:23 -0700)]
Use oic_time inside provisioning

Change-Id: I8f91e99f3a84898e5da71de94f19f9b9c7e82635
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8823
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoRemove references to 'winrt' 89/8889/2
David Antler [Wed, 22 Jun 2016 20:09:58 +0000 (13:09 -0700)]
Remove references to 'winrt'

Change-Id: Iaa0cb9b830eeb040971023296c3b0c677d028d28
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
3 years agotizen: also support ARMv7 machine 63/5363/11
Philippe Coval [Sat, 12 Dec 2015 01:05:32 +0000 (01:05 +0000)]
tizen: also support ARMv7 machine

It was successfully tested on :

* Tizen:2.4:Mobile profile (TM1 and Samsung Z1)
* Tizen:2.3:Wearable profile (GearS)

Change-Id: I9e43f35ed2fa18e7dc691f1f5cbfa9a2e4830aad
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
3 years agoChange resource type of /oic/res from string to array. 21/8921/3
Ziran Sun [Thu, 23 Jun 2016 10:18:45 +0000 (11:18 +0100)]
Change resource type of /oic/res from string to array.

JIRA Issue: https://jira.iotivity.org/browse/IOT-1131

Change-Id: I91f77f806ed7feb290fea0aa1b12f76a3b119442
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
3 years agoImplementation for Direct Pairing Android Interface API and Sample App. 81/8281/5
Sandeep Sharma [Mon, 23 May 2016 09:33:33 +0000 (15:03 +0530)]
Implementation for Direct Pairing Android Interface API and Sample App.

1. Android Interface API's for direct Pairing feature.
2. Android Sample App for Direct Pairing.

[patch #2]
Commnts fixes.
Add Support for direct Pair provisioning in ProvsioningClient Android sample
app.

[Patch #3]
Build Fix.

[Patch #4]
Review comments addressed.

Change-Id: I09572eb8cb54f7cd122c6eb224ac2abbcb1ec530
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoRemove double checking type in credential data 73/8873/3
js126.lee [Wed, 22 Jun 2016 11:53:10 +0000 (20:53 +0900)]
Remove double checking type in credential data

Remove double checking type in credential data

Patch 1,2: Remove double checking type in credential data

Change-Id: Ibb532700dff39e1f4ef261de7dda15a48e782d61
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8873
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoChange CARemovePeer condition when DTLS is closed 43/8943/2
js126.lee [Fri, 24 Jun 2016 07:17:53 +0000 (16:17 +0900)]
Change CARemovePeer condition when DTLS is closed

In order to align with tinydtls, this patch have modified that
CARemovePeer is called in below condition.
(DTLS_ALERT_LEVEL_FATAL == level || DTLS_ALERT_CLOSE_NOTIFY == code)

Change-Id: Ia8c9d6294973416e01714dad35fe239907eba48c
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8943
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoFixed Occlient app usage 23/8923/2
Jongmin Choi [Thu, 23 Jun 2016 10:33:57 +0000 (19:33 +0900)]
Fixed Occlient app usage

Change-Id: Ia4614129602a4920ab19a59996833b8d66412ad9
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8923
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agofix inconsistency: WrapRequest decl'd class, def'd struct 73/8473/5
Gregg Reynolds [Mon, 6 Jun 2016 05:28:54 +0000 (00:28 -0500)]
fix inconsistency: WrapRequest decl'd class, def'd struct

Change-Id: I26809689a0f685318702c4f2881e31c0ff8da116
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8473
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoAdded UTC to cover uncovered APIs and Corrected build issue in credentialgenerator.h 05/8305/7
saurabh.s9 [Tue, 24 May 2016 12:17:38 +0000 (17:47 +0530)]
Added UTC to cover uncovered APIs and Corrected build issue in credentialgenerator.h
This patch is dependent upon https://gerrit.iotivity.org/gerrit/#/c/8813/
Change-Id: I49a9de85e04c47f0d9ebbfab99248cf58a998248
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8305
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoCheck for NULL parameter 13/8813/2
saurabh.s9 [Tue, 21 Jun 2016 06:49:25 +0000 (12:19 +0530)]
Check for NULL parameter

Change-Id: I27b316b11f0362deeaff2de8e06ffc296759411d
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8813
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoAdded function that enables RI passing message ID from CA 95/8595/2
Ziran Sun [Fri, 10 Jun 2016 14:22:18 +0000 (15:22 +0100)]
Added function that enables RI passing message ID from CA
layer to application layer. This allows application layer
to differentiate new messages and re-transmitted messages.

JIRA Issue: https://jira.iotivity.org/browse/IOT-1112

Change-Id: Iec7286586c81ae245dbb78a07707a2ea39875d18
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8595
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
3 years agoRetrieve on /oic/res?rt=oic.d.xxx should return as per oic.if.ll 15/8415/3
Ziran Sun [Wed, 1 Jun 2016 09:25:26 +0000 (10:25 +0100)]
Retrieve on /oic/res?rt=oic.d.xxx should return as per oic.if.ll
rather than returning as per oic.if.baseline.

This change set the default interface of /oic/res as oic.if.ll when
no interface is specified in the enquiry.

JIRA issue: https://jira.iotivity.org/browse/IOT-1103

Change-Id: I7694be578aec57b640ba6fdc84c4fec472fe92f5
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8415
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
3 years agoChange rt type from string to array in sample code. 17/8817/2
Ziran Sun [Tue, 21 Jun 2016 14:04:14 +0000 (15:04 +0100)]
Change rt type from string to array in sample code.

Change-Id: I45e41908cb44fe75617c16f5d2cba9ab976d623e
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8817
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
3 years agoFix a wrong conditional statement about token value. 31/8831/2
hyuna0213.jo [Wed, 22 Jun 2016 05:09:53 +0000 (14:09 +0900)]
Fix a wrong conditional statement about token value.

if the first byte of the token is 00, the condition will
return false even though the token is valid.

Change-Id: I7386cb3644f32e7d1cabb58a1ef8c7162cf19476
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8831
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoremoved svace warning for android 51/8551/10
jihwan.seo [Wed, 8 Jun 2016 04:04:41 +0000 (13:04 +0900)]
removed svace warning for android

- initialize some variables
- adjusted code style
- modified unreached code

Change-Id: Id0001f98d49b09131f4a4177400bdc6defa51a2f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoModify GET request handler for /oic/sec/acl 33/8633/4
js126.lee [Tue, 14 Jun 2016 05:40:31 +0000 (14:40 +0900)]
Modify GET request handler for /oic/sec/acl

Issue: If 'subject' field is not included in REST request,
       a error occur on HandleACLGetRequest.
       This implementation does not meet the spec, and causes the failure with CTT.

Resolution: A server responds for GET 'oic/sec/acl', even if 'subject' field
            is not included in REST request.

Patch 1: Fixed this issue, and adding GetACL API for debugging only.
Patch 2: Rebase it on the latest master branch

Change-Id: Icb3869fee6039a076ee90146ae94eb527a88865c
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8633
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agosecurity: fix reading of permission attribute from configuration 55/8755/4
Hauke Mehrtens [Fri, 17 Jun 2016 15:38:35 +0000 (17:38 +0200)]
security: fix reading of permission attribute from configuration

Casting the pointer to the permission attribute from uint16_t to uint64_t
causes problems on MIPS Big Endian systems and probably othrs as well.
When the calling method interprets it as uint64_t not the value is
converted but the pointer is interpreted as it would point to a 64 bit
integer, but it is only a 16 bit wide integer. On MIPS BE permission was
always 0 independent of which value between 0 and 32 the permission
attribute had, this was probably written to some padding area or into
some other member of the struct.

This patch fixes the memory corruption and makes the code work for me with
a MIPS BE CPU.

Change-Id: Ifa843e69980ad4309b1e3076b8e2c98c03324352
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoremoved unused parameter warning in resource-container 49/8549/2
jihwan.seo [Wed, 8 Jun 2016 02:27:55 +0000 (11:27 +0900)]
removed unused parameter warning in resource-container

Change-Id: Id6bec0675e2c5776a3f0e9a6a8caab3ec696b4f6
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
3 years agoHoxfix to support the base64 encoded credential. 87/8687/5
Chul Lee [Thu, 16 Jun 2016 04:56:33 +0000 (13:56 +0900)]
Hoxfix to support the base64 encoded credential.

This patch for the test w/ CTT
to support base64 encoded private data as workround.
Also this changes will be replaced when I upload SVR data structure modification.

[Patch #1~#3] : Intial upload
[Patch #4] : Remove the compile errors for arduino

Change-Id: Iaddd6068e15e316cfc8cea1c7acda8e89f8fc9b0
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8687
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years ago[IOT-1129]Crash when received invalild type in security resouces 95/8695/2
js126.lee [Thu, 16 Jun 2016 09:53:41 +0000 (18:53 +0900)]
[IOT-1129]Crash when received invalild type in security resouces

Issue: Crash when received invalild cbob type in security resouces.
Jira : https://jira.iotivity.org/browse/IOT-1129
Resolved : Add checking type.

Patch 1: Add checking type.

Change-Id: Iee0ffa883586a680696c4173e8c33f08810e763b
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8695
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoDiscard provisioning tool reply for owned device discovery 67/8367/3
Sandeep Sharma [Fri, 27 May 2016 11:30:40 +0000 (17:00 +0530)]
Discard provisioning tool reply for owned device discovery

[Patch #1] fix C provisioning client as now PT's reply won't come
           for owned device discovery.

Change-Id: Ica5a66166c589282e99a3fd6c60bfd68b79013f6
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years ago[IOT-1114] Updated rt for security resource 71/8571/3
Randeep Singh [Thu, 9 Jun 2016 10:28:01 +0000 (15:58 +0530)]
[IOT-1114] Updated rt for security resource

The security resources schema v1.1.0 specifies rt
for each of these resources as oic.r.*

https://jira.iotivity.org/browse/IOT-1114

Change-Id: Ia16cff9e107e3c9725309e4c729d14b71309c217
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8571
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
3 years agoUpdated for consumer APIs. 49/8749/3
KIM JungYong [Fri, 17 Jun 2016 07:32:11 +0000 (16:32 +0900)]
Updated for consumer APIs.

Parameters of NSConsumerStart func is modified to sturcture.
NSConsumerSendSyncInfo is added instead Read/DeleteCheck.
NSConsumerReadCheck and DeleteCheck is removed.
NSDropNSObject is removed.
typo error is fixed to NS_VERIFT~.

Change-Id: I4d00d4d1abdb3a4996e0ba5db82ac9bff1de18e9
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoBug about parsing queryparam is fixed 43/8743/3
jaesick.shin [Fri, 17 Jun 2016 05:30:33 +0000 (14:30 +0900)]
Bug about parsing queryparam is fixed

notification service is using queryparam.
RI does not support parsing queryparam without interface and uri.
so, i already added function getValueFromquery.
this function is copy of RI Function(ExtractFiltersFromQuery) and then modified.
but, strtok_r function disappear tokenized string after performing from original string.
then, I duplicate string when the getValueFromQuery function is called.

Change-Id: I9c4b5a8d8e5e8dac8f65a9f5b875a0a7e1b7d723
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8743
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoFix all references from ocmalloc to oic_malloc 99/7799/4
David Antler [Fri, 15 Apr 2016 22:35:19 +0000 (15:35 -0700)]
Fix all references from ocmalloc to oic_malloc

Change-Id: I65fcc26e2888414f04fde645beb9dd39cf404b8d
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7799
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoRe-enable subset of provisioning unittests 73/8673/2
David Antler [Wed, 15 Jun 2016 17:08:44 +0000 (10:08 -0700)]
Re-enable subset of provisioning unittests

Some unit tests were added without comprehending Windows requirements.
These must be disabled until the code is rewritten to be more
cross-platform.

Change-Id: I588d566e7fc43d135c088c63749b93c6776ca841
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8673
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
3 years agoMerge "Merge branch 'master' into notification-service" into notification-service
Uze Choi [Fri, 17 Jun 2016 05:06:20 +0000 (05:06 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service

3 years agoAdded API about create message and memory allocate, deallocate 27/8727/2
jaesick.shin [Thu, 16 Jun 2016 23:37:01 +0000 (08:37 +0900)]
Added API about create message and memory allocate, deallocate

1. Our service is support to createMessage interface,
This Function does initialize, set the providerid, generate messageid.
2. modifiy related struct(resource) memory allocation, deallocation.

Change-Id: Iacaf9f97fa6ec2e26d6392f448b918a13202289e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8727
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoFixed bug for uri on subscription request. 41/8741/2
KIM JungYong [Fri, 17 Jun 2016 00:48:42 +0000 (09:48 +0900)]
Fixed bug for uri on subscription request.

when send subscription request,
device id on query parameter should be inserted request uri.

Change-Id: I1b59bf2b61b2922a772c851662e90a9aea7d802d
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8741
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoModified consumer internal function call flow. 93/8693/8
KIM JungYong [Thu, 16 Jun 2016 07:31:10 +0000 (16:31 +0900)]
Modified consumer internal function call flow.

When receive provider discover and message and syncinfo,
callback is called by communication module until this patch.
but, a proper way is callback should be calling by internalTaskControl module.
so, execution of callback logic is moved to internalTaskControl module.

Public NSProvider structure is modified.
Query Paramater(Consumer Id) is inclued on the request for subscription to providers.

Change-Id: Ib4e0db852d68889b90b66f880a052ed1453c2aca
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8693
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoMerge branch 'master' into notification-service 09/8709/1
Hun-je Yeon [Thu, 16 Jun 2016 13:02:09 +0000 (22:02 +0900)]
Merge branch 'master' into notification-service

update the master changes into notification-service.

Change-Id: Ic35a92a83450755f4b664ede111e51b9d2efabcc
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
3 years agoFix typo "Model" is correct spelling not "Modle" 39/8639/3 tls_porting
Philippe Coval [Tue, 14 Jun 2016 15:10:37 +0000 (17:10 +0200)]
Fix typo "Model" is correct spelling not "Modle"

Maybe be squashed into :

5f505cf352f0f5fd675b3f97662b5f243dd2f89e
https://gerrit.iotivity.org/gerrit/#/c/8325/

Bug: https://jira.iotivity.org/browse/IOT-1100
Change-Id: If13b0155b1d94ce2bb362ed4cf580b2879e84090
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years ago[JIRA Issue - 1092] IoTivity Zigbee sample application wrongly freeing memory 63/8663/2
Habib Virji [Wed, 15 Jun 2016 10:53:12 +0000 (11:53 +0100)]
[JIRA Issue - 1092] IoTivity Zigbee sample application wrongly freeing memory

OICFree was wrongly freeing memory in OCSetDeviceInfo for a sample application.

Change-Id: Idf621cce81da84e5ae6719f18a31a95b26ef7855
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8663
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoAdd GET request handler for CRED resource 97/8397/4
js126.lee [Mon, 13 Jun 2016 10:51:09 +0000 (19:51 +0900)]
Add GET request handler for CRED resource

GET request returns credential without private data
This patch is requried, because there is step for 'GET oic/sec/cred' in TEST SPEC.

Patch 1: Init patch.
Patch 2: Add OC/SRPGetCredResource API for debugging only.
Patch 3: Apply Randeep's comment

Change-Id: I3ff154f786a278b6737e86d66b47624abd8e2434
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8397
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agorelated sturct and queryparam 59/8659/8
jaesick.shin [Wed, 15 Jun 2016 06:18:38 +0000 (15:18 +0900)]
related sturct and queryparam

1. modify logic about related NSMessage, NSSynInfo of struct.
2. Added NSGeneratedUUIDStr function (providerid, consumer id)
3. Added NSGetValueFromQuery function (related using the queryparam)
and modified logic of 2,3

fifth patch included
apply to resource protocol about response.

Change-Id: I360c3d9a3f1021a74bb2ad8484355e7201c27a89
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
3 years agoMerge branch 'master' into windows-port 45/8645/6
David Antler [Wed, 15 Jun 2016 16:57:49 +0000 (09:57 -0700)]
Merge branch 'master' into windows-port

Needed to disable provisioning unit test due to introduction of
complex Linux dependencies.

Change-Id: I4bd864cd7dc134bf7fb2faa8398f9f4afab40937
Signed-off-by: David Antler <david.a.antler@intel.com>
3 years agoWARNING: eliminate warnings: [-Wsometimes-uninitialized] 99/8599/6
Gregg Reynolds [Sat, 11 Jun 2016 13:08:55 +0000 (08:08 -0500)]
WARNING: eliminate warnings: [-Wsometimes-uninitialized]

The warning is caused by decls "TWEntry* entry = NULL;" coming
after tests that call "goto exit;" where "entry" is used.
the decl in front of the conditionals removes the warning.

Also added NULL test on "entry" to avoid unecessary calls
to TWDeleteEntry.

Change-Id: I0d7069e2497563a2c5378789c26acfdd3c48d89d
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8599
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
3 years agoresource-container: Port to gcc6 using std namespaces 51/8651/2
Phil Coval [Tue, 14 Jun 2016 21:43:37 +0000 (23:43 +0200)]
resource-container: Port to gcc6 using std namespaces

Bug: https://jira.iotivity.org/browse/IOT-1111
Change-Id: Ie64ae80bb5851a887dd6fd589f72c4e64198b227
Credit-to: Kevron Rees <tripzero.kev@gmail.com>
Signed-off-by: Phil Coval <philippe.coval@s-opensource.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8651
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoBUGFIX: variable has incomplete type 'OIC::Service::RCSResourceObject::WeakGuard' 29/8529/3
Gregg Reynolds [Tue, 7 Jun 2016 12:33:31 +0000 (07:33 -0500)]
BUGFIX: variable has incomplete type 'OIC::Service::RCSResourceObject::WeakGuard'

Embedding the definition of WeakGuard syntactically eliminates
the error we get if its definition is a sibling.

Change-Id: Ia020ca5fda0f604d4c60ebfde895b3ecbd244a4c
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
3 years agoRemove extra href property in /oic/res as 17/8417/2
Ziran Sun [Wed, 1 Jun 2016 12:31:18 +0000 (13:31 +0100)]
Remove extra href property in /oic/res as
the href property should be within links only.

JIRA Issue: https://jira.iotivity.org/browse/IOT-1104

Change-Id: I2b7b6996feebe92902a23a275c5bfbd3ad7e47e9
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
3 years agofixed bulid issue for tcp adapter in RI layer 73/8573/2
hyuna0213.jo [Thu, 9 Jun 2016 10:57:54 +0000 (19:57 +0900)]
fixed bulid issue for tcp adapter in RI layer

Bulid error occurs by https://gerrit.iotivity.org/gerrit/#/c/8423/
patchset if WITH_TCP=true option is used to build IoTivity.
so I modified the code to resolve the build issue.

Change-Id: Iea33722f9d3b5b501dfcca0b98ed61a7bc6ff590
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agomodified tcp connection callback parameter type 09/8609/2
hyuna0213.jo [Mon, 13 Jun 2016 00:30:08 +0000 (09:30 +0900)]
modified tcp connection callback parameter type

I modified the parameter of the tcp connection callback
to pass the connectivity and flag information

Change-Id: Id99b92726b39ffac2b73a1e6d9041521e624af3d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
3 years agoMerge branch 'master' into notification-service 61/8661/1
Hun-je Yeon [Wed, 15 Jun 2016 06:24:56 +0000 (15:24 +0900)]
Merge branch 'master' into notification-service

update the recent changes of master into notification-service

Change-Id: I504c8c331fde11cc4c167b8d503131b3bdf066d9
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
3 years agoImplement missing unit tests for CKM. 07/8307/7
i.pazderskyy [Tue, 24 May 2016 15:34:25 +0000 (18:34 +0300)]
Implement missing unit tests for CKM.

Added CKM unit tests to common build.
Added result state to functions.
Change-Id: I11ef2d003f95d850ed395f5c2584bbb34ca154a4
Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoBuild: Export pkg-config when cross compiling using yocto 25/8125/14
Philippe Coval [Thu, 12 May 2016 17:48:14 +0000 (19:48 +0200)]
Build: Export pkg-config when cross compiling using yocto

Without this change, host's /usr/include may be used which is unwanted.
This was obsevered when building with Yocto jethro setup
with security checks (LfAgl).

While this change has been done for crosscompiling purpose,
it make sense to have this in all contexts.
(ie: those which don't set CROSS_COMPILE variable)

Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Origin: https://github.com/tizenteam/iotivity
Change-Id: I3027642c77cc27f2072cdc22886aa09e124cdf4c
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8125
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
3 years agoUpdate OTM's unit test to use the real resource servers during OTM test 47/8247/5
leechul [Fri, 20 May 2016 04:55:03 +0000 (13:55 +0900)]
Update OTM's unit test to use the real resource servers during OTM test

[Patch #1] Initial upload
[Patch #2] Update to use the correct path for OTM unittest w/ sample server.
[Patch #3] Remove the warnings in OTM unittest.
[Patch #4] Update to use the default SVR DB.

Change-Id: I806b1bd0ec860a91f3e9d762dbed0dc35b133cd6
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoAdd context param to DP 73/8273/3
Ashwini Kumar [Mon, 23 May 2016 06:29:25 +0000 (11:59 +0530)]
Add context param to DP

 Added user context to direct pairing API OCDoDirectPairing

Change-Id: Ie0cd85446a1b7d56d153ba4f3ccabbefd0ff5284
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoAdd C++ API for Direct pairing 77/8277/4
Ashwini Kumar [Mon, 23 May 2016 08:26:22 +0000 (13:56 +0530)]
Add C++ API for Direct pairing

 Added C++ API for direct pairing feature
 Updated unittests for C++
 Added direct pairing sample
 Fixed Construct resource to '|' Secure flag instead of '&'

 Note: this change needs https://gerrit.iotivity.org/gerrit/#/c/8273/

Change-Id: I4a1cfc27206adf7308388406d0c8821aa46d87a8
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoChanging DOXM resource to be normally discoverable 27/8527/3
js126.lee [Tue, 7 Jun 2016 11:44:19 +0000 (20:44 +0900)]
Changing DOXM resource to be normally discoverable

Issue: DOXM is not listed by default in /oic/res response.
Resolve : Changeg DOXM to be normally discoverable

PT should use secure port of DOXM for OTM and Provision,
even if Device has different COAPS ports per resource.

Patch 1: Init
Patch 2: According to review of Randeep, modified form strcmp to strncmp

Change-Id: I7742681b75261694c809e98f639379332c77e3b5
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8527
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
3 years agoMerge branch 'master' into windows-port 29/8629/2
David Antler [Mon, 13 Jun 2016 21:33:25 +0000 (14:33 -0700)]
Merge branch 'master' into windows-port

Change-Id: Ia2e02ce01d3cb8b73b22f7c2ff4169c340d6f72f
Signed-off-by: David Antler <david.a.antler@intel.com>
3 years agoUpdate .gitignore for notification service 13/8613/2
HUN-JE YEON [Wed, 8 Jun 2016 00:15:51 +0000 (09:15 +0900)]
Update .gitignore for notification service
add iotivity.pc, notification-service build object in .gitignore

Change-Id: Ic82ac71b40386142973ffa8bb11ffd01fb2df758
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>