iotivity.git
12 months agoFix query handling for /oic/res 59/14759/3 1.2.1-RC1
Habib Virji [Thu, 24 Nov 2016 12:30:48 +0000 (12:30 +0000)]
Fix query handling for /oic/res

There was a mix up when query was supplied, it was only working if the interfaceQuery passed too. With just rt supplied,
it was returning all the resource. This patch fixes up the issue.

Change-Id: I980f0dd73fafdadd3d1dabae5edf024ac256f95c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14759
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoios: Fix the ios build break 31/14731/10
srijon.sb [Thu, 24 Nov 2016 06:50:01 +0000 (12:50 +0600)]
ios: Fix the ios build break

[srijon.sb]
iOS has been built successfully before,
but currently build fail happened due to some update in the IoTivity.
This fix resolves secure and insecure build of IoTivity for iOS

[Philippe Coval]
Rebased on renamed files and adapted,
removed cleanup changes (prefered in isolated patches)

Change-Id: I7599d02f1931f38a28eac90163aac5818540c5b9
Author: srijon.sb <srijon.sb@samsung.com>
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14731
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months agobuild: Suggest to download supported mbedtls 65/14765/2
Philippe Coval [Thu, 24 Nov 2016 16:47:25 +0000 (17:47 +0100)]
build: Suggest to download supported mbedtls

Note this patch is appropriate for release versions (or branches)
 while master or development branches can follow upstream's master branch
 and eventually synched when needed.

Change-Id: Iae857f9d5bab9a5d1174d38823faff25666299cb
Bug: https://jira.iotivity.org/browse/IOT-1600
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14765
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months ago[IOT-1588] Update cJSON to v1.0.1 and add version tracking note 25/14625/4
Kevin Kane [Tue, 22 Nov 2016 18:17:28 +0000 (10:17 -0800)]
[IOT-1588] Update cJSON to v1.0.1 and add version tracking note

Added README file that notes the source repository for this
dependency, the commit ID and release tag (where applicable)
used when copying the source files from it, and any local
modifications made.

Change-Id: Ic19b2bcc0cf6e0c2b77906eacb4203a0874dec55
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14625
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoexamples: Remove Client side sample code 67/14567/3
Ziran Sun [Mon, 21 Nov 2016 11:12:21 +0000 (11:12 +0000)]
examples: Remove Client side sample code

This code is not needed and not in right place either.

Bug: https://jira.iotivity.org/browse/IOT-1384
Change-Id: I60d89ba42b01962d68ab9fd903c32b776ae06605
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14567
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoAdd secure and port in policy 53/14753/2
Habib Virji [Thu, 24 Nov 2016 11:14:26 +0000 (11:14 +0000)]
Add secure and port in policy

In the collection response, add secure and port information.

Change-Id: Iaec8788bba04fa0a404dfb16ddf54a704493e65b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14753
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoprovisioning: Rename some C++ headers to avoid collision with CSDK ones 47/14747/3
Philippe Coval [Thu, 24 Nov 2016 10:20:23 +0000 (11:20 +0100)]
provisioning: Rename some C++ headers to avoid collision with CSDK ones

The name clash only happens
 on case insensitive filesystems (ie HPFS on MacOS),
 there is ambiguity with C header ie:
  ./resource/csdk/security/provisioning/include/ocprovisioningmanager.h
  ./resource/include/OCProvisioningManager.h

Renaming to .hpp suffix prevent the problem.

Note, one other approach would be to use namespaces

Like:
   #include <iotivity/csdk/ocprovisioningmanager.h> vs
   #include <iotivity/oc/ocprovisioningmanager.h> or similar

Change-Id: Ie311344a98fd056e5b54f329819090a36a901589
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14747
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
12 months agoAdd param check code in PrepareMCertificateCallback. 37/14737/2
Chul Lee [Thu, 24 Nov 2016 07:37:35 +0000 (16:37 +0900)]
Add param check code in PrepareMCertificateCallback.

Change-Id: I1bd917024ab1ac20c000dccf9da5e31ba865a2a0
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14737
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoAdd cipher suites 19/14619/3
Chul Lee [Wed, 23 Nov 2016 09:36:27 +0000 (18:36 +0900)]
Add cipher suites

TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 and TLS_ECDHE_ECDSA_WITH_AES_128_CCM
cipher suites were added in order to support manufacturer certificate based OxM.

Change-Id: I3ec5ddce982e5bfd5f7591b493448eec5468653f
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14619
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoAdd OCConvertStringToUuid on C_common 05/14605/5
js126.lee [Tue, 22 Nov 2016 07:07:13 +0000 (16:07 +0900)]
Add OCConvertStringToUuid on C_common

Patch 1,2: Expose ConvertStrToUUID on OC stack to use common
Ptach 3: Add OCConvertStringToUuid on C_common

Change-Id: Icf9b0ee1bda6fa4d914c696fbbdc27e0998a7262
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14605
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1599] fix message publish in MQ 15/14715/2
Jung Seungho [Thu, 24 Nov 2016 04:11:55 +0000 (13:11 +0900)]
[IOT-1599] fix message publish in MQ

removed logic for checking 'message' property
https://jira.iotivity.org/browse/IOT-1599

Change-Id: I1edc3eb68d97156ce3befe44205e2d1ff6006b7c
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14715
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
12 months ago[IOT-1582] Change "PUT" to count as "Create" and never as "Update" 79/14579/3
Nathan Heldt-Sheller [Mon, 21 Nov 2016 19:41:01 +0000 (11:41 -0800)]
[IOT-1582] Change "PUT" to count as "Create" and never as "Update"

Per Core Spec conventions, even though PUT is technically legal
for Create or Update, PUT is only ever used for Create.  Therefore
we need to change the CRUDN permission bit check in security layer.

Updated Readme.scons.txt and README-building-and-running-secure-IoTivity-
stack.txt to clarify build and use of secure IoTivity stack.

Change-Id: Id362c9c0225e53240b2d1f844c5f05d55cfa2938
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14579
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Craig Pratt <craig@ecaspia.com>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1595] Change Policy Engine to us ACE Union behavior. 01/14701/2
Nathan Heldt-Sheller [Wed, 23 Nov 2016 20:20:52 +0000 (12:20 -0800)]
[IOT-1595] Change Policy Engine to us ACE Union behavior.

The current Policy Engine logic is to assess the permissions on the first matching ACE for a
request (matched via Subject and Resource), and respond to the request (Grant or Deny) based on
that ACE.

The new OCF 1.0 behavior specifies that if any ACE allows a request, it should be Granted (so-called "Union" behavior).

To allow consistency we must fix this in 1.2.1.

This patch changes the Policy Engine to keep searching for an ACE that Grants the request,
until either the request is granted, or the end of the ACL is reached.

Change-Id: Idd4e90c37c7e0fcf963105b34b3e82dfde2ccfd2
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14701
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Greg Zaverucha <gregz@microsoft.com>
12 months ago[IoT-1597] bug fix about retransmission 09/14709/2
jaesick.shin [Thu, 24 Nov 2016 00:18:38 +0000 (09:18 +0900)]
[IoT-1597] bug fix about retransmission

When a consumer had control, they did not send a response
So I modified it to respond.

and remove duplicate defined about NS_QUERY_COSUMER_ID
In the commit below,
Committed without adding the file.
https://gerrit.iotivity.org/gerrit/#/c/14657/

Change-Id: Ie38aec8895422d9edab9d46bef7c6b17499f5bce
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14709
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoAdd p in response of oic.if.ll 03/14703/3
Habib Virji [Wed, 23 Nov 2016 20:11:30 +0000 (20:11 +0000)]
Add p in response of oic.if.ll

In collection response add p parameter. This is the response in case of default entity handler. Application has to
handle on its own adding policy parameter.

Change-Id: Ie2195eb07575fbcc34413fca729a1a7db0805314
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14703
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agoAdd generic API for setting and getting defined tag values 25/14525/8
Habib Virji [Sun, 20 Nov 2016 22:54:46 +0000 (22:54 +0000)]
Add generic API for setting and getting defined tag values

- Uses the resource attribute of OCResource for storing and retrieving device and platform values.
- Removed global savedDeviceInfo and savedPlatformInfo. The information passed via
OCSetDeviceInfo and OCSetPlatformInfo is stored in rsrcAttributes.
- OCAttribute type change from char * to void * to store generic value, this was part of OCResource but was not used.
- Payload type PAYLOAD_TYPE_DEVICE and PAYLOAD_TYPE_PLATFORM is removed from PAYLOAD_TYPE as this was used only internally.
- Payload convert and parse for payload type device and platform is removed, as device and payload uri uses
OCRepresentation payload type.
- Delete function to delete resource attributes.
- OCDevicePayloadCreate and OCPlatformCreate is removed as this was only used internally, all values are now stored in
resource attributes.
- Moves OCSetDeviceInfo and OCSetPlatformInfo from ocstack to ocresource to avoid duplicate checking.
- Add set and get API to set parameter for /oic/d and /oic/p.
- OCGetResourceHandleAtUri accesible without ifdef RD_CLIENT.
- Updated Unit test to test the functionality.
- Add the OCSSetParam and OCGetParam in C++ and Java

Change-Id: If822ae95a70e681121528679de8da1375718de0c
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agobuild: Suggest to download supported tinycbor 59/14659/2
Philippe Coval [Mon, 18 Jul 2016 23:51:09 +0000 (16:51 -0700)]
build: Suggest to download supported tinycbor

Note this patch is appropriate for frozen versions
 while master or development branches can follow tinycbor master
 and eventually synched when needed.

Change-Id: Ic764a3aa7231982d24fcdd17d661425500000000
Bug: https://lists.iotivity.org/pipermail/iotivity-dev/2016-November/006160.html
Origin: https://gerrit.iotivity.org/gerrit/9565
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Gregg Reynolds <dev@mobileink.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 months ago[IoT-1590] Modify attribute key name followed by OCF property naming convention. 57/14657/3
jaesick.shin [Wed, 23 Nov 2016 09:12:48 +0000 (18:12 +0900)]
[IoT-1590] Modify attribute key name followed by OCF property naming convention.

All the OCF property should be written as lower case.
So, change the key name of attributes.

second patch include,
removed duplicated NS_QUERY_CONSUMERID.

Change-Id: I2fcc76fac003e805ad19edb0d7ee10c659218b5f
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14657
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1591] Add warning code as notification type 39/14639/4
cc [Wed, 23 Nov 2016 06:32:13 +0000 (15:32 +0900)]
[IOT-1591] Add warning code as notification type

It is required to notification message with warning type.

Change-Id: I8ea23690382a0f32d084ce3ed9903971f2a4c390
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14639
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1592] Fix rd publish fail 47/14647/2
Jee Hyeok Kim [Wed, 23 Nov 2016 08:51:41 +0000 (17:51 +0900)]
[IOT-1592] Fix rd publish fail

1. RD publish fail due to lack of shared point lock logic.

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

Change-Id: I278b67ac050fb5bcb0cb5ee6920c27e446f0f01a
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14647
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months ago[IOT-1586] Changed the policy key name for tcp discovery 07/14607/2
hyuna0213.jo [Tue, 22 Nov 2016 08:16:53 +0000 (17:16 +0900)]
[IOT-1586] Changed the policy key name for tcp discovery

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

Change-Id: I7bae43f823bdbe744a1cda28b27b9c72d22af996
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1575] Update to manage connection state of tcp session 31/14531/7
Jaehong Jo [Mon, 7 Nov 2016 08:24:22 +0000 (17:24 +0900)]
[IOT-1575] Update to manage connection state of tcp session

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

Change-Id: I9f9cda2e3ab5672c336ed165ec4f189ab846f054
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14531
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoFixed bug for device status management in OTM. 43/14643/2
Chul Lee [Wed, 23 Nov 2016 08:33:10 +0000 (17:33 +0900)]
Fixed bug for device status management in OTM.

[Bug]
  1. Perform the OTM.
  2. Remove the device using OCRemoveDevice or OCRemoveDeviceWithUuid
  3. Initialize the server to unowned status.
  3. Perform the OTM again w/ same server.
     [Actual Result] Device UUID removed from PDM DB.
     [Expected result] Device UUID should be set to initial status.

Change-Id: Ie662ca6eeedfb5a98db4d97e020b61fbf331cb0e
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14643
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoRemove x.org.iotivity from secure resources 41/14641/2
Jongmin Choi [Wed, 23 Nov 2016 07:41:01 +0000 (16:41 +0900)]
Remove x.org.iotivity from secure resources

Remove x.org.iotivity from IoTivity secure resources

Patch #1: Initial upload

Change-Id: Icb067cc8a44d365665ef26e3955f6f79fa12415c
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14641
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1569] Use OICMalloc/OICFree consistently 23/14623/2
Kevin Kane [Sat, 19 Nov 2016 00:17:11 +0000 (16:17 -0800)]
[IOT-1569] Use OICMalloc/OICFree consistently

Lingering and mixed uses of malloc/free exist throughout
IoTivity. Some buffers allocated with malloc are later freed
with OICFree; this is dangerous in case the implementation of
OICMalloc/OICFree ever changes.

This change harmonizes the code to use the OIC versions to
ensure code is always using the same heap allocation and free
functions with two exceptions:

* Sample code continues to use malloc/free; samples should not
refer to internal functions.
* The oc_logger module also still uses malloc/free; oic_malloc
calls oc_logger when operating in ENABLE_MALLOC_DEBUG mode, and
could result in a circular dependency if changed over.

Change-Id: Icd47243eec33500fe7fcd7d5d79ddf2128a9e717
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mike Fenelon <mike.fenelon@microsoft.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoRemoved unnecessary/duplicated log in connectivity abstraction 31/14631/2
hyuna0213.jo [Wed, 16 Nov 2016 06:43:24 +0000 (15:43 +0900)]
Removed unnecessary/duplicated log in connectivity abstraction

remove unnecessary/duplicated log in connectivity abstraction
to print the correct message.

Change-Id: I2d0c4535bb4abc576d7e7130b0d38111f37cd3e0
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoUpdate Easysetup mediator android sample app 35/14635/2
Parkhi [Tue, 22 Nov 2016 10:58:38 +0000 (19:58 +0900)]
Update Easysetup mediator android sample app

 - Add validation check logic when received response of findResource.

Change-Id: Ib2e9f6bf3534f77e7d6260fca803ccf629df5b2d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14635
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoUpdated with Valgrind memory leak fixes for Notification Provider and consumer. 69/14369/2
abitha.s [Tue, 15 Nov 2016 12:47:45 +0000 (18:17 +0530)]
Updated with Valgrind memory leak fixes for Notification Provider and consumer.

Updated NS sample App to allow/deny consumer subscription.

Change-Id: I6f3609895cbfe2d4d8b18247b7e7dd4c7a438161
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoReturn correct entity handler result for Get and Publish requests to 63/14563/2
Todd Malsbary [Thu, 17 Nov 2016 23:38:50 +0000 (15:38 -0800)]
Return correct entity handler result for Get and Publish requests to
RD server.

Prior to this fix, rdEntityHandler would always return OC_EH_ERROR.

Change-Id: I1099ffe19e200982562cd9de4f7c97e173a71431
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14563
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months ago[IOT-1361]Fix android X86_64 runtime issues 57/14457/4
bg.chun [Thu, 17 Nov 2016 12:13:34 +0000 (21:13 +0900)]
[IOT-1361]Fix android X86_64 runtime issues

Add missing .h files on ifaddrs.h
and android caipnwmonitor.c for fix runtime issue.

Change-Id: Iec71fa0929b8682fda05a4d0d7cb89351be01d2d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14537
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 4eb8f69d16a3011a0569bdf9710683763ee4e85e)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14457
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
12 months agoFixed Typos: DEFALUT -> DEFAULT 71/14571/2
Robert Spielmann [Tue, 22 Mar 2016 14:39:22 +0000 (15:39 +0100)]
Fixed Typos: DEFALUT -> DEFAULT

Change-Id: If23217339d99ba5ad9e38133607de813ba27fd75
Signed-off-by: Robert Spielmann <spielmann@kellendonk.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6179
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 6218e5404171e1c5b4b7fbb8a33ab790d1ef63a9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14571
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1513] One more incorrect URI construction 89/14589/2
Dave Thaler [Tue, 22 Nov 2016 00:49:57 +0000 (16:49 -0800)]
[IOT-1513] One more incorrect URI construction

Change-Id: I3ea6f8cc55935ea3f30f30320386d7c430ee1b77
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14589
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agotizen: Port spec file to fedora for ARTIK 73/14573/2
Philippe Coval [Mon, 21 Nov 2016 14:25:15 +0000 (15:25 +0100)]
tizen: Port spec file to fedora for ARTIK

Change-Id: I9c00704cd10cd86787d928753058735f995efaa7
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14573
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
12 months agotizen: Remove things-manager installation 13/14613/2
Philippe Coval [Tue, 22 Nov 2016 09:25:51 +0000 (10:25 +0100)]
tizen: Remove things-manager installation

Change-Id: I6b8c4ef6322072b9340ab9dc637e6d4751846b90
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14613
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
12 months agoModify NotificationService Script to support Tizen OS 15/14415/3
YounghyunJoo [Tue, 8 Nov 2016 01:05:37 +0000 (10:05 +0900)]
Modify NotificationService Script to support Tizen OS

- Modify Script files to build on Tizen Platform
- Modify Logic for logging to print log through dlog api

Change-Id: I0a624400187d37817627875f983104cb14b7946b
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14415

12 months agoUpdate the keepalive response payload for the ping request 97/13597/5
hyuna0213.jo [Mon, 24 Oct 2016 07:23:24 +0000 (16:23 +0900)]
Update the keepalive response payload for the ping request

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

Change-Id: I6c74122bdb4a726a5c77f8a8e742d202f639972b
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13597
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoFix windows build failed about incompatible types in jenkins 59/14559/2
hyuna0213.jo [Sun, 20 Nov 2016 23:51:44 +0000 (08:51 +0900)]
Fix windows build failed about incompatible types in jenkins

- resolve incompatible types error to build windows

Change-Id: I5095bb7de066eb966316812d57728361c685a811
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14533
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 54e9021921fece152c8c87e3d25f28b0bc0f5608)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14559
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
12 months agoUse RTM_NEWADDR, RTM_DELADDR to receive info about an IP address. 29/14529/2
hyuna0213.jo [Mon, 14 Nov 2016 06:50:36 +0000 (15:50 +0900)]
Use RTM_NEWADDR, RTM_DELADDR to receive info about an IP address.

We use RTM_NEWLINK multicast group mask to receive information about
a created or removed network interface. and If a specific network
interface is added, we call getifaddrs() to get an IP address
associated with an interface. but it is more correct to use
RTM_NEWADDR, RTM_DELADDR to detect IP address changes.

Change-Id: I9389cac95473583a015dd4d40489943dc856e0fd
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14529
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
12 months agoAdd RD_MODE build option on Tizen Platform 13/14413/2
YounghyunJoo [Mon, 14 Nov 2016 08:06:24 +0000 (17:06 +0900)]
Add RD_MODE build option on Tizen Platform

- in case of building using gbsscript, can get RD_MODE option

Conflicts:
        tools/tizen/iotivity.spec

Change-Id: I88a027e2ba050ce9eb622eabf3d988eba8db9c64
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14413
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months ago[IOT-1587] Fix cloud certificate to follow TLS specification 09/14609/3
Jee Hyeok Kim [Tue, 22 Nov 2016 08:39:38 +0000 (17:39 +0900)]
[IOT-1587] Fix cloud certificate to follow TLS specification

1. Update cloud sample certificate to meet TLS specification of proposal.
   (Add uuid:xxx value to public certificate CN field)

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

Change-Id: I9aacd8f31f50862a0b962cef3d68a389710d4568
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14609
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months agoadded log messages on ip adapter to improve debugging 09/14509/4
Jaewook Jung [Fri, 11 Nov 2016 01:18:06 +0000 (10:18 +0900)]
added log messages on ip adapter to improve debugging

Because there was no log, it was hard to see the triggering point for
multicast group join.

And modified some codes for optimization.

Change-Id: I06c8ca4e7ec5e87db6f9fe3cb0b03ae22fb6b42e
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit b1a955c007a12921760f8baef518eafa6fdd419d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14509
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months ago[IOT-1534] Cloud sample client updated to test Group/Invite features 09/14409/8
yeonghun.nam [Tue, 22 Nov 2016 01:23:16 +0000 (10:23 +0900)]
[IOT-1534] Cloud sample client updated to test Group/Invite features

1. add/delete/update multiple properties
2. group creation option added
3. resource publish/discover functionality added

Change-Id: Ie4525f625d363b2382ae1fcf4c59566192bd80d5
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14409
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
12 months agoFix DTLS retransmission error 13/14513/5
Oleksii Beketov [Mon, 21 Nov 2016 12:14:39 +0000 (14:14 +0200)]
Fix DTLS retransmission error

Change-Id: I26360583ccd7df3cab98f2b13ca207040ddf5f35
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14513
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoFlush 'Build for ...' messages before each build 89/14089/3
Trevor Bramwell [Thu, 15 Sep 2016 19:55:59 +0000 (12:55 -0700)]
Flush 'Build for ...' messages before each build

During a run of 'auto_build.py', stdout buffering get taken over by the
subprocess module, causing print statements in 'auto_build.py' to not
output until the very end of a build. Calling 'sys.stdout.flush()'
causes stdout to be output before the next call to 'subprocess'.

Change-Id: Ibb193b5d30458a3d9be20d418ee22cac302ee819
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11823
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
(cherry picked from commit 7b858e89dfffdd08a6084a590fa87cb8e70ea132)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14089
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoModify a typing error of help message. 69/14569/2
Jake Kim [Tue, 23 Jun 2015 14:53:13 +0000 (23:53 +0900)]
Modify a typing error of help message.

A name of this file is OICMiddle, but there is a typing error
in help message. So modify from IOCMiddle to OICMiddle.

Change-Id: I29be198ca313022753531088e53d5d47c61fef36
Signed-off-by: Jake Kim <copy_x@naver.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1405
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
(cherry picked from commit 2210aba65dbecdf56a2ff5377bf3b76234803342)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14569

12 months ago[IOT-1573] Account User search revised in device-to-cloud communication 99/14599/3
yeonghun.nam [Mon, 21 Nov 2016 09:12:21 +0000 (18:12 +0900)]
[IOT-1573] Account User search revised in device-to-cloud communication

 - user search logic added in Account Server
   - GET /oic/account/search?uid=u0001;uid=u0002
       (to search users using multiple "OR" conditions)
   - GET /oic/account/search?name=mike,email=mike@aaa.com
       (to search users using multiple "AND" conditions)

patch #4 : unnecessary logs are removed

Change-Id: Ib7aa014434a41d8a5092780b3dfc8de688faa465
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14459
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 1f1e81ef5bdd2cff068a87ffe73ca647c8f2f8d6)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14599
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoRemove Thing-manager service which is deprecated. 55/14555/3
Jihun Ha [Mon, 21 Nov 2016 08:12:39 +0000 (17:12 +0900)]
Remove Thing-manager service which is deprecated.

Functionalities of the current things manager are deprecated because
OCF specification describes oic/con and oic/mnt resources with ambiguousness.
When it comes to be more specific, then a new service for managing those
resource will be developed.

Change-Id: Idd0340ee624c6aa7e05d7f0717bb8a90b1ace7a3
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agomodified searchUser() API on OCAccountManager 45/14545/2
Jaewook Jung [Mon, 21 Nov 2016 05:31:17 +0000 (14:31 +0900)]
modified searchUser() API on OCAccountManager

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

Change-Id: I431d6a4750d7a0772831da1865de2e8c5498ed09
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14545
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
12 months agoD2D Get request error fix 63/14163/3
Oleksandr Dmytrenko [Wed, 9 Nov 2016 15:33:44 +0000 (17:33 +0200)]
D2D Get request error fix

Removed payload type check in Get request

Change-Id: I405a7a6bba7255d8c05cc8a34342217c6e04e819
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14163
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1556] Changes in cloud according to the stateless request/response model (group... 85/14585/2
yeonghun.nam [Tue, 15 Nov 2016 06:03:30 +0000 (15:03 +0900)]
[IOT-1556] Changes in cloud according to the stateless request/response model (group features)

The cloud implementation is revised, due to the protocol update to the stateless request/response model in the device-to-cloud communication.

- Group Management
  - Group creation implementation
  - add/update/delete properties
  - delete group
  - get group information

patch #6: POST /oic/acl/group/ response correction

Change-Id: I7db5836bff5b4cb33a7effa523f9388ff4240262
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14333
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 834187fe46f97e101496d0d5f156efdbd330f3fa)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14585
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1556] Changes in cloud according to the stateless in CloudInterface and AccountS... 83/14583/2
Jung Seungho [Tue, 15 Nov 2016 07:26:51 +0000 (16:26 +0900)]
[IOT-1556] Changes in cloud according to the stateless in CloudInterface and AccountServer

- appended uid in AclInvite, Account and AccoutSession in CI
- apppeded uid, members in AclGroup, ResourceFind, ResourcePresence and DevicePresence
- added logic for verifying accesstoken in AccountManger in AS
- fixed testcase

Change-Id: I468c13127452edaee7301b9cafd0ab9f28bbf65d
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14341
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 186bc52a19653b48a154d8dfb1815e1cabce2efc)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14583
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1561] Improve vs12_snprintf 87/14387/10
Dan Mihai [Tue, 15 Nov 2016 08:23:04 +0000 (00:23 -0800)]
[IOT-1561] Improve vs12_snprintf

Improve the snprintf surrogate used to build for Windows using Visual
Studio 2013 or older.

Also remove the dependency on cmake for building gtest for Windows, to
fix a build break for the new snprintf_test.cpp.

Change-Id: I70c9d0766a9a316a19cbd283671137e61ab88dbf
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14387
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
12 months ago[IOT-1551] Tizen: Support Ethernet/3G Status Monitoring in IP Adapter 17/14317/6
hyuna0213.jo [Fri, 28 Oct 2016 04:18:54 +0000 (13:18 +0900)]
[IOT-1551] Tizen: Support Ethernet/3G Status Monitoring in IP Adapter

Currently Wifi status monitoring is supported for tizen.
To support Ethernet/3G status monitoring in IP Adapter,
Wifi Manager is replaced with Connection Manager.

Change-Id: Ie5350269c152a42267218749952ab47171b865be
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13711
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14317
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
12 months ago[IOT-1527] add GroupBrokerManager, GroupPolicyManager to check authorization 57/14557/2
eunok.shin [Thu, 20 Oct 2016 10:01:48 +0000 (19:01 +0900)]
[IOT-1527] add GroupBrokerManager, GroupPolicyManager to check authorization

Change-Id: Ie812c968c2b6daa5c7c544e7352b4f94a7d7994d
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13611
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Tested-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit a72600e7f7dc16a74109af58032c5eb7ff454a7d)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14557
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months ago[IOT-1533] fixed KeepAlive resource for receiving PUT, POST Message 53/14553/2
Jung Seungho [Mon, 31 Oct 2016 00:58:36 +0000 (09:58 +0900)]
[IOT-1533] fixed KeepAlive resource for receiving PUT, POST Message

Change-Id: Ie52fe040cd11319a34219efc942a2e102663ecba
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13847
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 40f1a0f47e270d611fc8349276a87daba8ec4a60)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14553
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1532] added GroupAclManager for managing group between acl 51/14551/2
Jung Seungho [Mon, 7 Nov 2016 05:08:26 +0000 (14:08 +0900)]
[IOT-1532] added GroupAclManager for managing group between acl

Change-Id: I5d99b4fbfcd0e3464411754919356326a75def3c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13579
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 35f6b5689995e5143ef7cbc1bace9688dd07d9a9)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14551
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1527] GroupManager according to the revised group resource model 49/14549/2
yeonghun.nam [Tue, 25 Oct 2016 07:35:52 +0000 (16:35 +0900)]
[IOT-1527] GroupManager according to the revised group resource model

1. GroupManager to manage group management requests
  - GET oic/acl/group/<gid>
  - POST oic/acl/group/<gid>
  - POST oic/acl/group/<gid>?op=add
  - POST oic/acl/group/<gid>?op=delete
  - DELETE oic/acl/group/<gid>
2. User Authorization based group management

patch #28 #1: resources are not recorded to the group if devices regarding to the resources are already registered to the group
patch #28 #2: verification logic is added; when a device is registered to the parent group, recources of the device can be registered to subgroups

Change-Id: I5d90a0eea537e43fe06789db1897c90a766e01c5
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13609
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit a59953bbc30e99b58eec487d035ead886bb51185)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14549
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agotizen: Ship resource_directory dynamic library 67/13967/10
Philippe Coval [Wed, 2 Nov 2016 16:13:23 +0000 (17:13 +0100)]
tizen: Ship resource_directory dynamic library

Note, it's also built with TARGET_OS=linux

For the record previous undefined OCRDDelete OCRDPublish problem
 is now fixed by this change:
 https://gerrit.iotivity.org/gerrit/#/c/14285/

Bug: https://jira.iotivity.org/browse/IOT-1510
Change-Id: I24e1621788a9154af70cf2db307383b329a8e526
Origin: https://gerrit.iotivity.org/gerrit/#/c/13967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoFix static analysis issues in CA, rd_client and ocstack 39/14339/2
Minji Park [Wed, 9 Nov 2016 09:33:14 +0000 (18:33 +0900)]
Fix static analysis issues in CA, rd_client and ocstack

- variable initialization and null checking added

Change-Id: Ibb47193ccb480941abfa71b0d32020891d2025f6
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14157
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14339
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months ago[IOT-1575] Initialize socket fd after closing session 99/14499/4
Minji Park [Thu, 17 Nov 2016 12:21:33 +0000 (21:21 +0900)]
[IOT-1575] Initialize socket fd after closing session

- add socket fd initialization after closing TCP session in tcpserver

Change-Id: Icb40f0c37ccc17ee9972974cfeae752e3a60048d
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14499
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IOT-1576] Changed error handling logic when tls message send failed 93/14493/5
Minji Park [Fri, 18 Nov 2016 02:48:12 +0000 (11:48 +0900)]
[IOT-1576] Changed error handling logic when tls message send failed

- Changed error handling logic when tls message send failed
  in tcpadapter

Change-Id: I22d11d34d2092a7f452d41be9f243dcfdf16a02d
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IOT-1575] Fixed session delete function to resolve double free issue 95/14495/4
Minji Park [Thu, 17 Nov 2016 11:33:05 +0000 (20:33 +0900)]
[IOT-1575] Fixed session delete function to resolve double free issue

- fix double free issue in tcpserver
  when disconnecting TCP session

Change-Id: Ica0b9f0976426d66309ef7304149eb54489b6b66
Signed-off-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14495
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoUpdate the list of IPv6 multicast groups we join 63/13963/3
Thiago Macieira [Wed, 2 Nov 2016 16:18:47 +0000 (09:18 -0700)]
Update the list of IPv6 multicast groups we join

According to OCF internal discussions, the upcoming OIC 1.1 spec will
have an errata that specifies that devices should always join the OCF
group on scopes 2, 3 and 5, and that devices connected to WiFi and/or
Ethernet should send discoveries on scope 2. IoTivity already sends on
scope 2 only; this patch merely enables joining on the other scopes.

Change-Id: Ic46ff326a6ba46bc877cfffd1483478d310e719b
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13963
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoAdd a maximum observer TTL of 24 hours 27/14527/2
hyuna0213.jo [Sun, 20 Nov 2016 23:00:47 +0000 (08:00 +0900)]
Add a maximum observer TTL of 24 hours

A server that transmits notifications mostly in non-confirmable
messages MUST send a notification in a confirmable message instead of
a non-confirmable message at least every 24 hours. This prevents a
client that went away or is no longer interested from remaining in the
list of observers indefinitely.

Change-Id: Ie676f9f5f394fa094b4f2d9fd3a72e2d38d21b24
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11497
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>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14527
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoRemove resource directory dependency in lib OC 85/14285/5
Habib Virji [Fri, 11 Nov 2016 10:58:50 +0000 (10:58 +0000)]
Remove resource directory dependency in lib OC

- Android code related to the resource directory is removed from OCPlatform and is in standalone file.
- In android resource-directory is linked as a shared file.
- Resource directory code in the InProcServerWrapper was creating a circular dependency and unwanted requirement
for the unit test and sample code.
- This patch fixes this dependency and moves C++ code to the resource directory.

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

Change-Id: I23423929b3000471d7fb91cb7c7bac89c3d1879b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14285
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Reviewed-by: HyunJun Kim <hyunjun2.kim@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months ago[IOT-1527] change public api about group resoure 47/14547/2
eunok.shin [Wed, 12 Oct 2016 10:20:35 +0000 (19:20 +0900)]
[IOT-1527] change public api about group resoure

Change-Id: I8e372299b38b18c43a883ad29b9362eed16de70c
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13607
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit c5ef5fae4f08b1fcb9c5c3c6dc50b6798c3fe975)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14547
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1536] add logic checking the device presence when finding resource. 43/14543/2
eunok.shin [Fri, 28 Oct 2016 07:56:38 +0000 (16:56 +0900)]
[IOT-1536] add logic checking the device presence when finding resource.

Change-Id: I6cbfb62855a80d03bf0aebf505505222a146ca38
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13817
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
(cherry picked from commit 9f5c6903aa2187ca8b7326416f764bed044b1c61)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14543
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoadded acl logic, when sign up, device delete and Request/Response relay. 67/12867/26
Jung Seungho [Sun, 9 Oct 2016 23:50:59 +0000 (08:50 +0900)]
added acl logic, when sign up, device delete and Request/Response relay.

- added create acl, when sign up
- added remove acl, when device delete
- added verify, when Request/Response relay
- relocate singleton object(getInstance) to AclManager
Patch #10: modified updateAclACE and add getAclACE, getACE Method in related class of Acl
Patch #11: reflected on the comments from Glen
Patch #14: modify addAclACE in AclManager and addACE in Acl to return generated aceids
Patch #15: fixed bug in AclVerifyResource and AccountManager
Patch #19: reflected on the comments from Eunok and fixed minor bug
Patch #22: fixed merge conflict

Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Change-Id: I0507d2a994b1adf3d78bda4d1608cb7d9ec6c850
Reviewed-on: https://gerrit.iotivity.org/gerrit/12867
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
12 months agomodified OCAccountManager APIs 35/14335/6
Jaewook Jung [Wed, 19 Oct 2016 04:49:45 +0000 (13:49 +0900)]
modified OCAccountManager APIs

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

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

Change-Id: Ibf462a6667990c1786d8b4111263d96e5c618166
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14335
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agobuild: Update version to 1.2.1 53/14453/2
Philippe Coval [Thu, 17 Nov 2016 09:41:31 +0000 (10:41 +0100)]
build: Update version to 1.2.1

Change-Id: Ib8994521a91c17d3714d0594d6fbc05e335cd82e
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agomodified uri for searching user on account server 55/14455/2
Jaewook Jung [Thu, 17 Nov 2016 10:40:17 +0000 (19:40 +0900)]
modified uri for searching user on account server

modified uri since the account server specification has been changed.

Change-Id: I25771bca72803fe88a09631611194baf73a28181
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14455
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IOT-1554] Added error callback when adapter is terminated 95/14395/3
hyuna0213.jo [Thu, 10 Nov 2016 09:39:24 +0000 (18:39 +0900)]
[IOT-1554] Added error callback when adapter is terminated

If application try to send data when adapter is terminated,
Error message should be delivered to application layer.

Change-Id: Iec02116e864fb8667570c67982f44838d74f84a9
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14181
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 871b61a5eb48b4891f1bb447a6795505871e872f)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14395
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
12 months agoAdd shutdown() to disable send/receive on a socket in catcpserver 43/14343/3
Minji Park [Tue, 15 Nov 2016 07:30:02 +0000 (16:30 +0900)]
Add shutdown() to disable send/receive on a socket in catcpserver

- Add shutdown() before close socket when closing connection in catcpserver

Change-Id: Ibe2ed942428f754dc148bd1c48422036f84a319c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoFix Device and Payload response 21/14421/2
Habib Virji [Wed, 16 Nov 2016 10:32:31 +0000 (10:32 +0000)]
Fix Device and Payload response

Bug fix due to change introduced in  https://gerrit.iotivity.org/gerrit/#/c/12283/

Change-Id: Ib6b03f4296c8ef0fb1ac7ac79ff1023856a070bc
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14421
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agofix findresource failure issue. 11/14411/3
jihwan.seo [Wed, 16 Nov 2016 05:11:16 +0000 (14:11 +0900)]
fix findresource failure issue.

this fix is from https://gerrit.iotivity.org/gerrit/#/c/12283/

Change-Id: I322ec7f7a833134f5849eb2157f0025273ebed06
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14411
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months ago[IOT-1570] fixed a crash issue related to block-wise transfer 39/14439/2
Jaewook Jung [Thu, 17 Nov 2016 04:14:43 +0000 (13:14 +0900)]
[IOT-1570] fixed a crash issue related to block-wise transfer

When a resource server receives 4.08 error response from a resource
client, the server will try to send the response from the first
block again.
But now, the server assumes the message type that has to be sent
for receiving 4.08 error is only request message.
So I modified to handle it up to the message type.

Change-Id: I555b5dd5c44b73647c2543de551aba6f5113f909
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
(cherry picked from commit 4667f8b18e45b67022a0dc0966ad85c572d52f53)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14439
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoManufacturer certificate based ownership transfer support. 75/14275/9
Chul Lee [Mon, 14 Nov 2016 04:49:36 +0000 (13:49 +0900)]
Manufacturer certificate based ownership transfer support.

1. Add manufacturer certificate OxM callbacks
   : resource/csdk/security/provisioning/src/oxmmanufacturercert.c
   : resource/csdk/security/provisioning/include/oxm/oxmmanufacturercert.h

2. Apply the manufacturer cert based OxM on the client & server.
   : resource/csdk/security/provisioning/src/ownershiptransfermanager.c
   : resource/csdk/security/src/doxmresource.c

3. Add manufacturer certificate supported sample server
   : resource/csdk/security/provisioning/sample/sampleserver_mfg.cpp

4. Add API to set the allowed/not-allowed OxM which is OCSetOxmAllowStatus()
   : resource/csdk/security/provisioning/src/ocprovisioningmanager.c
   : resource/csdk/security/provisioning/include/ocprovisioningmanager.h

5. Add OCStackResult code to handle not allowed OxM exception.
   : resource/csdk/stack/include/octypes.h
   : resource/src/OCException.cpp
   : resource/include/StringConstants.h
   : resource/unittests/OCExceptionTest.cpp

6. Update the SConscript according to above modifications.
   : resource/csdk/security/provisioning/SConscript
   : resource/csdk/security/provisioning/sample/SConscript

Change-Id: Ibb4b4eec33a1e39234f808e32cc3b96aff4879ad
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14275
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1519] Don't clear ownerPSK secret too early 91/14491/2
Kevin Kane [Fri, 18 Nov 2016 02:11:20 +0000 (18:11 -0800)]
[IOT-1519] Don't clear ownerPSK secret too early

Owner PSK secret was cleared too early; only clear after
all uses are finished.

Change-Id: Ie39990a5aabfcd71b8370103b7182cb76cb09f40
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoAdd raxmpp and yaml extlibs to .gitignore 23/14423/2
Kevin Kane [Wed, 16 Nov 2016 18:46:28 +0000 (10:46 -0800)]
Add raxmpp and yaml extlibs to .gitignore

If these dependencies are cloned into the repo, git will think
they're untracked subtrees of the iotivity repo. This change
adds them to .gitignore like the rest of the dependencies in
extlibs.

Change-Id: I65074d5df9accef813d8f1ffc3be2a0e887ced91
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14423
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1528]update file path and remove static analysis warring 37/14337/3
bg.chun [Wed, 9 Nov 2016 08:49:16 +0000 (17:49 +0900)]
[IOT-1528]update file path and remove static analysis warring

update file path(ifaddrs.x -> caifaddrs.x)
and fix netlink usage for remove static analysis warring

Change-Id: I672d9ba1250710cc10c66cbbde56b6b12afc15e8
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14337
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
12 months agobuild: Rewrite sqlite SConscript a more portable way 75/14075/3
Philippe Coval [Sat, 23 Jul 2016 05:31:05 +0000 (07:31 +0200)]
build: Rewrite sqlite SConscript a more portable way

Windows support should be improved.

Fixed weird indentation that looked strange
 when I was investigating if files were present in Tizen builder.

Change-Id: I80c9667a502a1115fdfbcd5ecd50b1e799ff5fdb
Bug: https://jira.iotivity.org/browse/IOT-820
Origin: https://gerrit.iotivity.org/gerrit/#/c/9641/1/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9653
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
(cherry picked from commit ff90362afac06f289d12fb917d124c9efff3464b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/14075
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1519] Securely zero buffers containing secret data 91/14091/6
Kevin Kane [Fri, 4 Nov 2016 20:53:34 +0000 (13:53 -0700)]
[IOT-1519] Securely zero buffers containing secret data

Add an OICClearMemory helper function, and use it to securely
clear buffers that contain keys and other secret data that
shouldn't be left in the stack or on the heap.

Rename privateKey to g_privateKey in csr.c.

Fix a couple of leaked payloads on error return paths in
secureresourceprovider.c (which will also now zero their
contents).

Change-Id: If79c840ad758be2a7ca1bf7e6ccccb6dbdc39cf2
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1550] Resolved reset issue on rowner of cred 27/14327/4
js126.lee [Tue, 15 Nov 2016 04:48:08 +0000 (13:48 +0900)]
[IOT-1550] Resolved reset issue on rowner of cred

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

issue : Rowner of cred is reset, when saving Cert. chain
        using SRPSaveTrustCertChain and SRPSaveOwnCertChain.

Patch 1: upload patch
Patch 2: rebase
Patch 3: Apply review comment

Change-Id: I59cdbfb30253c61e1c27dcf640958899af976a96
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14327
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoReturn correct error code when send fails in catcpserver 25/14325/3
Jaehong Jo [Mon, 7 Nov 2016 00:45:47 +0000 (09:45 +0900)]
Return correct error code when send fails in catcpserver

Modified ssl adapter along with  modified return type.

Change-Id: Ife10f276ef5315b868d21bc66fa121ff6baa61ac
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14325
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoEnable mbedTLS's log with LOGGING=1 option 11/14311/3
Chul Lee [Tue, 15 Nov 2016 01:32:26 +0000 (10:32 +0900)]
Enable mbedTLS's log with LOGGING=1 option

Change-Id: I51b285aac780d17d5ff45a6e5be200bef4359602
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14311
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1513] Incorrect URI construction 73/14273/3
Dave Thaler [Sat, 12 Nov 2016 08:57:16 +0000 (17:57 +0900)]
[IOT-1513] Incorrect URI construction

The % character is not legal to be placed literally in a URI, it must be
escaped (as "%25") before being enclosed in a URI.  Other places were
changed in July in change 9419, and some more in change 14009, but these
code paths were not changed at that time.

This also fixes a bug in setHost which did not mark an IPv6 address as
IPv6, and adds a test case that covers this.

Change-Id: I1331ecb9c5482a2d43dd675978a1f34c6d37cb4c
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agofixed bug for ESEnrolleeState validation check logic 03/14403/3
Parkhi [Wed, 16 Nov 2016 06:04:47 +0000 (15:04 +0900)]
fixed bug for ESEnrolleeState validation check logic

Change-Id: I51225c3f814ed6a651a06082a2504fb65289c58a
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14403
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1529] Sync TinyCBOR to release tag before using 65/14165/6
Kevin Kane [Wed, 9 Nov 2016 17:38:22 +0000 (09:38 -0800)]
[IOT-1529] Sync TinyCBOR to release tag before using

Current build will sync to the head of TinyCBOR's master branch.
To remove this unpredictability from the build, always sync to
a particular release tag.

Change-Id: I471ac19aedc787bca64ee01c4733ab319d6f32d3
Signed-off-by: Kevin Kane <kkane@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agofix crash issue related set interfaceQuery. 71/14371/2
jihwan.seo [Tue, 15 Nov 2016 08:48:54 +0000 (17:48 +0900)]
fix crash issue related set interfaceQuery.

Change-Id: I7c40c0930879a0ad860e935325adc44b860d9ee8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
12 months ago[IOT-1361][Android]Using netlink for get ipaddr instead of ioctl 19/14219/4
bg.chun [Thu, 6 Oct 2016 10:23:10 +0000 (19:23 +0900)]
[IOT-1361][Android]Using netlink for get ipaddr instead of ioctl

Using netlink to support getting ipv6 address in CAGetNetworkInfo()
Remove ioctl code and using netlink.

Change-Id: I94dd5bebd2f8dde95cb589e4f64a44c2a1a428f1
https://jira.iotivity.org/browse/IOT-1361
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14219
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoJunit files for acl id and acl verify methods 75/14175/5
Sunil Kumar K R [Thu, 10 Nov 2016 06:49:24 +0000 (12:19 +0530)]
Junit files for acl id and acl verify methods

Change-Id: Ib2b138631a63a1eba9a15608d04605f726fc5ba6
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14175
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1549] Add DTLS retransmission 49/14349/3
Chul Lee [Wed, 16 Nov 2016 00:58:20 +0000 (09:58 +0900)]
[IOT-1549] Add DTLS retransmission

Create thread for checking peer timer

Change-Id: I067b5924035b4b2563fcc094a5cbcf6dd9ae6e50
Signed-off-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IoT-1557] Bug fix about related relay server. 13/14313/5
jaesick.shin [Tue, 15 Nov 2016 01:38:55 +0000 (10:38 +0900)]
[IoT-1557] Bug fix about related relay server.

This patch include,
missing the declare of function.

Change-Id: I1b543402a9ba8487029d8b59e806c6b570439652
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1361][Tizen]Using getifaddrs for get ipaddr instead of ioctl 17/14217/3
bg.chun [Tue, 27 Sep 2016 01:54:58 +0000 (10:54 +0900)]
[IOT-1361][Tizen]Using getifaddrs for get ipaddr instead of ioctl

Using getifaddrs to support getting ipv6 address in CAGetNetworkInfo()
Remove ioctl code and using getifaddrs for get ipv6 address.

Change-Id: I31816d605424833ed9324a05ab3b1e1492aab5c7
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14217
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IOT-1361]Change "CAFindInterfaceChange()" to support IPv4/6 15/14215/6
bg.chun [Tue, 4 Oct 2016 02:44:58 +0000 (11:44 +0900)]
[IOT-1361]Change "CAFindInterfaceChange()" to support IPv4/6

Change "CAFindInterfaceChange" return type to listen for multicast packets from
both of IPv4/IPv6 Address bind in one physical Network Interface.
As is: CAInterface_t *CAFindInterfaceChange();
To be: u_arraylist_t *CAFindInterfaceChange();

Change-Id: I8c30f46669ca5c22962c4f629c2e2e4649cb54b5
Bug: https://jira.iotivity.org/browse/IOT-1361
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12737
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: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14215
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agomodified BLE scanning logic to stop while is connecting. 93/14293/3
jihwan.seo [Mon, 31 Oct 2016 08:06:51 +0000 (17:06 +0900)]
modified BLE scanning logic to stop while is connecting.

since connection lead time have improved in stop scan state.
BLE scan should be stopped while is connecting.

Change-Id: Iefcb37c7c366efecc22ae9014615a3795ba0fdaa
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/13871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14293

12 months agoFix Discovery issue with OCResource 95/14295/2
Habib Virji [Mon, 14 Nov 2016 22:13:53 +0000 (22:13 +0000)]
Fix Discovery issue with OCResource

Fix memory allocation and handling response as introduced in the change for issue 1134.

Change-Id: Ieebd1dde50d87e05f9e7ea0cec04af398cabe3ef
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14295
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months agolinux: Use sqlite from system like Tizen does 73/14073/2
Philippe Coval [Mon, 10 Oct 2016 09:49:28 +0000 (11:49 +0200)]
linux: Use sqlite from system like Tizen does

It must be installed before building,
 For instance on debian and derived:
 apt-get install libsqlite3-dev

Note for later, it would make sense to move
 all those platform tests into sqlite sconfile.

Bug: https://jira.iotivity.org/browse/IOT-1296
Change-Id: I431a11821844bef8eabba30e1111b1ebf0799d66
Origin: https://gerrit.iotivity.org/gerrit/#/c/9135/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9135
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14073
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoChange pstat.deviceuuid from R-only to RW 69/14069/2
Jongmin Choi [Mon, 7 Nov 2016 09:57:14 +0000 (18:57 +0900)]
Change pstat.deviceuuid from R-only to RW

As SWG decided that pstat.deviceuuid is RW,
pstat handler has been fixed accordingly.

Patch #1: Initial upload

Change-Id: Ibc0b1d86ddfb06306268dddaf07f38152d8800f2
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoChange doxm.deviceuuid from R-only to RW in doxm entity handler. 53/14053/3
Nathan Heldt-Sheller [Fri, 4 Nov 2016 21:13:00 +0000 (14:13 -0700)]
Change doxm.deviceuuid from R-only to RW in doxm entity handler.

CTT testing revealed a bug in 1.2 (and a matching bug in the 1.1
schema) that had marked deviceuuid as R-only.  However this is
not correct: deviceuuid must be Writeable to allow the OBT
to update with a new UUID during onboarding.  This has been
verified by SecWG and needs to be fixed in 1.2.

Patch #2: added a line to also copy deviceuuid in updateWriteableProperty() function

Change-Id: Icff6d978f5a12af021d557a5c71f25a4e9957ba2
Signed-off-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14053
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>