jihwan.seo [Tue, 6 Oct 2015 04:47:13 +0000 (13:47 +0900)]
Modified to check Payload for TCP
to check payload have to contain option data.
Change-Id: Ib8d1cb9946cd1e4723531de986129e8e30f32c09
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3569
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
daeken.kwon [Tue, 6 Oct 2015 05:32:32 +0000 (14:32 +0900)]
[IOT-762] Something wrong with handling unicast presence response - client always get "PRESENCE_TIMEOUT"
< Cause >
ocstack don't do ResetPresenceTTL() after getting presence response from server because there was no change in sequnceNumber
< Solution >
To resolve this case, it is just needed to put ResetPresenceTTL() before exit in this caseTo resolve this case, it seems that we just put ResetPresenceTTL() before exit in this case
Change-Id: If1e32692d3b859cea84382bded0cceecf42874d5
Signed-off-by: daeken.kwon <daeken.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3581
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Markus Jung [Tue, 6 Oct 2015 01:31:02 +0000 (10:31 +0900)]
Use unique_ptr for listBundles API return
listBundles now returns a list with unique_ptr references to RCSBundleInfo objects.
The change clarifies the responsibilty for memory management.
Change-Id: I79f4d70cd6f219f8024b4f2dae548b5ecac606ac
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3551
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Habib Virji [Mon, 5 Oct 2015 14:36:04 +0000 (15:36 +0100)]
Corrected doxygen issues for RD
Minor updates with correct param names.
Change-Id: If57f5f998758b9c716ac409735e7610db04dd839
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3503
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Heewon Park [Mon, 5 Oct 2015 14:24:21 +0000 (23:24 +0900)]
[JIRA IOT-780,782,783] fixed an error logic in sampleApp of Resource-Encapsulation.
-When server is created for Light-Sensor,the server can't response for Get-Request.
-When user inserts invalid input, sample app was not work normally.
-Fixed sampleApp input logics.
Change-Id: I94d1ba4b1293f730ba185af847976b0e9d13d816
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3475
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
spurthi.segu [Mon, 5 Oct 2015 14:19:17 +0000 (19:49 +0530)]
Added Junit test cases for Simulator Java APIs.
Change-Id: Iddfea7d5bfa43e86fa71697b6bd2a011774d9979
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Markus Jung [Mon, 5 Oct 2015 13:22:33 +0000 (22:22 +0900)]
Clarify resource container API
Clarify the API for listing bundle information.
Change-Id: I959ac95bb7992105ea308a24480b1ebdaa0f8f77
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3493
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Mon, 5 Oct 2015 11:21:10 +0000 (20:21 +0900)]
modify description of resource container apis to correct doxygen warnings
- fix doxygen comments of container apis to remove warnings
Change-Id: I917d3b48dd44943c803581145fa82af9ab9fb775
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3479
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jihun Ha [Mon, 5 Oct 2015 12:55:30 +0000 (21:55 +0900)]
Fix wrong comments in groupmanager.h for doxygen
A name of parameter in a function prototype should be matched with
a name following *@param* keyword for doxygen.
Change-Id: I892de77f163bbf5781735fce897ee11f850718b5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3483
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
lankamadan [Mon, 5 Oct 2015 11:58:44 +0000 (20:58 +0900)]
[easy-setup]Fixed doxygen warnings and renamed a file
- Fixed doxygen warnings and included a file in Doxyfile
- Renamed common.h to escommon.h
Change-Id: Ia499ee77059fa9034ee71ecbd61d972060103800
Signed-off-by: lankamadan <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Habib Virji [Tue, 29 Sep 2015 14:24:31 +0000 (15:24 +0100)]
/oic/res response as per Spec1.0
Corrects the format as per the specification.
Issue: IOT-717
Change-Id: Ic03d67541ef5afdfd6acc3820dc224b61484bd83
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3283
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwan.seo [Fri, 2 Oct 2015 04:42:15 +0000 (13:42 +0900)]
modified some code to make tcp header.
I have modified for tcp header which
has 0 ~ 12 length or 8bit message length.
since previous code has potential issue for byte ordering.
Change-Id: Id2f63608442ccf85558c61dbfd631a01f59ad8b9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Patrick Lankswert [Mon, 5 Oct 2015 22:11:34 +0000 (22:11 +0000)]
Merge "Merge branch 'plugin-interface' into master"
Sandeep Sharma [Mon, 28 Sep 2015 09:09:32 +0000 (14:39 +0530)]
Add Android interface set Display pin callback server API to
display for RANDOM_PIN provisioning.
[Patch #4] Added malloc failed check and Renaming of variable
to be more consistent.
[Patch #5] Addressed Randeep's review comments and upated
provisioning sample's build.gradle
[Patch #8] Addressed review comment.
Note: This change depends upon patch set #3047
This can be cherry picked for 1.0.0-dev
Change-Id: If704a01a760ec0880ea6e1a89f7e856d2f1ba3e5
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Joseph Morrow [Mon, 5 Oct 2015 17:34:32 +0000 (10:34 -0700)]
Merge branch 'plugin-interface' into master
* plugin-interface:
Enable ZigBee eventing in Plugin Interface through to IoTivity.
Add event feature.
Initial prototype for optimized Telegesis read/write layer.
Fix logic in zigbee wrapper to correctly evaluate boolean values.
Conflicts:
plugins/zigbee_wrapper/src/zigbee_wrapper.c
Change-Id: I23ea73432656197a8d79a169257ae5a57ac99718
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
coderhyme [Mon, 5 Oct 2015 11:20:03 +0000 (04:20 -0700)]
Exclude private types from doxygen
Older doxygens document private types if definitions for them are outside of the outer class.
cond command is one way to prevent them from being documented.
Change-Id: I151180a0724eca6ecf8f5682cbcbab4ca5ee42e6
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3477
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Hauke Mehrtens [Sat, 3 Oct 2015 14:08:00 +0000 (16:08 +0200)]
fix function signature in catcpadapter.c
The uint32_t and size_t type were mixed up in this file, this could
make the compiler generate code which would prepare the stack in a
different way the function expects it to be prepared and this will
cause some strange runtime problems.
Change-Id: I7665ce9e1bacc25bc367f2d64ff1775253db0454
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
hyuna0213.jo [Mon, 5 Oct 2015 03:54:16 +0000 (12:54 +0900)]
[JIRA IOT-778] fixed the jira issue related to CASendNotification API.
CASendNotification API is not used by RI layer.
RI layer is using CASendRequest API to send notification.
so we removed the CASendNotification API and modified the CA sample.
Change-Id: I90d490814dcd5e250564ca4f221911fb1c365128
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3457
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
arya.k [Mon, 5 Oct 2015 05:22:43 +0000 (10:52 +0530)]
IOT-787 issue fix.
Change-Id: Ic1e9105a2529c6864f6eae6159f31a6d86642146
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3461
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jihwan.seo [Fri, 2 Oct 2015 05:39:16 +0000 (14:39 +0900)]
[JIRA IOT-768] fixed to parsing message length for TCP
when message length of TCP has short size (0~12 size)
Parser of Receiver is working as wrong size.
Change-Id: Ib8075913389ef28315623edfe8ae053238bb3663
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3403
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Rahul Rahul [Fri, 2 Oct 2015 23:40:16 +0000 (16:40 -0700)]
Updated android fridgeclient and fridgeserver example.
Added a new fridgegroupserver and fridgegroupclient example.
This creates proxy child resources from the fridgeResource.
Change-Id: I235ea32a2a9dd2d596cfd1a3407f2a012d6fe3cd
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3439
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Mandeep Shetty [Tue, 22 Sep 2015 22:24:53 +0000 (15:24 -0700)]
Fix logic in zigbee wrapper to correctly evaluate boolean values.
Boolean values could be read as either "0" or "00" and thus a simple
strcmp with "0" would not suffice.
Additionally, sometimes, bitmasks are read and so we need the entire
numeric value of the string.
Changed strcmp operations to convert to numeric operations.
Also extracted duplicate code into it's own function
Change-Id: I9a8918d9824dcb452b64fdbe9f344cfa020f9e7c
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2957
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jihwanseo [Thu, 1 Oct 2015 05:11:59 +0000 (14:11 +0900)]
fixed the dependency issue between RM and BWT (IOT-731/IOT-712)
currently,there are the dependency issues
between routing manager option and blockwise-transfer option.
so I modifid the code to order the option list.
Both JIRA issues are related.
Change-Id: Iab7bc25e6dd7c35353d8cb382d1c896facbcdd40
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3347
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Rami Jung [Fri, 2 Oct 2015 06:18:39 +0000 (15:18 +0900)]
add API set information in iotivity/service
resource-encapsulation
resource-hosting
resource-container
resource-container's bundle-api
things-manager
easy-setup
resource-directory
Change-Id: I618a7babbd65825d7fa464f77e188a54f3b8dc19
Signed-off-by: Rami Jung <rami.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3407
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Madan Lanka [Fri, 2 Oct 2015 09:13:15 +0000 (05:13 -0400)]
[Easy-Setup] Arduino Enrollee Doxygen update and api folder change
- Reused OCConnectivityType struct instead of defining new struct
- Updated the Enrollee Device doxygen comments
- Enrollee EasySetup API folder is changed
- License header contribution year is updated
Change-Id: I72e095c5c886fb10dd365b72c80944f8864685ee
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3413
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
ChaJiwon [Fri, 2 Oct 2015 06:12:01 +0000 (15:12 +0900)]
Delete 'auto cancel' logic for discovery task and modify comments in discovery manager.
- DiscoveryTask destructor is changed default destructor
- modify comments in RCSDiscoveryManager and RCSDiscoveryManagerImpl
Change-Id: I3acd4ebbd65404192ab4eabf277a8dcb94af1b06
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3353
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jay Sharma [Thu, 1 Oct 2015 22:20:04 +0000 (03:50 +0530)]
[Things-Manager] Added unit test cases.
- gtest cases for Things Manager.
Change-Id: I4e4fc5376f006ede62e25fbdabc2eda337d34aa8
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
leechul [Thu, 1 Oct 2015 05:40:40 +0000 (14:40 +0900)]
Modify the OxM callback implementation to select the appropriate cipher suite
for creating secure session
[NOTE] I will modify the tinyDTLS cipher suite selection and enable/disable mechanism
according to comments of https://gerrit.iotivity.org/gerrit/#/c/2456/
[Patch #1] Intial upload
[Patch #2] Modify the comment according to doxygen format.
[Patch #3] Modify the oxmjustworks.c according to comment.
Change-Id: I6fb555d486f21f3851a7f2da9964381863128240
Signed-off-by: leechul <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3351
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Steve Clark [Sun, 20 Sep 2015 22:25:48 +0000 (16:25 -0600)]
Refinements to: Hardware abstraction for ECC, RND and encrypted storage
Change-Id: I01aaebe96588314e6aebf1f8adcc20ede8d0d6d4
Signed-off-by: Steve Clark <steve.clark@atmel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2801
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit
4940a9dc23a0a6a2123c727a51128d0f935fe35b)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3437
Steve Clark [Fri, 2 Oct 2015 13:06:02 +0000 (07:06 -0600)]
Fix tinydtls implementation of sign & verify
Change-Id: Id9b721a12e517fb0fe5adae76b380acb04b467cd
Signed-off-by: Steve Clark <steve.clark@atmel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3417
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
(cherry picked from commit
28fd8b67657cdbe3860302a3ea92d83515c1a688)
Reviewed-on: https://gerrit.iotivity.org/gerrit/3435
Joseph Morrow [Wed, 30 Sep 2015 18:33:10 +0000 (11:33 -0700)]
Enable ZigBee eventing in Plugin Interface through to IoTivity.
Change-Id: I1cca24815772c8e4f36e8b2f31775e7611e4f019
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3165
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Joseph Morrow [Wed, 30 Sep 2015 19:54:44 +0000 (12:54 -0700)]
Add event feature.
Change-Id: Iafae4e422c43bc37e4304f0a00d980b38a13aa99
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2953
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Joseph Morrow [Wed, 30 Sep 2015 21:38:41 +0000 (14:38 -0700)]
Initial prototype for optimized Telegesis read/write layer.
Change-Id: Ie6de7fb686f25db5870e5f6d359d3e8351e915b8
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2945
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
js126.lee [Thu, 1 Oct 2015 12:57:16 +0000 (21:57 +0900)]
Add archive libs into RPM package in Tizen build
-Issue : libocpmapi.a is not included in RPM package,
after Tizen build with "secure_mode=1". So, we can't use that lib on tizen.
-Solution : Add libocpmapi.a into RPM package when Tizen build with "secure_mode=1"
Change-Id: I568407c16e27abc09843a785a457738527ff3057
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3373
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Dmitrii Zhuravlev [Tue, 29 Sep 2015 15:55:07 +0000 (18:55 +0300)]
Synchronize PKIX with provisioning API
Certificate based provisioning does not use sql database now
Change-Id: I5dbceea998f24bfd449efbf108640fc80dd02be7
Signed-off-by: Dmitrii Zhuravlev <d.zhuravlev@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Randeep Singh [Thu, 1 Oct 2015 09:59:57 +0000 (18:59 +0900)]
Corrected DB query of PDM
To check the existence of link between two devices, We should use query with
‘and’ not ‘or’.
Previously link was checked with ‘or’ thats why if we try to create multiple
links involving one same device and other different devices then it was showing
link already exists. for example if we create link between A-B then if we try
to create link between A-C then we are getting error that link already exists.
Change-Id: I408658af4f423a641bab077439435711ecac876e
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3361
Reviewed-by: Woochul Shim <woochul.shim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
John Light [Tue, 8 Sep 2015 12:55:15 +0000 (05:55 -0700)]
caipserver now reports correctly whether a received message is multicast.
It uses IP_PKTINFO to determine the address used to send the message.
Resolves JIRA 589 P1.
Change-Id: Ia9d9f271421fe232ad4939e23cccf715ed30ab90
Signed-off-by: John Light <john.j.light@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3293
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Markus Jung [Fri, 2 Oct 2015 02:09:06 +0000 (11:09 +0900)]
Fix cppcheck issues in resource-encapsulation dir
This patch fixes the "(error) Returning reference to auto variable" issue reported
by cppcheck tool in resource-encapsulation/src/resourceContainer/src dir.
Change-Id: Idade3fb288f7571276274cccb30728cf46851ac6
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3397
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
abitha.s [Thu, 1 Oct 2015 12:59:56 +0000 (18:29 +0530)]
Changes for JsonSchema and Raml Parser.
1.Added reading Double from Json Schema
2.Adding prevent and klockwork fixes for Raml and JsonSchema parser.
3.Minor fixes.
Change-Id: I2459bbdee23b8491a290f21fdfa13c7979efda97
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3375
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
spurthi.segu [Thu, 1 Oct 2015 11:56:30 +0000 (17:26 +0530)]
Prevent and Klockwork fixes.
Change-Id: I7da253ecb1b8ce7e0f7a0dbf4bb1e00d3d97e89e
Signed-off-by: spurthi.segu <spurthi.segu@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3371
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
arya.k [Thu, 1 Oct 2015 10:36:32 +0000 (16:06 +0530)]
[TIZEN] ContainerClient Application.
- Removed container module from RESampleClient Application.
Change-Id: I8c0cd3488f4b7c92432dc8d5c56735d0055e032f
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3367
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Thu, 1 Oct 2015 09:40:37 +0000 (15:10 +0530)]
[TIZEN] Added Resource Container Sample Application.
- Removed Contianer module from RESampleServer Application.
Change-Id: Ie2226d0235aa893f00c9bd63b343d2ec0c69c6b3
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3359
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
coderhyme [Thu, 1 Oct 2015 10:25:15 +0000 (03:25 -0700)]
Fix an issue of resource-encapsulation android regarding loading native libs
Loading ResourceContainer native lib make the aar can't be loaded because android re doesn't contain it.
Change-Id: I9ff82a2248b514bb305cb746a3820d7ee45ebe5f
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3365
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Vinil Jain [Thu, 1 Oct 2015 10:04:39 +0000 (15:34 +0530)]
Added JUnit test case
-added test case for easysetupstatus
-changed signature of easysetupstatus api
-Updated comments
-Added new states and changed some states
Change-Id: I4afd9318f9f8c8ddf9189f856dbab8307946e8e5
Signed-off-by: Vinil Jain <vinil.gj@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hauke Mehrtens [Mon, 28 Sep 2015 09:02:53 +0000 (11:02 +0200)]
tinydtls: fix and activate android debug.c build
This patch activates the build of debug.c on android and also fixes one
build issue with this code in android.
in_port_t is not defined in <netinet/in.h> in the android NDK, use
"unsigned short int" instead because this is also used by sin_port in
the Android NDK.
There is already a bug for Android open to fix this problem in Android
here: https://code.google.com/p/android/issues/detail?id=80713
With this change the tinydtls debug.c file compiles for me for Android.
Change-Id: Id03a319768357ea1bef3f86ac2342e61e2b26b79
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3195
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Ashwini Kumar [Thu, 24 Sep 2015 12:06:33 +0000 (17:36 +0530)]
Add Set display pin callback method for server to display
PIN for RANDOM_PIN provisioning
Note: this change can be picked for 1.0.0-dev
Change-Id: I7fc9b2ff66205c27fc6f41ebc0cadb4cd592abab
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3047
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Mandeep Shetty [Thu, 1 Oct 2015 00:55:50 +0000 (17:55 -0700)]
Speed up linux ocserver to fix apparent instabilities.
The linux ocserver had three threads running uncluding the main thread.
All three had sleeps in it and there was a delay of 2 seconds between
every call to OCProcess ().
This caused the ocserver to be slow and the server appeared to be
unstable specially when there were many clients sending in requests to
one server.
- Changed ocserver to start the observation thread only when observation
is requested similar to the C++ sample simpleserver.
- Removed the sleep between calls to OCProcess ()
- Moved stopping presence logic to the presence thread from the
observation thread.
This may be cherrypicked to 1.0.0-dev.
Change-Id: Ib1c9fd732d0973435b556adb8a42610447f1ae7b
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3339
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Tim Kourt [Wed, 30 Sep 2015 21:31:56 +0000 (14:31 -0700)]
Android: Added/Updated JavaDocs
In addition it adds a couple of missing ENUM
values that have been introduced recently
Change-Id: Iddd1eefec7b59f041036093e51ae336d28778487
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3331
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
arya.k [Thu, 1 Oct 2015 04:21:41 +0000 (09:51 +0530)]
Enabled resource container to build for TIZEN.
Change-Id: I0238dbbec873b9041c87de1967bc9c928a753ebc
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3341
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-by: Markus Jung <markus.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Ravi Nanjundappa [Thu, 1 Oct 2015 04:29:55 +0000 (09:59 +0530)]
Fix cppcheck issues in resource-directory dir
This patch fixes the "(error) Invalid number of character ({) when these macros
are defined: '__cplusplus'" issue reported by cppcheck tool in resource-directory dir.
Change-Id: I18efad2b11148d71cc459469eb9fb569f93332ae
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3343
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Tim Kourt [Wed, 30 Sep 2015 20:28:11 +0000 (13:28 -0700)]
Android: fixing scons build for the examples
The issue in scons script introduced in
https://gerrit.iotivity.org/gerrit/#/c/3135/ and consequently
in https://gerrit.iotivity.org/gerrit/#/c/3287/ has caused
the long build times for the Android examples by rebuilding
it multiple times.
Change-Id: I978ac3459dbd0e42e231f8d70a0374558e85f9e8
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3327
Reviewed-by: Rahul Rahul <rahul.rahul@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jon A. Cruz [Wed, 30 Sep 2015 18:57:36 +0000 (18:57 +0000)]
Merge "Merge Resource Directory into the master"
Mandeep Shetty [Fri, 25 Sep 2015 20:52:54 +0000 (13:52 -0700)]
Fix duplicate observer registrations due to slow server or network.
This fixes IOT-720 and IOT-612.
The client retransmits a confirmable request before the 1st timeout for
un-acknowledged confirmable request. The server is occasionally too slow
to respond or the network is slow sometimes.
In case of OBSERVE registrations, a retransmit means two or more observers will
be added for one observe request the client sent.
This leads to lot's of extra notifications being sent out and only one
of observers from the multiple clones are deleted if the client
de-registers.
Fix is to check with the token if observer was already added and ignore
the request if it was as the client was likely already ACKED for the
first request the server fully processed.
This should be cherrypicked to 1.0.0-dev.
Change-Id: I7ecfe1a6e8009606a9430515cbcedef2516507d7
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3155
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Habib Virji [Wed, 30 Sep 2015 09:58:37 +0000 (10:58 +0100)]
Merge Resource Directory into the master
Resource Directory Server:
• Hosting of RD (Server side)
• Respond to discovery request with the bias factor.
• Response after receiving publish resource and payload handling (Server side)
• Storage of resources at RD (Server side)
• /oic/res querying support with a response in collection format.
Resource Directory Clients:
• API to initiate discovery of RD
• Publish resources to RD using the collection format.
• Stop Multicast API suport
Sample Applications:
• Server side application to start resource directory
• Thin-client side application to discover and publish resources to resource directory.
• Client to query resource published at the resource directory.
Change-Id: Iecd03cb26b231dc58ae1f5c30353c5a2514260bf
Signed-off-by: Habib Virji <habib.virji@samsung.com>
arya.k [Wed, 30 Sep 2015 10:52:19 +0000 (16:22 +0530)]
[TIZEN] RE NestedAttributes Sample Application discovery fix.
Change-Id: I4f184d42f60ba3baacfde3aea4feec890e17b260
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Wed, 30 Sep 2015 07:45:24 +0000 (16:45 +0900)]
change location of resource container directory
- relocate the directory of resource container out of resource-encapsulation directory
- change sconscript for changed directory location
Change-Id: I912149cb7f3fe6b640b07108570c2fe9dd78fd1d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Tue, 29 Sep 2015 10:11:27 +0000 (15:41 +0530)]
Correcting the INPUT in Doxygen file.
Changed to include the relevant header files as per the updated
source code structure.
Change-Id: I2ceb54f2f7d7614008a4d0073b7964a8a44c27a5
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hauke Mehrtens [Tue, 22 Sep 2015 09:46:53 +0000 (11:46 +0200)]
tinydtls: add android logging support
This patch forwards the logging messages form tinydtls to the normal
android logging system instead of writing them to stdout and stderr.
This is activated in non release builds.
Change-Id: I56cf6752267dc512bf8252dfaaf957d0f87e5bf1
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Mandeep Shetty [Tue, 22 Sep 2015 22:24:53 +0000 (15:24 -0700)]
Fix logic in zigbee wrapper to correctly evaluate boolean values.
Boolean values could be read as either "0" or "00" and thus a simple
strcmp with "0" would not suffice.
Additionally, sometimes, bitmasks are read and so we need the entire
numeric value of the string.
Changed strcmp operations to convert to numeric operations.
Also extracted duplicate code into it's own function
Change-Id: I9a8918d9824dcb452b64fdbe9f344cfa020f9e7c
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3157
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
vimala.v [Tue, 29 Sep 2015 11:49:37 +0000 (17:19 +0530)]
Klockwork fixes for Routing Manager and CA
If accepted, this changeset should be cherrypicked to 1.0.0-dev.
Change-Id: I2bfaa017c3fafc5a5cd8d4c248564aa4eff88f76
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Habib Virji [Fri, 25 Sep 2015 01:25:39 +0000 (02:25 +0100)]
OCMulticast start and stop APIs
APIs to start and stop multicast traffic. For stopping and staring multicast traffic
it manipulates multicast fd and IP_DROP_MEMBERSHIP.
OCStopMulticastTraffic interface is called from rd_client. It stops the multicast traffic.
OCStartMulticastTraffic is implemented but it is not called as this functionality is
not yet implemented.
Change-Id: If56c7af074cbba097b7b23d1abd787093872418a
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2387
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ravi Nanjundappa [Mon, 28 Sep 2015 07:14:00 +0000 (12:44 +0530)]
Update the OC_SPEC_VERSION macro
Updated the spec version from 0.9.0 to 0.9.2 in octypes.h file.
Change-Id: I9a92017864c1c3ae1cd5b8671f65901b2fb2bc7f
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Ravi Nanjundappa [Mon, 28 Sep 2015 05:05:23 +0000 (10:35 +0530)]
Add unit test for OCSetPlatformInfo()
Unit tests exercise code paths to check OCSetPlatformInfo()
for Client Mode.
Change-Id: I5b4fda023fd91826117cc27a1eb8f1578f94b958
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3173
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Rahul Rahul [Fri, 25 Sep 2015 16:58:50 +0000 (09:58 -0700)]
Added APK generation to build scripts
Updated android_api SConscript and Gradle files to generate
the APK of android examples with the existing scons command.
If trying to build examples from android studio, the user might
need to update the default TARGET_ARCH, RELEASE and SECURED flags
in <iotivity>/android/examples/gradle.properties
Updated the gradle versions to 1.3.0 in all gradle files.
Change-Id: Id9da3594ac83a4d27b3b1272a5aef6d893b305f9
Signed-off-by: Rahul Rahul <rahul.rahul@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3135
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
arya.k [Tue, 29 Sep 2015 09:40:09 +0000 (15:10 +0530)]
[TIZEN] RESampleClient application resource discovery fix.
Change-Id: I80c2e436bbfac92420cb67fc405e2786c081b432
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3265
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Tue, 29 Sep 2015 09:42:52 +0000 (15:12 +0530)]
Change file permission of RCSResourceObject.h file
Removed the execute permission for the RCSResourceObject.h file
in resource-encapsulation dir.
Change-Id: Ic4a3e1f3ab2766e461c7308ee1d0bf16a4eedbf2
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jyong2.kim [Tue, 29 Sep 2015 08:49:01 +0000 (17:49 +0900)]
Fix for resource type name of resource hosting.
resource type name is modified to follow naming convention.
Change-Id: I121bc75e627db58332778ff249f7f8fb512a23d2
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3257
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
doil.kwon [Tue, 29 Sep 2015 06:59:05 +0000 (15:59 +0900)]
modify timing issue and add test case for DiscoveryManagerUnitTest
- default waiting time is 3sec as each test.
- change discovery checking way from using sleep method to condition_variable.
: just unlock waiting mutex when is called callback function.
- request multiple discovery that have equal contents, and just one canceled.
other request will be received callback function.
modify createId's logic for RCSDiscoveryManagerImpl.
modify Sconscript
- directory location for DiscoveryMaanger' unittest code is changed.
Change-Id: I3dfd5b1440959eac200746eba098ebd1ff93b69b
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Tue, 29 Sep 2015 07:03:35 +0000 (12:33 +0530)]
[resource-hosting] Updated the Java SDK as per new folder structure.
- Updated SDK.
- Updated Android Sample Applications.
Change-Id: Ifea8bb81528dceea0879729b06bf0f90fe9beb05
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3251
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Abhishek Pandey [Tue, 29 Sep 2015 06:44:41 +0000 (12:14 +0530)]
Updated Tizen GBS build script to fix tinycbor clone error
During Jenkins build, tinycbor library is copied as a soft link in extlibs folder.
For Tizen build, we copy from this location to tmp folder, which in turn
is copied to GBS-ROOT during build. While copying from extlibs/tinycbor
which is present as a soft link, error appear during jenkins build.
Fixed the error by giving -L option during in copy command.
Also, added error return clause in gbs build script to enable
jenkins catch the error in case of build break.
Change-Id: I24c149dabd3ac3c382adf8aa11a60b0adae38a68
Signed-off-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3247
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Hemant Mahsky [Tue, 29 Sep 2015 08:32:21 +0000 (14:02 +0530)]
Fixed an issue found in internal testing
Change-Id: I5a0bf9e5782765e72c2cc7528a66d241728db07e
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3255
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
arya.k [Tue, 29 Sep 2015 06:16:34 +0000 (11:46 +0530)]
Tizen build fix. Resource Hosting library name changed.
Change-Id: I7bdc05b230ecf807a36823ed6a9a7ca3f0d0040e
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3245
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Habib Virji [Fri, 18 Sep 2015 22:15:25 +0000 (23:15 +0100)]
/oic/res response based on the collection response structure
This is based on the new strucutre of the /oic/res as currently being defined
by Ravi. This is useful for the resource directory as it needs to include
multiple links maps inside links array.
It differs with the current /oic/res response as it includes links array with
multiple links map object.
The strucutre of the payload appears in this format:
Array
TagsObject
di
baseURI
bitmap
ins
LinksArray
LinkMapObject
href
rt
itf
ins
Change-Id: Ifc61a70ede1fc44e9b2321604907d99961eea13b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2701
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
jyong2.kim [Mon, 28 Sep 2015 09:29:32 +0000 (18:29 +0900)]
rename to resource-hosting from notification-manager.
notification manager is only provide resource hosting feature.
and resource hosting feature break off notifcation manager.
Change-Id: I96a0a60df60e60c44ecb9935cb73250949993fb6
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sachin Agrawal [Wed, 23 Sep 2015 21:28:53 +0000 (14:28 -0700)]
Add check for expired symmetric keys
Iotivity should refuse DTLS session formation with devices whose
credentials have been expired.
Change-Id: Ic4708fbdd50ebc59e57f09c37211e7f36dbcf931
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3015
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Sachin Agrawal [Fri, 25 Sep 2015 18:20:29 +0000 (11:20 -0700)]
Refactor PSK Credential retrieval interface
When CA requests PSK credentials during DTLS handshake, SRM retrieves
credential for all devices and provides it to CA. This is un-necessary
and is in-efficient approach. Updated code to only provide credential
which has been requested by tinydtls.
Change-Id: Ie9bdc0ff1236b9f1f198215d211a682df416e731
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3009
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
vimala.v [Tue, 22 Sep 2015 11:36:33 +0000 (17:06 +0530)]
Integration of Tizen RI layer and Routing Manager build in Jenkins
1) Added Tizen scons for csdk libs and sample for IP transport
in auto build.
2) Updated Tizen, Linux and android scons to build ROUTING=GW
option in auto build.
3) Updated Tizen CSDK build script to return error on failure.
4) Added README for build procedure and execution of CSDK samples.
Change-Id: I6c9eb8fad8cb441658d8bdd5852ce5b50575f5ea
Signed-off-by: vimala.v <vimala.v@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2921
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Hemant Mahsky [Mon, 28 Sep 2015 16:54:14 +0000 (22:24 +0530)]
Added Multi PHY EasySetup Service
Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Updated SConscript to build EasySetup
Change-Id: Ie8504d25c0f8c002737b8a82820e0af52944ca83
Signed-off-by: Hemant Mahsky <h.mahsky@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Sachin Agrawal [Mon, 28 Sep 2015 19:15:55 +0000 (19:15 +0000)]
Merge "Merge branch 'security-CKM' into 'master'"
koushik.girijala [Mon, 28 Sep 2015 09:11:13 +0000 (14:41 +0530)]
Fix for Jira issues IOT-733,739 and 727
Fixed double free corruptions and errors in freeing static memory
If accepted, this changeset should be cherrypicked to 1.0.0-dev.
Change-Id: I5b37f5090b68b45156b5965f715b68daebfe9e37
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3191
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Sachin Agrawal [Mon, 28 Sep 2015 16:38:19 +0000 (09:38 -0700)]
Merge branch 'security-CKM' into 'master'
* security-CKM:
Removed automatic switching to X.509 in CA
implement unit tests for CK manager
Add sample of PKIX provisioning
Conflicts:
resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
Change-Id: If1e8367e3729b152602d1585bc433f083354c5e1
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
arya.k [Mon, 28 Sep 2015 11:38:15 +0000 (17:08 +0530)]
Fix for bug IOT-758
Change-Id: I7f9300a9a10d3f2d5bb774fc51ea51c62bdaf49a
Signed-off-by: arya.k <arya.kumar@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3203
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Ravi Nanjundappa [Mon, 28 Sep 2015 10:26:25 +0000 (15:56 +0530)]
things-manager: change file permission of .h files
Removed the execute permission for the .h files from things-manager.
Change-Id: I4ebedbcc84114edcacc67dcaf373d6563f465bc1
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3209
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Jay Sharma [Fri, 25 Sep 2015 14:29:58 +0000 (19:59 +0530)]
[Things-Manager]Fixed junit testcases issues and jira IOT-745
- Updated Java SDK
- Updated sample Application
Change-Id: Ife6e1d3a00ff76d4c68f96949787fab1724092dc
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3115
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Mon, 28 Sep 2015 08:21:41 +0000 (01:21 -0700)]
Refine comments for android apis of resource-encapsulation.
Incorrect tags are fixed.
Links for types and methods in comments are added for convenience.
Change-Id: I8f4bbc31dfb4ead6b4b5fd0f80046002f8e80589
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3189
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
coderhyme [Mon, 28 Sep 2015 07:49:29 +0000 (00:49 -0700)]
Fix a possible segmentation fault of ExpiryTimer.
The thread for ExpiryTimer might be started before members are initialized.
Change-Id: I2d83a60bb84422e033f6165aef3cb0136edbeae7
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Minji Park [Fri, 25 Sep 2015 04:29:39 +0000 (13:29 +0900)]
Align resource container Java bundle APIs with new naming scheme
Updating Java bundle resource to follow the new naming scheme (handleSetAttributeRequest,
handleGetAttributeRequest). Latest changes in the resource container APIs
are now also updated in the Java related code.
Change-Id: I7b28c830c2dc6f2dd1c7ad31405851b6d94def54
Signed-off-by: Markus Jung <markus.jung@samsung.com>
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jyong2.kim [Fri, 25 Sep 2015 04:25:32 +0000 (13:25 +0900)]
Remove delete request of notification sampleconsumer.
notification manager(resource hosting) is not service for delete request.
notification manager use to resource-encapsulation APIs.
but resource encapsulation APIs is not service for delete request to remote resource.
so, unsupported function about delete request is removed in sample application.
Change-Id: I1280b1fa647b57eadc80ff064d121593fdc88526
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3079
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ChaJiwon [Fri, 25 Sep 2015 12:10:13 +0000 (21:10 +0900)]
Modify directory location and code refactoring "RCSDiscoveryManager"
- change directory location for "RCSDiscoveryManager.h" into resource-encapsulation/src/resourceClient
- code refactoring about RCSDiscoveryManager and RCSDiscoveryManagerImpl
Change-Id: I6790e5aec8cb80a1b62c8767e71256fb582c58bf
Signed-off-by: ChaJiwon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Shilpa Sodani [Fri, 25 Sep 2015 20:21:58 +0000 (13:21 -0700)]
Fix for bug IOT-759
Fixed the seg fault when no recurrence rule corresponding to period
rule was present.
Change-Id: I69989819d17ef7edf644a0efa512b051b18b7307
Signed-off-by: Shilpa Sodani <shilpa.a.sodani@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Joseph Morrow [Sat, 26 Sep 2015 18:21:58 +0000 (11:21 -0700)]
Merge branch 'master' into plugin-interface
* master: (161 commits)
Added function to config terminal for read/write.
Add validation of parameters at JNI level. Updated client json db file for 'sct'. Few fixes in provisioning client sample.
Removed the filter to add 'identity' info on selective connections
Fix issue w.r.t URI comparison when querystring is used
Fix segfault when calling OCCancel ()
Fixed the start adapter bug in ip/tcp adapter. (IOT-753/ IOT-453)
Fixed Tizen build error with SECURED=1
Fixed code that would only compile on buggy compilers.
fixed the jira IOT-712 issue in blockwise-transfer
Android: fix for IOT-755
[JIRA IOT-737] fixed to prevent send coap pdu for no uri
Increase delay in ocserver.cpp sample to avoid missed notifications.
Fix crash when discovering devices & platforms.
Android: Refactored SimpleClient
Android: Refactored SimpleServer
Android: Adding GroupServer/Client examples
Refactoring ResourceEncapsulation Sample App.
In resource-encapsulation android api, ResourceContainer related files are removed.
Code formatting for unit tests for resource-encapsulation android api.
Remove a wrong memory free in oicgroup
...
Change-Id: Ib996de6ef076ac48cb5ed617a1d3bc87318af806
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Thuyen Tran [Sat, 26 Sep 2015 18:45:19 +0000 (11:45 -0700)]
Added function to config terminal for read/write.
Change-Id: I816c23cfd68bd85ff32bf4dbc5cadba5a4c708c8
Signed-off-by: Thuyen Tran <thuyen.c.tran@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3065
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Sandeep Sharma [Tue, 22 Sep 2015 12:43:35 +0000 (18:13 +0530)]
Add validation of parameters at JNI level.
Updated client json db file for 'sct'.
Few fixes in provisioning client sample.
Patch #1 Fix Review comments and device status enum fix.
Change-Id: Ib4d63619d730d2d350214d8fed6d3817b14eaa2c
Signed-off-by: Sandeep Sharma <sandeep.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Sachin Agrawal [Fri, 25 Sep 2015 15:36:48 +0000 (08:36 -0700)]
Removed the filter to add 'identity' info on selective connections
Ir-respective of the end-point being a SERVER or CLIENT, it may be
useful for RI and upper layers to know the true identity of the sender
of the message. Therefore, removed the filter which was checking for
'SERVER' only mode.
Change-Id: I21cda0a645d79df6df3a3a4113cccbac4a7ae8d6
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2949
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Sachin Agrawal [Fri, 25 Sep 2015 05:27:49 +0000 (22:27 -0700)]
Fix issue w.r.t URI comparison when querystring is used
If a query string is attached to URI, URI comparison fails
and packets are dropped. Updated the code to only compare the
URI part excluding querystring.
Change-Id: Iee81e6fb7851d3a3ce5b8410fecd14645e134713
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3081
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Mandeep Shetty [Thu, 24 Sep 2015 20:42:39 +0000 (13:42 -0700)]
Fix segfault when calling OCCancel ()
This fixes the client side crash in IOT-733.
OCCancel () allocates a pointer that is free'd in routingutility.c.
Although the pointer was passed in as reference into routingutility and
is re-assigned with a new malloc'ed pointer, OCCancel() free's the old
pointer.
This is because there two structs that are being passed around. The
pointer that is double free'd is free'd twice as part of two DIFFERENT
structs. Got rid of the extra struct to keep things consistent and
resolve the crash.
If accepted, this changeset should be cherrypicked to 1.0.0-dev.
Change-Id: I8c961776406c02dbe7706a787bb19db53ba83853
Signed-off-by: Mandeep Shetty <mandeep.shetty@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3055
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Ashok Channa [Fri, 25 Sep 2015 01:01:16 +0000 (10:01 +0900)]
Fixed the start adapter bug in ip/tcp adapter. (IOT-753/ IOT-453)
After multiple terminate initialization, CASendRequest API
is not working. because we didn't set the start flag with false
after stopping adapter. Both JIRA issues are related.
Change-Id: If855c4f689ce6979ae13591f2d4048113148d150
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Signed-off-by: Ashok Channa <ashok.channa@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3069
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>
Jon A. Cruz [Fri, 25 Sep 2015 17:54:53 +0000 (17:54 +0000)]
Merge "Merge branch 'remote-access2'"
js126.lee [Wed, 23 Sep 2015 14:06:02 +0000 (23:06 +0900)]
Fixed Tizen build error with SECURED=1
[Patch-1] Initial
[Patch-2,3] Fixed build error in case of CA partially.
Note : The purpose of this patch is to fix build error
when building full tizen with security.
The change required in jenkins configuration is out of this patch.
Change-Id: I2ec95c13d6c7d7978662e7ef69f7a02cd8188df0
Signed-off-by: js126.lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2997
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Jon A. Cruz [Thu, 24 Sep 2015 21:24:30 +0000 (14:24 -0700)]
Fixed code that would only compile on buggy compilers.
Corrected lambda capture of member. Caused compilation to fail
on gcc newer than 4.6.
Corrected order of GTest assert macro parameters.
Change-Id: I04f653fb70d9e68ee97df2f68bbaa965513c621f
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>