Uze Choi [Mon, 25 Jul 2016 01:08:44 +0000 (01:08 +0000)]
Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup
Jihun Ha [Fri, 22 Jul 2016 05:49:43 +0000 (14:49 +0900)]
Change resource URIs of easy setup resources
OCF spec describes a rule of URI naming: oic or ocf words should not be in
a URI string unless a URI is also standardized.
Change-Id: I2314b614520b97aa82fd5d8778d9e0cb7fb36984
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9595
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Sun, 24 Jul 2016 12:30:03 +0000 (21:30 +0900)]
Merge branch 'master' into extended-easysetup
Conflicts:
service/easy-setup/mediator/csdk/src/provisioning.cpp
service/easy-setup/mediator/csdk/src/provisioningapi.cpp
service/easy-setup/mediator/csdk/src/wifiprovisioning.cpp
Change-Id: I80e0b7917869577e0716516fa95d9c21c7290cc7
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Jaehong Jo [Fri, 22 Jul 2016 00:48:57 +0000 (09:48 +0900)]
Added the OCStackResult code related 'RESOURCE_CHANGED' in OCToCAStackResult
after merge https://gerrit.iotivity.org/gerrit/#/c/9287/
Change-Id: I5884776ce80c7550869e79b6a69c7c042f96db77
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Mon, 27 Jun 2016 23:39:32 +0000 (08:39 +0900)]
Added MessageQueue(CoAP over MQ) API about Cloud Client side.
- all APIs related MQ is called from OCResource.
(MQ Broker and Topic is handled as Resource)
- MQ publisher can use publishMQTopic API
- MQ subscriber can use subscribeMQTopic / unsubscribeMQTopic
/ requestMQPublish API
- All MQ type can use discoveryMQTopics / createMQTopic API
- publish message is sent with POST base on OCF spec
- createTopic message is sent with PUT base on OCF spec
- discoveryMQTopics / createMQTopic API is implemented through new path
of wrapper class. because their callbacks is different with others
- Local MQ(D2D) is not support. it means there is no local MQ broker for D2D scenario
- refer : https://wiki.iotivity.org/message_queue_mq_for_publish-subscribe_interactions
Change-Id: Ibc1556a389f408634832149f646cd65bf8eda154
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8975
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>
ljsachs [Tue, 19 Jul 2016 19:14:09 +0000 (12:14 -0700)]
[IOT-1196] MAX_QUERY_LENGTH is too short
Increase MAX_QUERY_LENGTH to 256.
Use #define MAX_QUERY_LENGTH in sample code.
Change-Id: Idfc74db1a18af26b2ff5811dac86585ae2b48f9c
Signed-off-by: ljsachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jihun Ha [Thu, 21 Jul 2016 06:12:10 +0000 (15:12 +0900)]
Update a mediator sample application for linux platform
Sample application of mediator for linux is updated along with
Mediator SDK update.
Additionally, logics for handling error code are updated.
Change-Id: I9bae277def11b19644ade50b322e3ba5d7495a3e
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9517
Reviewed-by: Hemant Mahsky <h.mahsky@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Abhishek Sharma [Thu, 21 Jul 2016 12:27:20 +0000 (17:57 +0530)]
Fixed build error for Arduino Mega
Change-Id: Ie7ad30627d0bf9b8a6e99d36fc9e6064da48e566
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Pandey [Thu, 21 Jul 2016 09:19:45 +0000 (14:49 +0530)]
Bug Fix for constructing RCSRepresentation from OCRepresentation.
When constructing RCSRepresentation object from OCRepresentation object
received from base layer, fromOCRepresentation() function does not attempt
to convert child representation objects in OCRepresentation object it receives
as input parameter.
This patch fixes this issue by adding code to iterate over child objects in
OCRepresentation and constructing an equivalent RCSRepresentation for them
recursively.
Change-Id: Ie9c3f6cfaebeb4ceb1c23a07647458414fef3afc
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9547
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Pandey [Thu, 21 Jul 2016 10:00:11 +0000 (15:30 +0530)]
Fixed bug during CacheID generation in resource encapsulation.
On calling startCaching API [RCSRemoteResourceObject.h] for different resources
one after another it is generating the same CacheID.
If we call the API at 1 second delay it is working fine; but it's better to use
a more accurate random generator. OCGetRandom() function provided by CSDK
seems to be more accurate here as it seeds each byte separately.
In this patch we have replaced rand() call with OCGetRandom().
This solves the problem in our test environment and generates unique random
numbers each time which can be used as Cache IDs.
Change-Id: I52858d6b6d149ec23df39920d8a767dd08d67d69
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9549
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Junghyun Oh <junghyun.oh@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
hyuna0213.jo [Thu, 21 Jul 2016 04:26:01 +0000 (13:26 +0900)]
removed defects detected by static analysis tool for linux
- initialize some variables
- adjusted code style
- modified unreached code
Change-Id: I88a5a3d097c7d7c755c06a7b33508050bcb35591
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8555
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaewook Jung [Wed, 20 Jul 2016 01:02:24 +0000 (10:02 +0900)]
modifed MAX_ADDR_STR_SIZE value
Change-Id: Ib7c5f074755a043fc9993a5f9067995fe31edb43
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Tue, 21 Jun 2016 22:29:43 +0000 (15:29 -0700)]
Use monotonic clock source for Windows in oic_time
Amend documentation of OICGetCurrentTime() function.
We must replace our GetSystemTimeAsFileTime API call because system
time updates should not impact our calculations. We should assume that
system time can change during the runtime of our programs.
Change-Id: I49246a243435f8b0b2bf7a77fcb31378dc921daf
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9333
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Wed, 13 Jul 2016 07:53:56 +0000 (16:53 +0900)]
RD Device Presence features in base layer
- make consistent with the revised RD spec.
- add the RD Device Presence API in base layer.
1. subscribe DevicePresence to resource-directory
Change-Id: Ic6635474efdd5797f41e9d8dcdb867747c93f9eb
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jaewook Jung [Thu, 16 Jun 2016 11:51:46 +0000 (20:51 +0900)]
Added Cloud-connector API in base layer for account server
added APIs to support functions about account authorization
: Sign-up, Sign-in, Sign-out, Refresh Access token
one existing build option is used to inlude APIs
: WITH_CLOUD
and it is not supported on client mode for now
since device id is not generated on client mode (JIRA-1184)
Change-Id: Iefdf52545580efa4c533ff77137bce6c779bcaba
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jung Seungho [Wed, 20 Jul 2016 08:21:00 +0000 (17:21 +0900)]
Modified maven config pom files in stack and interface.
Change-Id: Ie7edd3c0db4d8504b9b1a000dd7d152eb2b3bda4
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
jihwan.seo [Mon, 4 Jul 2016 07:06:37 +0000 (16:06 +0900)]
To Enable property value for MQ Publisher/Subscriber
client will be awared whether Resource can be supported
as MQ Publisher/Subscriber by Build Option 'WITH_MQ'
Change-Id: Id9d4db5c1d048d3fc9895ded6f0bfbf7bfbd45a8
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jongmin Choi [Thu, 23 Jun 2016 06:46:27 +0000 (15:46 +0900)]
Remote Reset
Create Reset Profile and Remote Reset by Provisioning Tool
Patch #2: Changes according to Ashwini's Comments
Patch #3: RemoveACE prototype added to header file
Change-Id: I6f4c443e8b54c5e0640da868cf7f2c5fbd4db78d
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8915
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Jihun Ha [Tue, 19 Jul 2016 04:44:04 +0000 (13:44 +0900)]
Add server ID property in cloud server resource
Server ID property in cloud server resource is added.
Change-Id: I830a39655e269aa157ca4d6c301d594c1ca13c63
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Wed, 20 Jul 2016 02:11:15 +0000 (11:11 +0900)]
Merge branch 'master' into extended-easysetup
Change-Id: Id4f075735ddb50b549d4342e6f03af3ca8889083
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Jihun Ha [Tue, 19 Jul 2016 10:15:54 +0000 (19:15 +0900)]
Add API description for javadoc and update nativeCreateRemoteEnrollee API
1. For Android APIs for easy setup, their descriptions for JAVADOC are added.
2. Modify nativeCreateRemoteEnrollee API which has an OcResource object
as a parameter.
Change-Id: I1f3cb3403383e140386a46218516f6dac3eaee55
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9443
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jee Hyeok Kim [Wed, 20 Jul 2016 00:27:51 +0000 (00:27 +0000)]
Merge "Merge branch 'cloud-interface'"
David Antler [Sun, 17 Jul 2016 01:03:16 +0000 (18:03 -0700)]
Correct encoding of ZoneIDs in URIs, as per RFC 6874
IoTivity already included the ZoneID in the URI when the
IPv6 socket address included that information, but failed
to properly encode the percent sign.
Change-Id: I3e1c5b0a267236b1187303430d1dd4f115d1332a
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9419
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jee Hyeok Kim [Tue, 19 Jul 2016 13:21:09 +0000 (22:21 +0900)]
Merge branch 'cloud-interface'
Change-Id: If8209d2318a6541104b46b4985239a8bd70388ad
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Jee Hyeok Kim [Mon, 4 Jul 2016 10:46:51 +0000 (19:46 +0900)]
Implements OIC/OCF resource models for cloud.
1. Project restructured (API Naming, Callbacks and File location).
2. Add Message Queue implementation (IETF Proposal).
3. OAuth2 authcode, accesstoken, refreshtoken based authentication support.
4. Resource Directory implementation, follows latest OIC Spec.
Change-Id: I036a9d1d54b09dc995f36f8b93029fa149963744
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Ziran Sun [Mon, 18 Jul 2016 09:22:13 +0000 (10:22 +0100)]
Add OC_STACK_RESOURCE_CHANGED result code support in sample code.
Change-Id: I6f20554cb020c3723d5704f4c9c6219c25a0f5a1
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9433
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Chul Lee [Tue, 19 Jul 2016 12:20:45 +0000 (21:20 +0900)]
Update security module according to ocstack update
in order to guarantee OTM success.
1. Change the response check condition about POST request.
2. Prevent restore of doxm,pstat in case of owned status and retransmission.
Change-Id: I69d2b3e497517373add683e7765b3521422e329b
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9465
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Tested-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Mon, 18 Jul 2016 18:25:05 +0000 (11:25 -0700)]
Fix object directory for c_common/windows
Prior to this change, resource/c_common/windows/*.obj files were not
being created in VariantDir.
Change-Id: Ib0b59bc9adf575f3e76e0f6c7802ca0ca2ca9c3e
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9445
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Anisha Aggarwal <anisha.aggarwal@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Fri, 15 Jul 2016 06:26:58 +0000 (15:26 +0900)]
modified some params of connection state callback method of Android.
it needs to modify some params
after merge https://gerrit.iotivity.org/gerrit/#/c/9209/
Change-Id: I919acba1dde939921a9cd645d44942011d68231e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9411
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Fri, 8 Jul 2016 05:24:55 +0000 (14:24 +0900)]
Refactored Connectivity Abstraction code
- delete unnecessary code
- add new unit test case
- adjusted code style
- fix memory free issue
Change-Id: If12f5ca8e8d03af3da92f33b655c8618946c8a6c
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9235
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jihun Ha [Fri, 15 Jul 2016 01:28:20 +0000 (10:28 +0900)]
Update a resource type of easy setup resources
Easy setup resources should use a "ocf.wk" surfix in their resource types.
For example, ocf.wk.prov and ocf.wk.wifi are right.
Additionally, a state of connecting to enroller is added as a provisioning state
Change-Id: I6e92bf44c4239fb1e17e70d691360fa12734c05f
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Mon, 18 Jul 2016 12:53:07 +0000 (21:53 +0900)]
[Update] change Api desgin and modify function & data structure naming issue.
- Add comments for doxygen
- Initailize step logic change
chage the logic for user can select target device.
createRemoteEnrollee() -> createRemoteEnrollee(OC::OCResource* )
initRemoteEnrollee() -> deleted
- callback function signature change
setXXX(), startXXX(Callback) -> startXXX( setdata, Callback)
- modify function's name
requsetPropertyData -> getConfiguration
startSecurityProvisioning -> configureSecurity
startDataProvisioning -> provisionDeviceProperties
startCloudProvisioning -> provisionCloudProperties
- modify datastructure's name
propertyData -> EnrolleeConf
NetworkInfo -> WiFiConfig
DeviceProvInfo -> DeviceProp
CloudInfo -> CloudProp
Change-Id: I084cbb821ba26b303aaebbcab96da2fc52fe8429
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
G S Senthil Kumar [Fri, 15 Jul 2016 13:46:06 +0000 (19:16 +0530)]
Updated InProcClientWrapper to handle OC_STACK_RESOURCE_CHANGED error code.
OC_STACK_RESOURCE_CHANGED will be sent in the response for POST requests.
This should also be considered as a success response for POST.
Change-Id: I1b8bc97ab5df21cbf06c1cbb9fd43b38d1730379
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9415
Reviewed-by: Harish Marappa <h.marappa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
(cherry picked from commit
494e3cd9ae0716830b031da8e2b2f0dd08dc49eb)
Reviewed-on: https://gerrit.iotivity.org/gerrit/9429
jihwan.seo [Fri, 15 Jul 2016 06:12:53 +0000 (15:12 +0900)]
Added the return code related 'RESOURCE_CHANGED' in OCException
there was no code in OCException and Android
after merge https://gerrit.iotivity.org/gerrit/#/c/9287/
Change-Id: Ifcf28f739b106ce8ddb2e5ab162bef935c526852
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9409
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Habib Virji [Mon, 4 Jul 2016 16:04:26 +0000 (17:04 +0100)]
RD Payload memory handling
By default 255 bytes of memory is allocated for the payload, when it need
extra amount of memory, cbor library provides a size member that keeps incrementing
but no memory is allocated or written.
In case of failure this value is passed to the ocpayloadconvert.c, which allocates
the right size and calls the conversion function again. It is necessary to allow the
code to get the right size.
Change-Id: I92202a91780fcf01d4ff8fea0a3c194ac5a42e83
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9145
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
uzchoi [Mon, 18 Jul 2016 02:36:12 +0000 (11:36 +0900)]
Merge remote-tracking branch 'origin/master' into extended-easysetup
Conflicts:
service/easy-setup/mediator/richsdk/src/RemoteEnrolleeResource.cpp
Change-Id: I2868246122ea799fd75111f439ed1f410f950592
Daniel Ferguson [Thu, 14 Jul 2016 20:51:25 +0000 (13:51 -0700)]
Fixed conditional logging output in Routing lib
Change-Id: I5e295a016cbf7840265c92dea15ff5e9de5992b1
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
George Nash [Tue, 28 Jun 2016 00:51:18 +0000 (17:51 -0700)]
Clean up unused-parameter warnings
Commented out the unused parameters to prevent the -Wunused-parameter
in warning in callback functions.
For parameters that are only used in DEBUG mode the OC_UNUSED micro
is used to prevent the unused-parameter waring for the release build.
Change-Id: I72f497b15c95ddd9879bc9b92f97a66259c7e074
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8979
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
George Nash [Tue, 28 Jun 2016 00:09:36 +0000 (17:09 -0700)]
Cleaned up type-limits compiler warning
pdu.c [-Wtype-limites] the comparison was always true due
to the range of data types.
Change-Id: If7981691218a3eece4da1941d5d5679266c401a9
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8977
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Daniel Ferguson [Wed, 6 Jul 2016 17:58:13 +0000 (10:58 -0700)]
Fix warnings in caipserver.c
Change-Id: Ibda0f4201d7127043fa66d3d39df6f421f8f7caa
Signed-off-by: Daniel Ferguson <daniel.j.ferguson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9199
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Fri, 8 Jul 2016 06:53:52 +0000 (15:53 +0900)]
Parsing about a payload including resource information of multiple devices
Assuming the siatuation that many servers published their resource information into resource directory(RD),
then the RD will send response including multiple device information for the discovery request by resouce type.
That means a response payload will be comprised of multiple device list including resource information.
But now, the resource client can parse only the first device's resource information..
There is the payload I tested as follow
[
{ di=
717111ce-31c1-47a0-81a1-3e39eca,
links=[
{href=/q/resource_foo1, rt=core.foo, if=oic.if.baseline, p={bm=1}},
{href=/q/resource_foo2, rt=core.foo, if=oic.if.baseline, p={bm=1}}
]
},
{ di=
a7b77e75-e6d5-4158-af16-3a4dd95,
links=[
{href=/q/resource_foo1, rt=core.foo, if=oic.if.baseline, p={bm=1}},
{href=/q/resource_foo2, rt=core.foo, if=oic.if.baseline, p={bm=1}}
]
}
]
Change-Id: Ic1f58c473ab91a497508b2425a4ad07692120054
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Thu, 14 Jul 2016 10:36:23 +0000 (19:36 +0900)]
Add success of 'OC_STACK_RESOURCE_CHANGED' return code.
Refer to https://gerrit.iotivity.org/gerrit/#/c/9287/
Change-Id: I65682364bcf91b40e28a31006993e9d8dc90e7af
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9391
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Tue, 12 Jul 2016 22:26:52 +0000 (15:26 -0700)]
Speed up run.bat execution
Running the Visual Studio scripts can take some time, so only execute
them in a "run build" scenario.
Change-Id: I96b05072a133e124161af1c969b4ab3c5cd05aba
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9335
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Ziran Sun [Mon, 11 Jul 2016 13:38:00 +0000 (14:38 +0100)]
Add support of 'OC_STACK_RESOURCE_CHANGED' return code.
This is to map 'UPDATE' or 'CHANGED' code in coap.
JIRA Issue: https://jira.iotivity.org/browse/IOT-1191
Change-Id: Ic5b426cbb1560a989305a600070a77dbe90f01e1
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9287
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jihun Ha [Wed, 13 Jul 2016 08:12:30 +0000 (17:12 +0900)]
Fix an faulty logic in resource handler and clean up useless codes
1. In resourcehandler, a logic of encoding array type's property is fixed.
2. Remove a useless logic to send a GET request before a POST request for
update of WiFi and devConf properties in EnroleeResource
3. Change country property's key --> ctry
4. Clean up old structure and enum variable not used anymore.
5. Remove a csdk for mediator which is not used anymore
Change-Id: I7502e6b33860db1bcc91a67829ac9411ff9cae6d
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9241
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
uzchoi [Thu, 14 Jul 2016 00:52:17 +0000 (09:52 +0900)]
Master branch merge for VS build success
Change-Id: I7f7bb5e139bc6e3955fb7291ce8f1ea66b28510f
vimala.v [Tue, 28 Jun 2016 11:23:49 +0000 (16:53 +0530)]
[ARDUINO] Resolved build error for WITH_TCP=TRUE
Change-Id: I46e116467d30b48c54d4ff51303edad95c9748a7
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8995
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
bg.chun [Fri, 8 Jul 2016 01:55:19 +0000 (10:55 +0900)]
Change as do not set CONTENT_FORMAT OPT when server response without payload.
On current impl server add CONTENT_FORMAT OPT when response to client, if CONTENT_FORMAT setted on client request.
even payload is not exist on server response.
So, change it as check payload is exist on response before put CONTENT_FORMAT.
Reported-by: byonggon chun
Change-Id: Iced9952adb55304440089c32d658359a67f1dcd5
Signed-off-by: bg.chun <bg.chun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9233
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: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Wed, 13 Jul 2016 01:17:23 +0000 (10:17 +0900)]
fixed pthread build issue on linux platform
resolved the build issue caused by merge of
https://gerrit.iotivity.org/gerrit/#/c/249/
Change-Id: I4936c07340658d455491f9e90d66b734e9a59e97
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
vimala.v [Wed, 13 Jul 2016 06:21:09 +0000 (11:51 +0530)]
[JIRA 1190] Added null checks in Tizen BLE adapter
Change-Id: Id1f81a1220af86cf2fab015530246e3485a0cb6d
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9349
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Mon, 11 Jul 2016 23:39:45 +0000 (16:39 -0700)]
Remove all free'd sessions from retransmission
Change-Id: Ibeec77ccfab5200aa3787d29e1320ad22c654568
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9297
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Habib Virji [Tue, 12 Jul 2016 11:11:12 +0000 (12:11 +0100)]
Fix GET ocresource response for /oic/d
If an application does not set oic.wk.d, set in savedDeviceInfo to get proper response for GET message.
Change-Id: I028b821ffe29b467d0ecc2add9a7a6ebfff5e72d
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9309
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dwarkaprasad Dayama <dwarka.dayama@samsung.com>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Heewon Park [Tue, 12 Jul 2016 08:17:48 +0000 (17:17 +0900)]
implement Android sample App for mediator.
Follow the below steps.
1. Discover an enrollee in a network (e.g. Soft AP network)
2. Do Security provisioning (if needed)
3. Get a device default property
4. Do WiFi and device configuration provisioning
5. Discover an enrollee again and do cloud server provisioning
Change-Id: I1c1dde47b4b73aa4a6eacc6dc1a354e4a72911ce
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
hyuna0213.jo [Thu, 7 Jul 2016 09:28:35 +0000 (18:28 +0900)]
Changed CAConnectionStateChangedCB param to take endpoint info.
CAConnectionStateChangedCB parameter was changed from adapter,
address to CAEndpoint_t.
Change-Id: Ia4e31ad848c9eddd38b4788295841c908c65dda6
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9209
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Sat, 9 Jul 2016 17:31:09 +0000 (19:31 +0200)]
Build: add gtest libs automatically
Once gtest's sconfile is imported, build flags are propagated.
Deeper cleanup and effort to make tests less linux specific
by avoiding to add gtest's pthread dependencies
in sub scons files.
Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: I4ddbf3e1eef8648ceaeae6c62175308cb6f3fec1
Origin: https://github.com/tizenteam/iotivity/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Jaehong Jo [Fri, 8 Jul 2016 06:31:56 +0000 (15:31 +0900)]
Changed Tizen 2.4 gatt API
int bt_gatt_server_notify(bt_gatt_h characteristic, bool need_confirm,
bt_gatt_server_notification_sent_cb callback, void *user_data);
Change-Id: I911475002d907efee06b0a6b40144047a49793d9
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9243
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Thu, 7 Jul 2016 23:13:59 +0000 (16:13 -0700)]
Fix data alignment issue in tinydtls session_t
Detected a data alignment bug on Windows. The offset of the .addr union
is different in session_t vs stCADtlsAddrInfo_t. With this fix,
SimpleServer should not crash when built in secured mode. Without this
fix, an exception will occur in dtls_security_params_epoch().
Verified structure accuracy on VS2015 using cdb.exe. Prior to this patch,
session_t.addr was at +4 and stCADtlsAddrInfo_t.addr was at +8.
Change-Id: I07439b19fe08474dbf0d46a315dfd5b7355c1bdc
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9227
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
hyuna0213.jo [Fri, 1 Jul 2016 06:03:08 +0000 (15:03 +0900)]
Implement missing unit tests for ulinklist
Added unit test cases for ulinklist api
Change-Id: I06a0c4ed55c840e049c04dfdde20e7c9fd70b861
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9065
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Tue, 31 May 2016 10:45:21 +0000 (19:45 +0900)]
added error callback listener in FindResource for Android
Change-Id: Ib55a77d29e52fb6a73ffc459f1c28f8dae184dfb
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8249
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: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: MyeongGi Jeong <myeong.jeong@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Mon, 11 Jul 2016 07:31:28 +0000 (16:31 +0900)]
replaced comments related connectivity type with new comments
OC_WIFI, OC_ETHERNET, OC_ALL is previous param.
and so many people is confusing to set the param.
Change-Id: I59038fff753e8d9e47778eb928cdd01ee77cb466
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
jihwan.seo [Thu, 30 Jun 2016 06:14:09 +0000 (15:14 +0900)]
removed to set discoveralbe mode related BR/EDR in BLE monitoring.
bt_adapter_set_visibility() is only for BR/EDR.
it is not related to BLE.
Change-Id: Iaa29052341aa4f0e840a8f8ca7f6cc6d6673996d
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9045
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Fri, 22 Jan 2016 15:37:04 +0000 (16:37 +0100)]
OICSensorBoard: install example and improve configuration
Origin: https://gerrit.iotivity.org/gerrit/#/c/4743/
Change-Id: I7b434e45226d78dc4b69a8b9296b6d9d77d89189
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5365
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Fri, 8 Jul 2016 10:42:34 +0000 (12:42 +0200)]
Build: Add thread.scons to propagate pthread if needed
Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: I9dc39c758607df6f54910aa233a7401c1be2390f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9253
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Sat, 2 Jul 2016 00:33:47 +0000 (02:33 +0200)]
Build: reworked unit tests to use gtest in a more generic way
The benefit of this change is to keep most gtest related configuration
in a single file and avoid to duplicate paths in sub sconfiles.
For portability concern "os.path.join" is preferred
to appending unix paths.
Some libs are reordered and some cleanup was done.
Let's also remove hardcoded pathes, as there is not guarantee
that the files will remain at the same place in all configurations.
Problem was observed when crossbuilding with Yocto distro
with security checks enabled (LfAgl).
More refactoring and deeper cleanup might come in later patch.
Change-Id: Ia13ee8c03f65f3407e88ff21d51b292261c9f2a3
Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Origin: https://github.com/tizenteam/iotivity/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Tue, 7 Jun 2016 21:44:28 +0000 (23:44 +0200)]
Build: set verbose output for scons
Can be tuned from user's shell with scon VERBOSE env variable.
Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: Ide8235c24ca54c53b57c7a54b716dc28b2425c08
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8545
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Heewon Park [Fri, 8 Jul 2016 07:42:45 +0000 (16:42 +0900)]
refectoring easysetup Android API.
- Add some files for RequestPropertyData, DataProvisioning, SecurityProvisioning.
- Delete unused files.(old feature class)
Change-Id: Icc0eb21d0a63310f38b331e2166b55998fa24c25
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9115
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
uzchoi [Mon, 11 Jul 2016 02:54:47 +0000 (11:54 +0900)]
Merge branch 'master' into extended-easysetup
Change-Id: Ifad200718955d1f1382178e72c36866b538af622
Philippe Coval [Mon, 4 Jul 2016 11:58:15 +0000 (13:58 +0200)]
Build: disable shared library of gtest as suggested
As suggested by Jon A. Cruz "
"GTest in general is more focused away from the shared.
System-wide pre-compiled shared libs were deprecated a while back.
Sets of programs built at the same time *might* be OK
with a local shared version,
but static linkage makes it safer."
So this patch explicitly disable dynamic library of gtest,
it can be reverted on trouble as there is no "hard requirement" for it.
For the record, I came to this once I noticed
that using default shared library
caused troubles on some Yocto distros (LfAgl) :
relocation R_X86_64_PC32 \
against undefined hidden symbol
`__init_array_start'
can not be used ...
I suspect this problem is not related to gtest or iotivity.
Bug: https://jira.iotivity.org/browse/IOT-863
Bug-AGL: https://jira.automotivelinux.org/browse/SPEC-158
Change-Id: I9e4798aa3a579020255e8f53a8da8926dc4dee4f
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9147
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Mon, 19 Jan 2015 15:01:37 +0000 (16:01 +0100)]
packaging: gbs: use git tags from upstream
Change-Id: I3875e3761e982dd0d7af7ad8c40f37ff610e4857
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/248
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Philippe Coval [Fri, 1 Jul 2016 21:45:20 +0000 (23:45 +0200)]
tizen: Bump to 1.1.1
Change-Id: I0a5a0ba9c8d1f82af01e7ed9bae54209af67e582
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mats Wichmann <mats@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Joseph Morrow [Sat, 2 Jul 2016 23:33:39 +0000 (16:33 -0700)]
Fixed issue where "oic.wk.d" was removed from array of device types.
Change-Id: I54ee75be4e7bbb9ce4de2b656dabff4c6386d58f
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Ziran Sun [Tue, 5 Jul 2016 15:17:30 +0000 (16:17 +0100)]
For some reason, changes in ocserverrequest.c in
https://gerrit.iotivity.org/gerrit/#/c/8815/
was not picked up when merging. This patch added
the missed line back in.
JIRA issue: https://jira.iotivity.org/browse/IOT-1122
Change-Id: I3ac7bf447a66971e7ae05eade5a18d8afc344137
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9183
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jaehong Jo [Thu, 7 Jul 2016 12:47:53 +0000 (21:47 +0900)]
[IOT-1185] Add OCResultToSuccess to ensure success.
If just check only OC_STACK_OK, it can cause problems.
Below value is success like OC_STACK_OK.
OC_STACK_RESOURCE_CREATED,
OC_STACK_RESOURCE_DELETED,
OC_STACK_CONTINUE.
BUG : https://jira.iotivity.org/browse/IOT-1185
Change-Id: I60b369138df00b98c4dbeb952ffba140aa902b27
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9217
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Chul Lee [Thu, 7 Jul 2016 14:52:52 +0000 (23:52 +0900)]
Change the name of dpc property of doxm to the vendor-defined name
Apply a patch to change the name of "dpc" property of doxm resouce to "x.com.samsung.dpc" as the vendor-defined name.
Patch #1: Initial patch
Patch #2: Fix unittest on CredResource in windows machine
Patch #3: Rebase and fix minor bugs.
Patch #4: Fix minor bug in unittest.
Patch #5: Remove the printf().
Change-Id: I8c9dd0483e090ceb00ed3d7208d9ca1f3897e432
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9197
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Hauke Mehrtens [Mon, 4 Jul 2016 16:51:44 +0000 (18:51 +0200)]
update version number to 1.1.1
The next release is version 1.1.1, change the version number.
Change-Id: I0e74f5a919574c0f9730eb623117a548e8ffcd53
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
leechul [Fri, 20 May 2016 00:41:00 +0000 (09:41 +0900)]
Update ACL data-structure based on RAML spec.
1. Change the OicSecAcl_t according to RAML spec
2. Add OicSecAce_t according to RAML spec
3. Update ACL realted modules(PolicyEngine, DirectPairing, json2cbor)
4. Update unit-test and samples
[Patch 13] Retrigger
[Patch 14] Update 'if' and 'rt' property as array according to core spec.
* Security RAML spec should be updated.
[Patch 15-16] Remove the compile error for arduino.
[Patch 17-18] Remove the cimpile error for arduino and windows.
[Patch 19] Update missed SVR DB.
Change-Id: I7a213ff0843020324a408dd1ceded31b01affa54
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8241
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
js126.lee [Tue, 5 Jul 2016 08:04:46 +0000 (17:04 +0900)]
[IOT-1179] Adding rt and if into response of Get request to doxm and pstat
Issue: Response of GET request to /oic/sec/doxm resource has problem(no "rt" and "if" property)
Per the core spec, every Resource shall have both rt and if.
Solution : Adding rt and if into response payload of Get request to doxm and pstat
Patch1,2 : Apply patch
Patch 3,4,5: Apply dongik's review
Change-Id: I6f9ad75194f9baa6c9dda25f742e38b790cd6cb7
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9167
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Tue, 5 Jul 2016 16:46:08 +0000 (18:46 +0200)]
Build: Bump version to 1.1.1
To generate correct iotivity.pc
Bug: https://jira.iotivity.org/browse/IOT-1117
Change-Id: I9e671c151044c3336edc576b2ee5f093872c2027
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Hauke Mehrtens [Fri, 15 Jan 2016 23:03:24 +0000 (00:03 +0100)]
zigbee_wrapper: fix format string
use correct type for variable called result.
Change-Id: I9029b4150f9b5cab3cb2d41a50314c5747f45a39
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/4897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
hyuna0213.jo [Mon, 4 Jul 2016 04:54:32 +0000 (13:54 +0900)]
Fix tcp adapter build issue related to CAEndpoint_t
resolved the build issue caused by merge of
https://gerrit.iotivity.org/gerrit/#/c/8441/
Change-Id: If0caf9d116440025c60ae6ee019890947ceebe3d
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Todd Malsbary [Tue, 21 Jun 2016 17:03:52 +0000 (10:03 -0700)]
[IOT-1152] Clear static global data in OCStop.
This prevents subsequent calls to OCInit or OCStop from referencing
freed memory.
Change-Id: I9a20b72582920b5767c7617680b3b665093576b0
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8819
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
js126.lee [Tue, 5 Jul 2016 06:10:18 +0000 (15:10 +0900)]
Change request method to POST on updating cred in OTM
the issue is that the /cred resource will actually exist, just will have no creds in it (empty array).
So this is really an UPDATE, to update the "creds" property of the oic.r.cred resource.
Once CTT has changed to POST on OTM, OC_REST_PUT case will be removed in CredEntityHandler
Patch1: apply patch
Patch2: Add comment
Change-Id: Iaa4b7d72e5855575be1f91b48997ee445941df03
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9161
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Nathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
sy01.youn [Tue, 5 Jul 2016 08:24:48 +0000 (17:24 +0900)]
[Enrollee] Implement ESSetState(), ESSetErrorCode() API & fix ESTerminateEnrollee() API
1. ESSetState(), ESSetErrorCode() API is added in easysetup.c
2. ESTerminate() API logic is changed in resourcehandler.c
3. Variable name of ErrorCode is changed. (ESLastErrCode -> ESErrorCode)
Change-Id: I3be46d75924bff137171b06f102ea74c3634beef
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9143
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Habib Virji [Fri, 1 Jul 2016 14:09:57 +0000 (15:09 +0100)]
[IOT-986] Not send response to multicast message for resource not existing
The resource not existing, it should not return any response for multicast packet.
There was no check for multicast request, this has been added and it does not send
any response.
Also add OC_MULTICAST type in octypes.h.
octypes.h transport flag should correspond to flags set in the CA layer. In the CA
layer (1 << 7), 7 bit is set for Multicast. In the RI layer, the type were differing,
hence was not possible to check if it is multicast packet. Please note the OC_RESERVED1
was not used anywhere and was wrong, it should match the transport flag of the CA layer.
BUG: http://jira.iotivity.org/browse/IOT-1126,
http://jira.iotivity.org/browse/IOT-1107,
http://jira.iotivity.org/browse/IOT-986
Change-Id: Ia8a7d1bdacf4e9a8a8d6cb21c49ad830cce7c3cc
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9073
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mushfiqul Islam <i.mushfiq@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Chul Lee [Wed, 22 Jun 2016 12:19:17 +0000 (21:19 +0900)]
Disable OC_SECURE flag in case of SECURED=0 build.
Change-Id: I53b8a05fc1bc84ea9b32bd8c5c312616b7c3f5c6
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8875
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Chul Lee [Thu, 23 Jun 2016 00:56:49 +0000 (09:56 +0900)]
Prevent the duplicate PIN output in case of retransmission message.
[Patch #1] Initial upload.
Change-Id: I3f69865a5fccaef9775d0200c0afaa7ce7247c20
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8897
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
jihwan.seo [Thu, 23 Jun 2016 05:14:00 +0000 (14:14 +0900)]
replaced previous coap header for BT with 'coap+gatt' and 'coap+rfcomm'
Change-Id: Ic78a27f34d2cc967344c5d7baae76f9a6415942e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Kyungsun Cho [Mon, 4 Jul 2016 08:34:08 +0000 (17:34 +0900)]
Fixed the missed returned_length on |credresource|
Change-Id: I7098520a88c224f62c711917f3db1b139be064bf
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Philippe Coval [Fri, 1 Jul 2016 20:58:37 +0000 (22:58 +0200)]
ocpayload: in DMV remove undesired trailing separator
Also add more tests cases too.
Suggestion for improvements:
Note the test uses a different message container to prevent ambiguity:
same one could be used but accessed at next indice
because MessageContainer::setPayload
actually adds given payload to internal list.
It would makes sense to rename method to MessageContainer::addPayload
and eventually add a new different method like :
MessageContainer::set(Payload) to reset list.
Bug: https://jira.iotivity.org/browse/IOT-1174
Change-Id: I9e7bf3c9eb7a311214e438ec2434d53b4ae0f313
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Joseph Morrow [Sat, 2 Jul 2016 23:17:51 +0000 (16:17 -0700)]
Fix issue where double array was not fetched from CBOR correctly.
Change-Id: I7d7f9ac4fe216d883ddb26d624136d098a8a7a14
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9101
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Jee Hyeok Kim [Mon, 4 Jul 2016 06:31:08 +0000 (15:31 +0900)]
Merge branch 'master' into cloud-interface
Change-Id: I6ee6b3ff0618d4d0881eb1430abd58eaf7641643
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
David Antler [Fri, 1 Jul 2016 21:28:42 +0000 (14:28 -0700)]
Merge branch 'windows-port'
Add support for Visual Studio 2015 and 2013 builds.
Change-Id: I3ce9bee6b3e57ccd548b849b5d147ca0babd872e
Signed-off-by: David Antler <david.a.antler@intel.com>
David Antler [Tue, 28 Jun 2016 21:50:16 +0000 (14:50 -0700)]
Prepare for merge. Improved consistency and style.
* Reformat Windows SConscript to use spaces and add TODO
* Add TODO about most critical warnings to re-enable
* Fix unassigned declarations, use designated initializer when possible
* Fix various spacing and doxygen issues
* Improve consistency of macro definitions in platform_features.h
* Include failure codes on assert conditions for win_sleep.c
Change-Id: I0e88cf2a3fa0ed6e2f8822a6ce0b606a9070af64
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9041
Reviewed-by: Daniel Jay Ferguson <daniel.j.ferguson@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Kyungsun Cho [Fri, 1 Jul 2016 04:49:55 +0000 (13:49 +0900)]
Fixed svase-warnings for iotivity-product's SQA on |credresource|
Change-Id: I48452b2b0e634d2d7b6cf7643ba9a27ede4877e5
Signed-off-by: Kyungsun Cho <goodsun.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Inga Stotland [Wed, 29 Jun 2016 06:15:33 +0000 (23:15 -0700)]
[IOT-1133] Fix size setting for CA URI buffer
Use common define CA_MAX_URI_SIZE instead of hardcoded magic number
Change-Id: I61f6f39d1646166be92775e25419c1749f946c76
Signed-off-by: Inga Stotland <inga.stotland@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9019
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Jongmin Choi [Fri, 24 Jun 2016 09:33:22 +0000 (18:33 +0900)]
Fixed Security Resource Flags and Interface
OCResourceProperty Fixed for Following Security Resources
- doxm: OC_OBSERVABLE Removed
- cred, pstat: changed from OC_RES_PROP_NONE to OC_SECURE
Patch #2: OC_DISCOVERVABLE added to pstat
Patch #4: oic.mi.def removed
Change-Id: I35978a242636754977724045780af0082562b525
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8951
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
David Antler [Tue, 21 Jun 2016 18:52:52 +0000 (11:52 -0700)]
Download boost automatically on Windows
Change-Id: I5782b99f3a84898e5da71de94f19f9b9c7eabb0a
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8821
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
sy01.youn [Thu, 30 Jun 2016 09:02:08 +0000 (18:02 +0900)]
[Enrollee] Implement ESSetDeviceProperty() API
1. Add new data structure & change the name and value of some variables
. ESDefaultProperty Data Structure is added
. ESEnrolleeState value is changed (as spec. specified)
2. ESSetDeviceProperty() API is added in easysetup.c
3. Enrollee Sample App. is changed
. linux based enrollee sample app is changed
: can test ESInitEnrollee() & ESSetDeviceProperty() API
Change-Id: I57b65bae47fa8b34739e42f8265707b8980c4e31
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8961
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Heewon Park [Wed, 29 Jun 2016 05:19:47 +0000 (14:19 +0900)]
Update function name & data struct name in ESRichCommon.h and implement JNI logic for easy-setup process.
- JNI Logic implement(initRemoteEnrollee, RequestPropertyData, DataProvisioning, SecurityProvisioning)
Change-Id: Ic38924573b4c733bfa257b4ddb763f49e8cca00c
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
George Nash [Mon, 27 Jun 2016 16:56:01 +0000 (09:56 -0700)]
Clean up compiler warnings
ocresource.c: (-Wunused-variable)
Fix the waring by moving the tcport inside the #ifdef
amsmgr.c (-Wunused-variable)
b64Ret, outLen, and base64Buff were all local variables that were
unused. They are removed since they are unused.
amaclresource.c (-Wunused-function)
OicSecAmaclCount function is unused anywhere. Since it is unused
it is not being maintained so it was removed.
Change-Id: Ia0327aec1feb484f084b2ce0d6608738ef5f6ad9
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8969
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
projects / contrib / iotivity.git / log