iotivity.git
12 months agoMerge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel 1.2.1-RC2
uzchoi [Fri, 2 Dec 2016 01:13:22 +0000 (10:13 +0900)]
Merge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel

12 months ago[IOT-1627][Android]resolve ipadapter memory leak issue 95/14995/3
bg.chun [Thu, 1 Dec 2016 06:01:54 +0000 (15:01 +0900)]
[IOT-1627][Android]resolve ipadapter memory leak issue

On android ipadapter there is memory leak issue
since the function which used for free pointer
of structure does not free all pointer member

Change-Id: If44dd9dc7562f851fa3f38526830aa84e4b35491
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agoAdd links and rep in the response for the collection 21/14621/9
Habib Virji [Wed, 30 Nov 2016 21:24:52 +0000 (21:24 +0000)]
Add links and rep in the response for the collection

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

Change-Id: I98489ac9923ab3c63012ddfe6b55c2b3064c3f28
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14621
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agoFix Android SetPropertyValue function call 25/15025/2
Habib Virji [Thu, 1 Dec 2016 12:01:43 +0000 (12:01 +0000)]
Fix Android SetPropertyValue function call

setPropertyValue call in the Android was swapped, compared to function call how it  was in the JNI layer.
setPropertyValue0 is for passing string array and setPropertyValue1 is passing string.

Change-Id: I91c480f162cc53712a68bef078371559fd2eff21
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15025
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoandroid: Fix resource_directory build issue 31/15031/4
Philippe Coval [Thu, 1 Dec 2016 18:47:25 +0000 (19:47 +0100)]
android: Fix resource_directory build issue

jni/../../../../out/android/armeabi/debug/libresource_directory.so exists  or that its path is correct

In https://gerrit.iotivity.org/gerrit/#/c/14731, resource_directory was added in the resource-container. It is not
needed and break android build.

Change-Id: I05a1b422f6561102c641cc50cd68baa58768b11a
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
12 months agotizen: resource-encapsulation prevent to import tools.scons.RunTest 27/15027/2
Philippe Coval [Thu, 1 Dec 2016 12:07:56 +0000 (13:07 +0100)]
tizen: resource-encapsulation prevent to import tools.scons.RunTest

As unit tests are not enabled on tizen, there is no need to import it.

A smarter way would be to follow other tests patterns
 and have them separated and included in supported platforms.

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I2a925a251480c35d90bab6b2661c4da60f959b6f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15027
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoservice: [IOT-1562] Fix for unittest with SECURED at RE/RC 37/14837/16
KIM JungYong [Mon, 28 Nov 2016 08:33:18 +0000 (17:33 +0900)]
service: [IOT-1562] Fix for unittest with SECURED at RE/RC

When IoTivity was built with SECURED and TEST,
some of test case at RE and RC occurring crash.
because RE and RC has not set the precondition of security.

In this patch, added the security flow and persistence storage files at RE.
related security test case is disabled at RC.

Change-Id: I4094bd01cba84d395c408a56f4c57d4ebcb45b44
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Bug: https://jira.iotivity.org/browse/IOT-1562
Reviewed-on: https://gerrit.iotivity.org/gerrit/14837
Tested-by: Phil Coval <philippe.coval@osg.samsung.com>
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 agoconnectivity: Enable resource/csdk/connectivity test 21/12721/6
Philippe Coval [Thu, 1 Dec 2016 01:35:43 +0000 (02:35 +0100)]
connectivity: Enable resource/csdk/connectivity test

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I6b47f7b3439b923ec12f26b0e159e3b7a1144658
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12721
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoRemove resource-hosting service which is deprecated. 03/15003/3
KIM JungYong [Thu, 1 Dec 2016 08:26:45 +0000 (17:26 +0900)]
Remove resource-hosting service which is deprecated.

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

Change-Id: Ie14482924b7ccbebbd2512f017ad4b6039d72dd2
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoCorrect callback function for security provisioning in easy setup 13/15013/3
Parkhi [Thu, 1 Dec 2016 09:21:56 +0000 (18:21 +0900)]
Correct callback function for security provisioning in easy setup

Change-Id: Id7d1deb6371d49e4810c191bc52979693ce16e8d
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15013
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agoFix defects detected by static analysis 09/15009/3
Parkhi [Thu, 1 Dec 2016 09:07:45 +0000 (18:07 +0900)]
Fix defects detected by static analysis

Change-Id: I9eba31f8f716f8d3b5b04b803bc4c9ecdf035e10
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15009
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agoHandle Error during Ownership Transfer 99/14999/3
Jongmin Choi [Thu, 1 Dec 2016 07:23:05 +0000 (16:23 +0900)]
Handle Error during Ownership Transfer

If an error is returned during ownership transfer,
on-boarding tool needs to remove the server's information from PDM DB
and close secure connection with the server.

Patch #1: Initial patch
Patch #2: Change Log Level

Change-Id: I641529552de0e25438bd94da9b2ec45320428a61
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14999
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agobuild: Bypass and/or fix suspicious tests (workaround) 67/14967/11
Philippe Coval [Tue, 29 Nov 2016 14:07:08 +0000 (15:07 +0100)]
build: Bypass and/or fix suspicious tests (workaround)

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

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

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: Ib665de6ab2dfe31b06ab3bb8cb3fb22f27487f4e
Origin: https://gerrit.iotivity.org/gerrit/#/c/14967/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14967
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months agobuild: Bypass non finishing security test (workaround) 25/14925/6
Philippe Coval [Tue, 29 Nov 2016 21:02:57 +0000 (22:02 +0100)]
build: Bypass non finishing security test (workaround)

Occured when SECURED=1

This change is temporary to make QA verifier sane again,
 with this change:
https://gerrit.iotivity.org/gerrit/#/c/14903/

If merged I will raise bugs for each bypassed testcase related to
https://gerrit.iotivity.org/gerrit/#/q/topic:IOT-1486

Bug: https://jira.iotivity.org/browse/IOT-1486
Origin: https://gerrit.iotivity.org/gerrit/#/c/14925/
Change-Id: I574f92375703bf8a82cad7be6948d46c10776360
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
12 months agoRemoved href from device and platform payload 79/14979/2
Habib Virji [Wed, 30 Nov 2016 22:09:30 +0000 (22:09 +0000)]
Removed href from device and platform payload

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

Change-Id: I59059997f170d177663e87eddea9df32275ca882
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agobuild: Enable unit testing in SECURED=1 mode for resource 03/14903/20
Philippe Coval [Wed, 30 Nov 2016 22:10:57 +0000 (23:10 +0100)]
build: Enable unit testing in SECURED=1 mode for resource

Bug: https://jira.iotivity.org/browse/IOT-1486
Change-Id: I38e593d49401f7e14bfa26dd980938d36e66ac68
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoUpdate a payload format to be compatible to OIC spec in easysetup 55/14855/8
Parkhi [Wed, 30 Nov 2016 02:42:56 +0000 (11:42 +0900)]
Update a payload format to be compatible to OIC spec in easysetup

1. In a response for get/post request with batch interface,
   "rep" keyword should be included for containing child resource's properties
   for each child resource.
2. Provisioning resource is a collection resource so it should have
   a "oic.wk.col" resource type.
3. "links" property for baseline and linklist interfaces should include a
   "p"(i.e. policy) property.

e.g. response for baseline:
{
  "rt":[
    "oic.wk.prov",
    "oic.wk.col"
  ],
  "if":[
    "oic.if.baseline",
    "oic.if.ll",
    "oic.if.b"
  ],
  "ps":0,
  "lec":0,
  "links":[
    {
      "href":"/WiFiProvisioningResURI",
      "rt":[
        "oic.wk.wifi"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/DevConfProvisioningResURI",
      "rt":[
        "oic.wk.devconf"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/CloudServerProvisioningResURI",
      "rt":[
        "oic.wk.cloudserver"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    }
  ]
}

e.g. response for linklist:
{
  "links":[
    {
      "href":"/WiFiProvisioningResURI",
      "rt":[
        "oic.wk.wifi"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/DevConfProvisioningResURI",
      "rt":[
        "oic.wk.devconf"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    },
    {
      "href":"/CloudServerProvisioningResURI",
      "rt":[
        "oic.wk.cloudserver"
      ],
      "if":[
        "oic.if.baseline"
      ],
      "p":{
        "bm":3
      }
    }
  ]
}

e.g. response for batch:
[
  {
    "href":"/ProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline",
        "oic.if.ll",
        "oic.if.b"
      ],
      "rt":[
        "oic.wk.prov",
        "oic.wk.col"
      ],
      "ps":0,
      "lec":0
    }
  },
  {
    "href":"/WiFiProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.wifi"
      ],
      "swmt":[
        2,
        3,
        4
      ],
      "swf":1,
      "tnn":"",
      "cd":"",
      "wat":0,
      "wet":0
    }
  },
  {
    "href":"/CloudServerProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.cloudserver"
      ],
      "ac":"",
      "apn":"",
      "cis":""
    }
  },
  {
    "href":"/DevConfProvisioningResURI",
    "rep":{
      "if":[
        "oic.if.baseline"
      ],
      "rt":[
        "oic.wk.devconf"
      ],
      "dn":"Test Device",
      "mnmo":"Test Model Number",
      "loc":"",
      "lang":"",
      "ctry":""
    }
  }

]

Change-Id: I13ccda6fedb7c628dc77cc13e84c1c10c0e1b487
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14855
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agobuild: use tools.scons.RunTest for provisioning tests 13/14913/6
Philippe Coval [Tue, 29 Nov 2016 14:07:08 +0000 (15:07 +0100)]
build: use tools.scons.RunTest for provisioning tests

To avoid race conditions

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I8f1e4823a7c4642b4b03fb4dca924447079d7e39
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
12 months agobuild: use tools.scons.RunTest for csdk security tests 15/14915/6
Philippe Coval [Tue, 29 Nov 2016 14:35:03 +0000 (15:35 +0100)]
build: use tools.scons.RunTest for csdk security tests

To avoid race conditions.

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I1c525d58b7c220dd8043b65bf873e0d1d294a020
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
12 months agoFix static analysis issue in ocresource 55/14955/2
Jaehong Jo [Wed, 30 Nov 2016 08:25:53 +0000 (17:25 +0900)]
Fix static analysis issue in ocresource

- add initial value and null checking

Change-Id: I50731d23865c72d2c03cb3b149b19bf4236bf587
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14955
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agoFix static analysis issue in keepalive 35/14935/2
Minji Park [Wed, 30 Nov 2016 01:16:50 +0000 (10:16 +0900)]
Fix static analysis issue in keepalive

- add return value checking logic after memory allocation

Change-Id: I1c28e13e01c2dd7bf4b78585adf0ffdc0e6ecdfd
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14935
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
12 months agobuild: Fix easy-setup unittests 57/14957/3
Philippe Coval [Wed, 30 Nov 2016 08:35:31 +0000 (09:35 +0100)]
build: Fix easy-setup unittests

Need to add a parameter to enable valgrind check

Without this change, a race condition may occur and complain like:
service/easy-setup/enrollee/unittests/easysetup_enrollee_test: not found

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: If927c9a2f6e00b18ab92664f014f4f85f34209aa
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months ago[IoT-1562] Handle unit test segfaults at notification service 51/14851/5
cc [Mon, 28 Nov 2016 12:39:35 +0000 (21:39 +0900)]
[IoT-1562] Handle unit test segfaults at notification service

Fix unittest segfault caused by discovery failure.
It is because external consumers or providers on the same network
interupt discovery or subscription precedure.
The test will be terminated once this situation happens,
even though precondition of the unittest is guided
to prevent this issue.

Change-Id: I0f763db760d8d2af0a185b9e7c3c6e71dfc5e5bf
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoresolved svace issues 07/14907/2
Randeep Singh [Tue, 29 Nov 2016 11:14:30 +0000 (16:44 +0530)]
resolved svace issues

Change-Id: If2b022d06a46c46cba1b3535c49ddcdbc794bf3c
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14907
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
12 months agoRemove unused functions that introduced compilation warnnings. 57/14857/2
Ziran Sun [Mon, 28 Nov 2016 15:24:26 +0000 (15:24 +0000)]
Remove unused functions that introduced compilation warnnings.

These functions were initially introduced for a test that had been
removed at a later stage.

Change-Id: I5bd5f0f4cae38627b34b8cd7a14d8ea99b7f5435
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14857
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agoInsert license text. 33/14933/2
Chul Lee [Wed, 30 Nov 2016 00:29:16 +0000 (09:29 +0900)]
Insert license text.

Change-Id: Ide755195b0041412d04aca7b11793682c4b0a406
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14933
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoResolve circular dependency for resource directory server 13/14813/2
Habib Virji [Tue, 1 Nov 2016 17:39:23 +0000 (17:39 +0000)]
Resolve circular dependency for resource directory server

[Habib Virji]
RD Shared Library creates a circular dependency between
resource_directory and octbstack. This patch resolves this dependency by
creating a seprating findResource part of the resource_directory.

[Philippe Coval]
Backported to 1.2-branch
Without this change built on Tizen with RD_MODE=CLIENT,SERVER
 failed on missing oicresourcedirectory.c

Change-Id: I653b9130e10f22dd61f4f1bd0b6ff4c47a69606a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/13935
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14813
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Shuvradeb Barman Srijon <srijon.sb@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoAdd pthread_join() in case of failure of ca_thread_pool_add_task() 89/14889/4
hyuna0213.jo [Tue, 29 Nov 2016 08:08:38 +0000 (17:08 +0900)]
Add pthread_join() in case of failure of ca_thread_pool_add_task()

In case of failure, we should call pthread_join() to free memory or
other resources that were allocated to the target thread.

Change-Id: Iabcb25751301b8cdb95565355cc0b6d3cffafc1d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14889
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1612] Fix OCRDPublishWithDeviceId() to publish with a specific id 93/14893/3
hyuna0213.jo [Tue, 29 Nov 2016 07:49:39 +0000 (16:49 +0900)]
[IOT-1612] Fix OCRDPublishWithDeviceId() to publish with a specific id

Fixed OCRDPublishWithDeviceId() to publish resource with a specific id
bug: https://jira.iotivity.org/browse/IOT-1612

Change-Id: Id0242a1c4a7040c928db179a840abf1c7f85400e
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14893
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1611] Memory corruption in OCSetAttribute 73/14873/2
Dave Thaler [Tue, 29 Nov 2016 02:26:30 +0000 (18:26 -0800)]
[IOT-1611] Memory corruption in OCSetAttribute

Fix memory corruption bugs in OCSetAttribute introduced by
https://gerrit.iotivity.org/gerrit/#/c/14377/ which left pointers to
freed memory in the attribute list, which was then later used.

Change-Id: Ib776d4bd14aab7b39c74188246005628fbe18ecf
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14873
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: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agoAdd to Null checking log in IsSameEowner 91/14891/2
js126.lee [Tue, 29 Nov 2016 07:42:50 +0000 (16:42 +0900)]
Add to Null checking log in IsSameEowner

When building with MULTIPLE_OWNER=1, ace is updated as appending alwadys,
because the return value is false in IsSameEowner in case both ewoner1 and
ewoner 2 are NULL.

Change-Id: I0068db4196fb467e4c95d29ae808848d95776bbe
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14891
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago1. Updated boost Framework path for ios 97/14797/8
srijon.sb [Fri, 25 Nov 2016 11:19:59 +0000 (17:19 +0600)]
1. Updated boost Framework path for ios
2. Fixed build errors
a. Some void functions return values
b. Added missing Headers

Change-Id: I0b6a796fb815a16725e06fa154499d5a8d1605cf
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agobuild: Valgrind script now depends on unit test executable 45/14845/3
Philippe Coval [Wed, 23 Nov 2016 22:27:46 +0000 (23:27 +0100)]
build: Valgrind script now depends on unit test executable

This prevents Sporadic Valgrind Failures, caused by race conditions
Common error message is like:
  out/linux/x86_64/debug/resource/unittests/unittests: Permission denied

build: only add dependency for valgrind supported hosts

Windows is confused with implicit .exe suffix ie:

  scons: *** [out\windows\...\utresource\csdk\connectivity\test\catests] \
  Explicit dependency ...\utresource\csdk\connectivity\test\catests' \
  not found, needed by target \
  ...

Bug: https://jira.iotivity.org/browse/IOT-1526
Change-Id: I49bfb21ee7cd934b965e132cb150d59c047ef383
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14845
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
12 months agoocf.patch for mbedtls compatibility fix 15/14815/2
Oleksii Beketov [Fri, 25 Nov 2016 15:55:20 +0000 (17:55 +0200)]
ocf.patch for mbedtls compatibility fix

Fixed to comfirm compatibility in case if no PSK hint received on the client side.

Change-Id: I2860188f966d8a71dbd834873f206b3ae78ec93e
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14815
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoCorrect missuse of get attribute value in ResourceClient unit test. 47/14847/2
Ziran Sun [Mon, 28 Nov 2016 11:50:14 +0000 (11:50 +0000)]
Correct missuse of get attribute value in ResourceClient unit test.

Change-Id: I57863e2291451aea5f1ce6d5fb7059b29d68a102
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14847
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
12 months ago[IOT-1601]Adding logic to validate oxmsel updationg in owned=true 41/14841/3
js126.lee [Mon, 28 Nov 2016 09:17:59 +0000 (18:17 +0900)]
[IOT-1601]Adding logic to validate oxmsel updationg in owned=true

This patch is related to CT1.7.8.3 case.
CTT has been agreed this patch.

Change-Id: Ia1e18bd940b69bfcf13c717a334a91a42f3f8402
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14841
Reviewed-by: Jongmin Choi <jminl.choi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1608] Support PUT,POST,DELETE method type for /oic/ping 35/14835/2
hyuna0213.jo [Mon, 28 Nov 2016 08:11:34 +0000 (17:11 +0900)]
[IOT-1608] Support PUT,POST,DELETE method type for /oic/ping

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

Change-Id: I47d81222cebced3505cafec8eabfe0604c94d8a3
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14835
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1605][tizen]Fix obs ocserver.cpp deregistration coredump issue 25/14825/2
bg.chun [Mon, 28 Nov 2016 04:09:40 +0000 (13:09 +0900)]
[IOT-1605][tizen]Fix obs ocserver.cpp deregistration coredump issue

Fix ocserver.cpp obs deregistration coredump issue in tizen.

Change-Id: Iba3f1288482cd20aac585eec599b45764499b09d
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14825
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1602] Remove observer when the tcp connection is disconnected 83/14683/9
hyuna0213.jo [Wed, 23 Nov 2016 13:51:58 +0000 (22:51 +0900)]
[IOT-1602] Remove observer when the tcp connection is disconnected

If the client observes one or more resources over a reliable
connection, then the CoAP server (or intermediary in the role of the
CoAP server) MUST remove all entries associated with the client
endpoint from the lists of observers when the connection is either
closed or times out.
Bug: https://jira.iotivity.org/browse/IOT-1602

Change-Id: I31dcf26a3dc731b4479c9d7a7a4755c7afd07ff8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14683
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months ago[IOT-1593] TLS ports and CA_SECURE flag added for secure socket accept 67/14667/5
Minji Park [Wed, 23 Nov 2016 10:53:28 +0000 (19:53 +0900)]
[IOT-1593] TLS ports and CA_SECURE flag added for secure socket accept

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

Change-Id: Ib409e069869c52e10f1bd99d35cd6f94ab90fff2
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14667
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
12 months agosqlite: Use in needed cases (RD and Secured) only 17/14817/3
Philippe Coval [Fri, 25 Nov 2016 16:08:20 +0000 (17:08 +0100)]
sqlite: Use in needed cases (RD and Secured) only

Today, only a few modules are using it:
* resource-directory (in Server mode)
* provisioning

Bug: https://jira.iotivity.org/browse/IOT-1296
Change-Id: I918c17820f78fe222d2410cdf7a820ef8f0b579d
Origin: https://gerrit.iotivity.org/gerrit/#/c/14819/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14817
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months ago[IOT-1604] Fix cloud routing code 81/14781/5
Jung Seungho [Fri, 25 Nov 2016 05:58:59 +0000 (14:58 +0900)]
[IOT-1604] Fix cloud routing code

- Fix on do GET request to discovered resource server.
- changed DiResource to RouteResource
- code clean up

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

Change-Id: If1ccc98bb4d8e288d5264d1cadaf540ef0ca4794
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14781
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
12 months ago[IOT-1601]Adding logic to validate oxmsel updating 55/14755/5
js126.lee [Thu, 24 Nov 2016 11:19:16 +0000 (20:19 +0900)]
[IOT-1601]Adding logic to validate oxmsel updating

Oxms should be considered at updating oxmsel.
Oxm should be read-only.

Patch 1: Init patch
Patch 2: Rebase
Patch 3: If owned=Ture, validate oxmsel is omitted for CTT testing
Patch 4: Revert file permission to 644

Don't merge this patch because need to confirm an operation in case of owned=True

Change-Id: I57fbd6a65db9a8d4400934e11ec40cc4c8e96051
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14755
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months ago[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP 51/14351/7
Joonghwan Lee [Tue, 15 Nov 2016 08:25:49 +0000 (17:25 +0900)]
[IOT-1548] Fix to transfer a large size of data on CoAPs over TCP

Fixed sending/receiving for large size of data which is bigger than 16kbytes on TLS.

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

*Notice : This patchset necessarily requires https://gerrit.iotivity.org/gerrit/#/c/14325/.

Change-Id: I1921d1d2d9d18acb921f093136457120ac862a2c
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14351
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agombedtls: Add missing -b in message 95/14795/2
Philippe Coval [Fri, 25 Nov 2016 10:57:33 +0000 (11:57 +0100)]
mbedtls: Add missing -b in message

Change-Id: I4b7c05a4b1daa4a2143d0e09c3e75e22e07799b5
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/14795
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Nivedita Singhvi <niveditasinghvi@gmail.com>
12 months agoAdd deviceid in device payload 87/14787/12
Habib Virji [Fri, 25 Nov 2016 08:28:38 +0000 (08:28 +0000)]
Add deviceid in device payload

Add missing deviceId in the payload.

Change-Id: I5b7950e1d9e9845a79fc123559e3f9fab76da21a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14787
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoModified the usage of the u_arraylist_remove() 61/14661/4
Jaehong Jo [Wed, 23 Nov 2016 10:36:30 +0000 (19:36 +0900)]
Modified the usage of the u_arraylist_remove()

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

Change-Id: If5ee7157cbf1536b3cafdd9885a8533c91aef505
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14661
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
12 months agoCloudProvisioningClient Signout bug fixed. updated to call new api 43/14743/4
Sunil Kumar K R [Thu, 24 Nov 2016 09:40:21 +0000 (15:10 +0530)]
CloudProvisioningClient Signout bug fixed. updated to call new api

Change-Id: I26f60b5ec04583907170ea7c49796b58003e5120
Signed-off-by: Sunil Kumar K R <sunil.k14@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14743
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: Randeep Singh <randeep.s@samsung.com>
12 months ago[IoT-1603] Restrict unittest with SECURED mode 83/14783/2
cc [Fri, 25 Nov 2016 07:39:49 +0000 (16:39 +0900)]
[IoT-1603] Restrict unittest with SECURED mode

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

Change-Id: I02ebfbc8f3afdd2b06d66b87976773fcdc37b030
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14783
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
12 months agofix: messageID for coap over TCP always is null 11/14511/5
Oleksandr Dmytrenko [Fri, 18 Nov 2016 13:25:14 +0000 (15:25 +0200)]
fix: messageID for coap over TCP always is null

Change-Id: Iaf883a1a63a3b221bbcfe9f13bb4856d676de9fe
Signed-off-by: Oleksandr Dmytrenko <o.dmytrenko@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14511
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
12 months agoCTT1.2.2: changed requestHandle value to a request ID 61/14761/5
jihwanseo [Thu, 24 Nov 2016 06:41:14 +0000 (15:41 +0900)]
CTT1.2.2: changed requestHandle value to a request ID

When a request message is delivered to resource server, the address value
of serverRequest get passed as a requestHandle to the application.
However, when duplicated messages are delivered and the application is
doing slow-response on entityHandler, the later messages could have a
invalid address value, which is requestHandle, since the original
serverRequest would be deleted by responding to the first one.

So I made a unique ID for each request message and replace the requestHandle
with it.

Change-Id: I164bfeaea51be863715f7ced60c40b1f16dafdfc
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14761
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
12 months agoMerge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel
uzchoi [Fri, 25 Nov 2016 00:57:39 +0000 (09:57 +0900)]
Merge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel

12 months agobuild: Suggest to download supported tinycbor 63/14763/3
Philippe Coval [Thu, 24 Nov 2016 16:47:25 +0000 (17:47 +0100)]
build: Suggest to download supported tinycbor

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.

Bug: https://jira.iotivity.org/browse/IOT-1600
Change-Id: I361a75fa9dd52739dce0daa8e14333c95e6c9284
Origin: https://gerrit.iotivity.org/gerrit/#/c/14763/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14763
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
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 agoMerge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel
uzchoi [Thu, 24 Nov 2016 08:21:56 +0000 (17:21 +0900)]
Merge branch '1.2-rel' of ssh://gerrit.iotivity.org:29418/iotivity into 1.2-rel

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>