cc [Mon, 12 Sep 2016 02:06:07 +0000 (11:06 +0900)]
Merge remote-tracking branch 'origin/notification-service'
Updated with static analysis.
Change-Id: I73120da7cafc810f613fd2d9b265366ff773bbd3
Signed-off-by: cc <ch79.cho@samsung.com>
Jihun Ha [Sun, 11 Sep 2016 07:11:49 +0000 (16:11 +0900)]
Add setCredID to mediator sample application
To tranfer a certificate to Enrollee, you need to specify a credential ID
corresponding to the certificate.
Change-Id: I79c39ff1a6f0f90175cfe11c6ca7ed719f3cf222
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11653
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Sun, 11 Sep 2016 11:57:09 +0000 (20:57 +0900)]
Fix Jira issues(IOT-1263)
IOT-1263:
[ES][Linux] Get Location API can not get expected location
(https://jira.iotivity.org/browse/IOT-1263)
Change-Id: Ifc0a088c3d7c8166fdc093976bebb3e84d036295
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Sun, 11 Sep 2016 11:56:29 +0000 (20:56 +0900)]
Fix Jira issues(IOT-1268)
IOT-1268:
[ES][Android] APIs crashed with null parameter
(https://jira.iotivity.org/browse/IOT-1268)
Change-Id: I7b3bb5b9eb78df12b60e852a878ee73cb0d1c189
Signed-off-by: Parkhi <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11521
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Sun, 11 Sep 2016 11:49:59 +0000 (20:49 +0900)]
Add a dependency in building notification-service for android.
After libnotification_provider_wrapper.so is created, its android SDK
should be built.
Change-Id: I6df993e6ccd60f29017cd2e47fe75b2d3cc78892
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11657
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Fri, 9 Sep 2016 06:11:46 +0000 (15:11 +0900)]
Remove logs with non-LOGGING build option.
When notification service build on non-Logging mode, log is removed.
For the above reason, newly appeared warning is resolved.
Change-Id: Ibc7a1ee32e3063934ad5fccdaf363707ef5a247c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11621
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Fri, 9 Sep 2016 08:36:29 +0000 (17:36 +0900)]
Remove unused task type on consumer service.
Named TASK_CONSUMER_GET_TOPIC_LIST task is remove reason by unused.
Change-Id: Id65cca0a284a4c0d3f216fc74bc9c0d4bcc4edfa
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Fri, 9 Sep 2016 04:21:04 +0000 (13:21 +0900)]
Fix for result of static analysis.
Pointer value casting is fixed for valid size.
If statement is fixed.
Change-Id: I4e6304769c683f78caca8eea4f4dc1da5c369a59
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11619
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
KIM JungYong [Fri, 9 Sep 2016 07:24:29 +0000 (16:24 +0900)]
Fix bug for select topic.
When consumer service get topic to provider, consumer id is excepted.
Consumer id is added on request get topic.
linux sample app is updated for print topic.
Change-Id: I383c2032856e034e80241cc49b1601fece04d230
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11625
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
jaesick.shin [Fri, 9 Sep 2016 07:27:14 +0000 (16:27 +0900)]
Add sendMessage for NSProviderSetConsumerTopic and bug fixes for API.
1. Add sendmessage when call NSProviderSetConsumerTopic function.
2. Add bug fixes for API ('\0' case)
Change-Id: If5c204909cb37220ea0c2f007e9224aae0c494b2
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11627
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
KIM JungYong [Fri, 9 Sep 2016 02:27:00 +0000 (11:27 +0900)]
Update consumer service termination logic.
When consumer service termination or stopped,
memory deallocation of thread, mutex, list object is added.
unit test of NSConsumerGetProvider is added.
Change-Id: I61c30b46645d5a88eeac7f4ed6ca06d5b3d1036e
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11615
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Jung Seungho [Thu, 1 Sep 2016 07:43:14 +0000 (16:43 +0900)]
modified observe exception, when channel is disconnected
Change-Id: I6309712296cb8269c9dba027d64e8656e8479428
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11213
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Dave Thaler [Fri, 26 Aug 2016 01:13:24 +0000 (18:13 -0700)]
Fixes for build errors hit by some versions of Visual Studio
Change-Id: Id8bcb4a5cd65d855b8e371c981f1c9bb4e6ed26d
Signed-off-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10929
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
George Nash [Wed, 7 Sep 2016 23:43:28 +0000 (16:43 -0700)]
Fixed discarded-qualifiers warning
by asigning the const pointer type to a non-const pointer type
the code was discarding the const qualifier. Added const key
word to fix warning.
Change-Id: Ided09959ac9406ed80f69606e9ed065d2498ebd2
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11527
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
George Nash [Wed, 7 Sep 2016 23:18:01 +0000 (16:18 -0700)]
Fixed shift-negative-value warning
The compilar was interpreting the number zero '0' as a
signed number not an unsigned number. The left shift behavior
for signed numbers is undefined. The 'u' sufix was added to
tell the compilar that the '0' is an unsigned number.
Change-Id: Ida6c5c5ee2a7ea556755ca55d71858469a0691ac
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11525
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: jaehyun Cho <jaehyun3.cho@samsung.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
George Nash [Thu, 8 Sep 2016 00:28:48 +0000 (17:28 -0700)]
Fixed implicit-function-declaration warning for strncasecmp
Both csdk/security/src/aclresource.c and
csdk/security/src/pstatresource.c reports that there is an
implicit declaration of function 'strncasecmp' this means
the code does not see the 'strncasecmp' function from the
header.
The 'strncasecmp function exist in the strings.h header or
in string.h header. To have the funtion in the string.h
header the _GNU_SOURCE or _DEFAULT_SOURCE macro must be
defined.
Since aclresource.c explicity excludes strings.h if string.h
is found the _GNU_SOURCE macro was added.
The _GNU_SOURCE macro was used over the _DEFAULT_SOURCE
macro since there already apears to be a presidence for
the _GNU_SOURCE macro elsewhere in the code.
Change-Id: I2d29521d0f28811be2a58349a5bc8be39b17d76e
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11529
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
Tested-by: Rick Bell <richard.s.bell@intel.com>
George Nash [Wed, 7 Sep 2016 22:19:10 +0000 (15:19 -0700)]
Fixed implicit-function-declaration warning for strnlen function
The strnlen is a GNU extension and not a standard C function and
is not avalible unless the macro _DEFAULT_SOURCE or _GNU_SOURCE is
defined.
It looks like _GNU_SOURCE already has a precidence so it was added
to the build script.
Change-Id: Ied150e5b97a965c1b4b240d364e49669bdad4f11
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11523
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Rick Bell <richard.s.bell@intel.com>
jihwan.seo [Thu, 1 Sep 2016 10:38:14 +0000 (19:38 +0900)]
Fix setting adapter type value of Endpoint for TCP adapter.
These was no set adapter value in Endpoint previously.
Change-Id: Id52d3c4393943dac205c2953ceb3334a3e43f8bf
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11273
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Abhishek Sharma [Thu, 8 Sep 2016 06:37:23 +0000 (12:07 +0530)]
Fix for JIRA issue 1242, 1245, 1247
https://jira.iotivity.org/browse/IOT-1242
https://jira.iotivity.org/browse/IOT-1245
https://jira.iotivity.org/browse/IOT-1247
Change-Id: I93a5f2bf3780ed2dc0ab74cd9701d100c1bbcb87
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11545
Reviewed-by: Masud Bhuiyan <m.parves@samsung.com>
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>
jihwan.seo [Thu, 8 Sep 2016 05:31:30 +0000 (14:31 +0900)]
[IOT-1265] fix writeCharacteristic success signal logic
Change-Id: Ib9a5b4ad18298fc2541fb128d964e2e634280cb2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11539
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>
jihwan.seo [Thu, 8 Sep 2016 08:33:48 +0000 (17:33 +0900)]
[IOT-1272] added null checker for address in setAutoConnectionDevice API
Change-Id: Ib89a3856d3089d68e58e6d72112f76c59322f055
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11563
Reviewed-by: Suchita Sultana <suchita.rs@samsung.com>
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>
KIM JungYong [Thu, 8 Sep 2016 10:47:27 +0000 (19:47 +0900)]
Add logic for media contents.
Media contents parse and copy, remove logic is added at consumer service.
Change-Id: If2079e33fcb0f84f983212468786657cfdc91976
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11571
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
nikhil.a [Thu, 8 Sep 2016 10:58:18 +0000 (16:28 +0530)]
Updated cpp wrapper UnitTest
1) Updated code according to latest API names.
2) Added new test cases required for checking topic resource apis
Change-Id: Ib68d1a8dfe1aea2bc07d50def87cc366d4f60a84
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11503
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
jaesick.shin [Thu, 8 Sep 2016 09:03:36 +0000 (18:03 +0900)]
Add response logic for TopicListener.
Add response logic for OC_REST_POST case.
and call the NSSendTopicUpdationToConsumer().
Change-Id: I38de295bf143d504bb03cb090b6294a3d25017ec
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11565
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
KIM JungYong [Thu, 8 Sep 2016 09:02:41 +0000 (18:02 +0900)]
Update unit test and Fix bug.
Unit test is updated for apply latest consumer logic.
And unit test of basic topic operation is added.
Invalid memory access is fixed.
Change-Id: I0fd30c6e0eb3e97196e591b5754aaf38c814ffa2
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11569
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
David Antler [Tue, 6 Sep 2016 16:59:59 +0000 (09:59 -0700)]
Undo revert "Generate iotivity_config.h at build time"
This reverts commit
8754a91b157e957b0c0ade9f07804cde2b3cd225.
Change-Id: I180eea046754d3c67fc12e426b675c569df57331
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11453
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Dan Mihai [Thu, 8 Sep 2016 01:26:53 +0000 (18:26 -0700)]
[IOT-1270] Fix building with SECURED=0 for Windows
Don't try to link or export security-related APIs when SECURED=0.
Also, fix scons warning related to sqlite, in security/provisioning.
Change-Id: I61ddab0aeecdc917427bcc5051fb6be960b4b63f
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11533
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Minji Park [Thu, 8 Sep 2016 07:14:23 +0000 (16:14 +0900)]
[IOT-1259] README for cloud MQ updated
Change-Id: I9ea9e1e6ca1914bf196525506cf88621b15b9288
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11555
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Madan Lanka [Thu, 8 Sep 2016 11:05:43 +0000 (11:05 +0000)]
Revert "Development of CoAP-HTTP Proxy"
This reverts commit
fa393dc92a9ea0e8809d4474d54d916e845b2d0e.
Change-Id: Ic3754979f2d9e672437110d5ae076792cf421330
Signed-off-by: Madan Lanka <lanka.madan@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11599
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Abhishek Sharma [Mon, 22 Aug 2016 09:00:41 +0000 (14:30 +0530)]
Development of CoAP-HTTP Proxy
Wiki page: https://wiki.iotivity.org/coap-http_proxy
JIRA Issue: https://jira.iotivity.org/browse/IOT-1128
Change-Id: I14f3e6a68c83e5c2cebfedbe1a0e1247e3cb85c2
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10725
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jihwan.seo [Tue, 6 Sep 2016 10:48:03 +0000 (19:48 +0900)]
Fix cainterface crash issue
GetStaticMethodID doesn't need to use DeleteGlobalRef.
Change-Id: Ifea9490e9e7fa142d92687363436a1b8529f43a3
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11437
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
KIM JungYong [Sun, 4 Sep 2016 04:49:44 +0000 (13:49 +0900)]
Update parse logic of introspectProvider result.
When received introspect provider result,
consumer service expect to get provider policy as type of boolean.
But, policy is integer type although provider side set boolean type.
So, parse logic of policy is updated to parse for given type by received payload.
Change-Id: I695e81179172376499345f9b1f6323a04325a015
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11383
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Wed, 7 Sep 2016 05:33:14 +0000 (14:33 +0900)]
Remove NSMessage Storage of consumer service.
NSMessage storage is removed reason by unnecessariness functionality.
But, for the prevent of duplicated message, messageId and NSSyncType need to store.
So, linked list of information for message sync state is added.
Change-Id: Iea80b20a4ca44d9b17b2d3f0746d1f33212d9a3e
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11479
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Wed, 7 Sep 2016 05:11:50 +0000 (14:11 +0900)]
Add Unittest for topic.
1. Unregister topic case.
2. setTopic case.
3. unSet Topic case.
second patch,
remove warning code.
Change-Id: I8f918bcc23297311d86fcb7f4c13419b99b02d36
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11477
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Thu, 8 Sep 2016 07:36:02 +0000 (16:36 +0900)]
Add setting the icon image.
Add setting the icon image in NSSetMessagePayload.
Add NS_ATTRIBUTE_ICON_IMAGE in NSConstants.h
Change-Id: Ia1327da32c80737283ea54f8b2e9f2d4f376efb5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11559
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Hun-je Yeon [Wed, 7 Sep 2016 14:16:58 +0000 (23:16 +0900)]
Change while condition in resource broker
Removing possible infinite loop with while(1) condition
Change-Id: I07a85de3a38fad3265fd8712a8ce1c912fccf690
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11517
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Wed, 7 Sep 2016 07:38:28 +0000 (16:38 +0900)]
Update logic of callback when provider discovered.
When consumer discover already discovered provider as unsubscribing,
does not callback to upper layer before,
but we decide to callback to upper layer, so related logic is updated.
Change-Id: Iddeb4577f94f941473452ad035949aaf7c135914
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11499
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
ch79.cho [Wed, 7 Sep 2016 05:56:42 +0000 (14:56 +0900)]
remove scons build warning from sample app
gets function is changed to input function to remove warining.
Change-Id: I1f2ad5c1962f81a2321597f078baf513a1b83227
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11481
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Wed, 7 Sep 2016 06:36:29 +0000 (15:36 +0900)]
Add Macro for related resource and bug fixes for Topic.
1. Add Macro - createResource, deleteResource
2. Add NS_FAIL for fail case in NSAddTopics Function.
Change-Id: Ic94403298cf824e9d7a47de91d8c42bfa84b1460
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11489
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Wed, 7 Sep 2016 06:55:02 +0000 (15:55 +0900)]
Fix bug for callback as seperated thread.
Problem: It is degined that consumer service executes
the registered callback function in different thread
But, the registered callback function for ProviderChanged event
is called in same thread.
Fix: Separate the thread for this callback function execution
from main thread
Change-Id: Ic4c9edce1c058a7e04aa7a38fad8f66f2e586d3d
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11493
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Wed, 7 Sep 2016 00:32:52 +0000 (09:32 +0900)]
Add condition for topic of sendNotification.
topic case is Null or '\0'.
Change-Id: I216fd165145bd7523810e8636919c95f89470ef0
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11465
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Uze Choi [Thu, 8 Sep 2016 04:59:26 +0000 (04:59 +0000)]
Merge "Merge remote-tracking branch 'origin/master' into notification-service" into notification-service
Abitha Shankar [Wed, 7 Sep 2016 11:54:05 +0000 (17:24 +0530)]
Removed build warning: Two different environments in C++ wrapper
Removed unUsed variable warnings
Removed warnings for printing variables
Change-Id: I5d6ba48df298c91f46ba7388ea355bc6a833a679
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11501
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ljsachs [Mon, 8 Aug 2016 21:25:24 +0000 (14:25 -0700)]
Set unused OCDeviceInfo struct fields to NULL
Java DeviceInfo never uses the optional OCDeviceInfo fields,
these must be set to NULL to avoid potential corrupt data.
Change-Id: I7eda3be60d17591ab6169c0d487784c474f6325d
Signed-off-by: ljsachs <larry.j.sachs@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10165
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Mon, 29 Aug 2016 18:57:36 +0000 (11:57 -0700)]
build: Exit with return code from builds
[Trevor Bramwell <tbramwell@linuxfoundation.org>]
The exit code from scons calls is being silently ignored. Returning the
exit code from 'wait()' in auto_build.py and passing it to 'exit()'
should correctly fail builds.
[Philippe Coval <philippe.coval@osg.samsung.com>]
To sort out and sync ourselves, I added Bug-Id to commit message.
Content is same, feel free keep that link and push over.
Change-Id: I5afce52a3bddf7fb4e6b68acb57a1d51f3034067
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Author: Trevor Bramwell <tbramwell@linuxfoundation.org>
Bug: https://jira.iotivity.org/browse/IOT-1260
Origin: https://gerrit.iotivity.org/gerrit/#/c/11087/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11087
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: David Antler <david.a.antler@intel.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
cc [Thu, 8 Sep 2016 01:29:09 +0000 (10:29 +0900)]
Merge remote-tracking branch 'origin/master' into notification-service
Change-Id: I46af88cce1a821841baa1fe3f5226537ae1eb83b
Signed-off-by: cc <ch79.cho@samsung.com>
Jihun Ha [Wed, 7 Sep 2016 13:46:40 +0000 (22:46 +0900)]
Add dependency to build Easy setup android application
Before building Android Mediator sample application, Easy setup SDK should
be built. This patch makes such a dependency.
Change-Id: I8e9ddbeac1f5f9a3ad12e4505de4423469b94bb5
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11515
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Wed, 7 Sep 2016 08:15:46 +0000 (10:15 +0200)]
tizen: Link to systemwide's sqlite
Without this change, error may occurs and display this message:
Linking resource/csdk/liboctbstack.so
out/tizen/x86_64/release/libocsrm.a(provisioningdatabasemanager.o): In function `createDB':
provisioningdatabasemanager.c:(.text+0x2c): undefined reference to `sqlite3_open_v2'
Bug: https://jira.iotivity.org/browse/IOT-1260
Change-Id: I6fbb51d5746f7d02bb3fd15d337d5d91c592b4ec
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9623
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
George Nash [Thu, 1 Sep 2016 21:54:53 +0000 (14:54 -0700)]
Add connectivity_abstraction lib to randomtests build script
This fixed a build issue seen on fedora linux
Change-Id: Ia9e2bdcba55f4af90891b03f8247608b0920095b
Signed-off-by: George Nash <george.nash@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11309
Reviewed-by: Larry Sachs <larry.j.sachs@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Oleksii Beketov [Thu, 25 Aug 2016 14:38:07 +0000 (17:38 +0300)]
parseChain() PEM update
parseChain() from ca_adapter_net_tls.c modified in order to parse
PEM certificates. Input buffer may contain either PEM or DER
certificates in a jumble. Each PEM format certificate in a chain
must be terminated with null byte.
Change-Id: Id0e7ff5dddf4af4213dfb0ffe8a8ca05f96581a7
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10741
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Dmitriy Zhuravlev <d.zhuravlev@samsung.com>
Parkhi [Wed, 7 Sep 2016 06:12:45 +0000 (15:12 +0900)]
Changed svr db file for certification provisioning.
Change-Id: I189cd935ca3255f3b7823f59040cb17a0cb55443
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11487
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
amar [Wed, 7 Sep 2016 04:19:11 +0000 (09:49 +0530)]
corrected menu option
Change-Id: Iaaf88464ca1eca36edc78707dce826688ba1b7f9
Signed-off-by: amar <amar.sri@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11471
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Randeep Singh [Tue, 6 Sep 2016 13:11:45 +0000 (18:41 +0530)]
[IOT-1246] Resolved exception error
Change-Id: I69a1c072634e688d35617708aec3e7c32acd3878
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11441
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Md. Imtiaz Hossain <imtiaz.h@samsung.com>
jihwan.seo [Wed, 7 Sep 2016 06:50:15 +0000 (15:50 +0900)]
update TCP & ARDUINO filter in secure mode
Change-Id: I14a9d6a24b8dcac6acd7f92fbe5afee58297fdca
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11491
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Philippe Coval [Mon, 29 Aug 2016 14:06:33 +0000 (16:06 +0200)]
linux: Fix ./autobuild.py linux to build only for linux
Change-Id: Id40055ef67c1d86ec92b7939cb757f9865b12262
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11075
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Ajay Saini <ajay.saini@intel.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
sy01.youn [Tue, 6 Sep 2016 07:51:22 +0000 (16:51 +0900)]
Add WITH_TCP and WITH_CLOUD option in common build script files for tizen easy-setup sample app.
Change-Id: I909dc85679693342ae840bc229d1157a9f250d7a
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11421
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
jihwan.seo [Tue, 6 Sep 2016 08:17:53 +0000 (17:17 +0900)]
Revert "Enable disabled Configure unit tests in OCPlatformTest."
This reverts commit
3e1e7340107bbbd6cffe4e4159b5fd2c5e1e9fc0.
Change-Id: I751a67d585bafeaf075e3718429836eb89c8a27e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11425
Reviewed-by: byonggon chun <bg.chun@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Abitha Shankar [Tue, 6 Sep 2016 08:48:57 +0000 (14:18 +0530)]
1. Added sendMessage without Topics in sample application
2. Removed Discovered state from ProviderState
3. Added null checks
Change-Id: I23713dae5a610df37543776c1892927b3377a5fe
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11419
Reviewed-by: jaesick shin <jaesick.shin@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
ch79.cho [Wed, 7 Sep 2016 04:42:21 +0000 (13:42 +0900)]
remove build warning: Two different environments..
Scons warning is removed:
"Two different environments were specified for target"
Change-Id: Iba5dc62b891bb12712e4f049545008bef00b5a7a
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11475
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
David Antler [Thu, 1 Sep 2016 21:46:06 +0000 (14:46 -0700)]
Fix Arduino CI
This should fix an issue with Arduino CI introduced through a
false-positive result.
Change-Id: I0255e8f78038557ececc7e0a1ff9741a9140f346
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11307
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Wed, 7 Sep 2016 01:49:59 +0000 (10:49 +0900)]
Add a path for header inclusion for security provisioning manager functionality.
Within https://gerrit.iotivity.org/gerrit/#/c/11283/, provisioningdatabasemanager.h
has been moved to resource/csdk/security/provisioning/include/internal/.
To cope with this change, this path should be included to one of our SConcript.
Change-Id: I27c97c3d2b50394a6892d6fd94641042e4640fb4
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11467
Reviewed-by: Jongho Park <jh8397.park@samsung.com>
Reviewed-by: Heewon Park <h_w.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Randeep Singh [Tue, 6 Sep 2016 12:42:34 +0000 (18:12 +0530)]
Added SetDoxmDeviceId() API.
- Patch #1 : Initial upload.
- Patch #2 : 1. Move the PDM related files to SRM layer.
Becuase PDM PAI is required from DOXM to check owned device list.
2. Add logic to check OTM state.
Change-Id: Ib21a2984fde0f1aa4fc98e5fc246d56ef15456c8
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Signed-off-by: Randeep Singh <randeep.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11283
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
saurabh.s9 [Mon, 5 Sep 2016 06:52:44 +0000 (12:22 +0530)]
Build scripts updated for android build issue for connectivity layer
Change-Id: Ia8781f4adbf39529c763521bc6dcfb5c5b4a78c1
Signed-off-by: saurabh.s9 <saurabh.s9@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11399
Reviewed-by: Ashwini Kumar <k.ashwini@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
Heewon Park [Fri, 2 Sep 2016 05:39:43 +0000 (14:39 +0900)]
Updated cloud provisioning retry logic.
- For mediator can retry cloud-provisioning process, when missed response packet of post.
Change-Id: Id38ab1b2fe37580f590880ff8b96d28eea948a19
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11245
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jihun Ha [Mon, 5 Sep 2016 05:54:36 +0000 (14:54 +0900)]
Fix a logic to filter out an exception in createRemoteEnrollee API for Android
If a resource does not have a "oic.wk.prov" resource type, createRemoteEnrollee
API should return a NULL pointer. However, this exception has not been
handled in jni implementation. To resolve this problem, this patch make
this exception returned to android layer, properly.
Change-Id: I70d9dfbcd6cd21757e4f594abbc99902dc367681
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11395
Reviewed-by: Jongho Park <jh8397.park@samsung.com>
Reviewed-by: Sijae Kim <sijae.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Sun, 4 Sep 2016 04:49:44 +0000 (13:49 +0900)]
Update parse logic of introspectProvider result.
When received introspect provider result,
consumer service expect to get provider policy as type of boolean.
But, policy is integer type although provider side set boolean type.
So, parse logic of policy is updated to parse for given type by received payload.
Change-Id: I695e81179172376499345f9b1f6323a04325a015
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11359
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Sun, 4 Sep 2016 07:36:47 +0000 (16:36 +0900)]
Fix bug for sample and remove unused functions.
1) Bug of consumer sample app is fixed.
2) Unused function of consumer service is removed.
Change-Id: Idc7f7decdde34d8067177d84410af979f173a279
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11361
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Mon, 5 Sep 2016 07:46:51 +0000 (16:46 +0900)]
Update unit test of consumer service.
negative test case is added.
some of test case is updated.
presence stop case is added.
Change-Id: I86f1e50e6208e5a603f40b57f2d9a10e24d237ea
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11401
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
cc [Fri, 2 Sep 2016 13:57:35 +0000 (22:57 +0900)]
Required to check consumer unitest
Consumer unittest will be upgraded.
Change-Id: I758fa0ffc1e54874858fda23e76d34293c18dbd2
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit
81ac23211bdd85e636e197a2cba0cf03de2b9c40)
Reviewed-on: https://gerrit.iotivity.org/gerrit/11377
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
jaesick.shin [Mon, 5 Sep 2016 04:45:57 +0000 (13:45 +0900)]
change warning code for scanf.
add condition for scanf.
remove warning only.
Change-Id: If4912d286b6c7d78dac0bda5ffe05d6e1cdfb0cc
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11389
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Sun, 4 Sep 2016 22:17:02 +0000 (07:17 +0900)]
Hold GetTopics API return until related code finishes in the other thread
Issue: Crash happen Get Topic just after Topic registration.
(between RegistrerTopic and GetTopics/GetConsumerTopic APIs)
Fix: apply condition variable to RegistrerTopic API logic and
GetTopics/GetConsumerTopic API logic.
Other Fixes:
locking the NSProviderInterface.
modify unittest for functions of 1 and 2.
Change-Id: Ia8e75d7b21198b3d4c3810050baa0867d60eeb78
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11365
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Sun, 4 Sep 2016 22:00:10 +0000 (07:00 +0900)]
Get back to the previous code.
change input logic for example.
second patch included,
change fgets to input function.
Change-Id: Id763ae718db2daaeaeac9cc55149f6eb58183361
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11363
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Mon, 5 Sep 2016 04:17:49 +0000 (13:17 +0900)]
Logic was added when the topic list has not been registered yet.
Logic was added when consumer request of OC_REST_GET.
Change-Id: I510959517c7f1e1c506f081eb6d59b88c6f9cd22
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11385
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Minji Park [Tue, 6 Sep 2016 04:09:04 +0000 (13:09 +0900)]
fix resource-container unit test
- default callback waiting time
and test resource type for discovery test changed.
Change-Id: I1f659d488b418a7359ccfce857deb3eff6a8bb3c
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11411
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Ziran Sun [Tue, 23 Aug 2016 14:08:26 +0000 (15:08 +0100)]
Enable disabled Configure unit tests in OCPlatformTest.
Since all the functionalities called in these unit tests
are now available, enable these tests. Verification via
local tests has been done before enable any of these tests.
Change-Id: Ie5086e3394460452dd92199629017b30f1ef0030
Signed-off-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10809
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Sungkyu Ko <sungkyu.ko@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Philippe Coval [Tue, 30 Aug 2016 07:38:22 +0000 (09:38 +0200)]
gtest: Hotfix to prevent download failure
gtest-1.7.0.zip (md5=
2d6ec8ccdf5c46b05ba54a9fd1d130d7) is gone from:
https://googletest.googlecode.com/files/gtest-1.7.0.zip
So let's switch to a mirrored file:
http://pkgs.fedoraproject.org/repo/pkgs/gtest/gtest-1.7.0.zip/
2d6ec8ccdf5c46b05ba54a9fd1d130d7/gtest-1.7.0.zip
Note, now upstream project moved to:
https://github.com/google/googletest/archive/release-1.7.0.zip
But archive structure is different (configure is missing),
so a additional works are needed,
maybe it worth to be done on latest release instead (1.8.0 ATM).
Change-Id: Ib1cf308fb2d3a15bdf69246cccfd379234bbce22
Bug: https://jira.iotivity.org/browse/IOT-820
Origin: https://gerrit.iotivity.org/gerrit/#/c/11119/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jaewook Jung [Mon, 5 Sep 2016 05:50:30 +0000 (14:50 +0900)]
Revert "Generate iotivity_config.h at build time"
This reverts commit
dbcc3f47fe5abd2102750cdd3ace7f92619e8dd0.
Change-Id: I1fe54489a0d73940ca74f4abd293608c255fe645
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11393
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Heewon Park [Fri, 2 Sep 2016 05:33:37 +0000 (14:33 +0900)]
Add ifdef the code which utilizes TLS-supported APIs
provisionTrustCertChain API of Provisioning Manager is ONLY defined where TLS is supported. In easy setup, that API is used for transferring a certificate to Enrollee. So if TLS is not supported, this procedure SHOULD be skiped and not defined, even.
Change-Id: I2006d2025c794aab616cea8fb3e6144cace86b49
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Ashwini Kumar [Thu, 1 Sep 2016 14:20:44 +0000 (19:50 +0530)]
Resolved Tizen build issue
Link issue for privisioning sample in C++
undefined reference to OCLog
Change-Id: I49b0d5197dc164c7d132af88e9a3250387850b14
Signed-off-by: Ashwini Kumar <k.ashwini@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11297
Reviewed-by: Jongsung Lee <js126.lee@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: dongik Lee <dongik.lee@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
KIM JungYong [Sun, 4 Sep 2016 23:06:10 +0000 (08:06 +0900)]
Fix for build of resource container.
When build of resource container occurred build fail
by reason of can not found strlen function.
For the above reason, Standard string header is included on Configuration file.
Change-Id: I102d0e7ca5925fba59ebe95ae860517dc65328ab
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11369
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Jay Sharma [Thu, 1 Sep 2016 11:02:50 +0000 (16:32 +0530)]
[RE] Android Application build error fix.
Change-Id: Id04435b3a34ebcc0fb06f001c16b6fa63674a57a
Signed-off-by: Jay Sharma <jay.sharma@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11275
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
Reviewed-by: Abhishek Pandey <abhi.siso@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
cc [Fri, 2 Sep 2016 13:57:35 +0000 (22:57 +0900)]
Required to check consumer unitest
Consumer unittest will be upgraded.
Change-Id: I758fa0ffc1e54874858fda23e76d34293c18dbd2
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11347
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Hun-je Yeon [Sat, 3 Sep 2016 15:57:18 +0000 (00:57 +0900)]
Merge branch 'notification-service'
This patch includes the updated C++ and Android API for notification-service
Change-Id: Id25a4c1aed886a1e77c29625aac895054cb397cc
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
nikhil.a [Sat, 3 Sep 2016 13:33:53 +0000 (19:03 +0530)]
Updated Android for new API Changes
1. Modified the Consumer and Provider design and callbacks mechanism in JAVA and JNI.
2. Updated the API name changes.
3. Refracted the code
Change-Id: I51ea2eab73b575e67f336c46af9d330d0f8f8941
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11355
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
abitha.s [Sat, 3 Sep 2016 07:08:39 +0000 (12:38 +0530)]
Updated C++ wrapper for new API Changes
1. Modified the Consumer and Provider design and callbacks mechanism for adding subscribtion controlability .
2. Updated the API name changes.
3. Refracted the code
4. Added Provider State and Policy Info for Provider Object.
5. Added copy constructors for Topic and Provider object
6. Added Doxygen comments
7. Updated the Sample application to use Updated APIs
Change-Id: If071b098a9dd836c335d1d621e2e561845b593e6
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11353
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
Philippe Coval [Tue, 26 Jul 2016 17:10:02 +0000 (19:10 +0200)]
build: Propagate log facilities using pkgconfig
If built with LOGGING option,
logging facilities will be available to user using pkgconfig.
Refactored SConscript to be more extensible using a defines list too.
Bug: http://lists.iotivity.org/pipermail/iotivity-dev/2016-July/005104.html
Change-Id: I93c92dd35f4060e46d31bbe80e773b548d92fcd8
Origin: https://gerrit.iotivity.org/gerrit/#/c/9783/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9783
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Philippe Coval [Thu, 1 Sep 2016 07:30:34 +0000 (09:30 +0200)]
build: Update version to 1.2.0
As master is now based on 1.2.0-RC1, match planned release number.
Change-Id: Id16c97b76b92aabf0699ca81d70a3abb3bdb0cf0
Bug: https://jira.iotivity.org/browse/IOT/fixforversion/10501
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11261
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
jihwan.seo [Thu, 1 Sep 2016 12:02:49 +0000 (21:02 +0900)]
clean up some string parameter for MQ callback
Change-Id: Ia721b4efd2d9c18514f8e1ce3025f63952902b6e
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
David Antler [Fri, 26 Aug 2016 21:39:56 +0000 (14:39 -0700)]
Generate iotivity_config.h at build time
This patch lightens the burden for those wishing to integrate the
IoTivity CSDK into their project.
- Remove (almost) all HAVE_*_H from the command line.
- Build new file: resource/c_common/iotivity_config.h
- Include "iotivity_config.h" in headers which #include
platform-specific header files.
- Added out/*/*/*/include/c_common/iotivity_config.h which will
include the HAVE_*_H build flags.
- Export files from out/*/*/*/include/c_common/windows/include/*.h
Change-Id: Ib8a7e83c8ceb025c29b11284ee2912f95c930ca6
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10989
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Soemin Tjong <stjong@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
Uze Choi [Fri, 2 Sep 2016 13:02:03 +0000 (13:02 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service
cc [Fri, 2 Sep 2016 11:35:26 +0000 (20:35 +0900)]
Fix bug about string input
Unexpected topic message is set by fgets operation.
Change-Id: I4a7ac3d1a91baa0025426967fb54a13d3f58156d
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11341
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
cc [Thu, 1 Sep 2016 13:53:53 +0000 (22:53 +0900)]
Update resource protocol specification
Resource attributes are updated as the resource model
defined by spec document.
Change-Id: Ia20601345c4b327bf002c515696837bd84893fa5
Signed-off-by: cc <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11293
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
cc [Fri, 2 Sep 2016 11:57:41 +0000 (20:57 +0900)]
Merge branch 'master' into notification-service
Presence patch is adapted
Change-Id: Id4aa4ac5e0ff7dbbec2ca788f215b7d329a3a29e
Signed-off-by: cc <ch79.cho@samsung.com>
KIM JungYong [Fri, 2 Sep 2016 09:58:29 +0000 (18:58 +0900)]
Update Consumer C APIs.
1) Parameter as NSProvider structure is changed C string providerId.
2) NSTopicLL is seperated from NSProvider structure.
3) Topic releated API is renamed and changed return type.
4) NSUnsubscribe API is commented out.
Conflicts:
service/notification/examples/linux/notificationconsumer.c
Change-Id: Ib46ed952cdab58cb9f95eaeb4e405b7da4adeb2f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11335
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
KIM JungYong [Fri, 2 Sep 2016 05:23:42 +0000 (14:23 +0900)]
Modify to call of provider state callback.
When incomming the subscription result,
consumer service callback to upper layer every result message
although some of message was duplicated.
Provider state callback is fixed for call once as provider state(allow/deny) changed.
Change-Id: I5a8094092b33e569716475aa60b574ee5eb0e913
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11325
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
YounghyunJoo [Fri, 2 Sep 2016 04:05:44 +0000 (13:05 +0900)]
Modify Notification Consumer Example
- After deciding to remove discovry callback, discovery info is notified throgh the Provider Changed CallBack.
- we modify example code to possible to check its functionality.
Change-Id: I36af6597fa15b31d5665f2e4a0c4db2c11a8319c
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11315
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Fri, 2 Sep 2016 06:17:59 +0000 (15:17 +0900)]
change strcpy to strncpy.
strcpy function is unsafe.
Change-Id: Ifd679a4b9804861da409d4318b69502992d8ef90
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11327
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Fri, 2 Sep 2016 05:43:02 +0000 (14:43 +0900)]
Add logic for NS_FAIL Case in API.
Add NS_FAIL case in API.
Change-Id: I597cf9ed3c76aa2621aacef36305beb01130d11a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11323
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Fri, 2 Sep 2016 04:40:48 +0000 (13:40 +0900)]
Bug fixes for Unlock.
Bug fixes unlock logic for NSProviderDeleteConsumerTopic Function.
Change-Id: Ibe27134f38b8e12b0d767df03aabd049f16431b9
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11317
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
jaesick.shin [Fri, 2 Sep 2016 04:02:22 +0000 (13:02 +0900)]
Change dereference code.
Added check logic for dereference code.
Change-Id: If34fe346803b7ccc9c3eb21056790c1e030bd14a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11313
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
projects / contrib / iotivity.git / log