From 92a40d711d88dddba9476640e8b8204c2f60b0ba Mon Sep 17 00:00:00 2001 From: "js126.lee" Date: Fri, 18 Mar 2016 15:40:08 +0900 Subject: [PATCH] Add timeout into checking invalid input condition - Patch 1: If timeout is 0, return error. - Patch 2: Add unittest - Patch 3: Modify file mode Change-Id: I571615ffe4d00dc1feff94d9b39525eabc75d215 Signed-off-by: js126.lee Reviewed-on: https://gerrit.iotivity.org/gerrit/6061 Reviewed-by: Yonggoo Kang Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh --- .../csdk/security/provisioning/src/ocprovisioningmanager.c | 6 +++--- .../provisioning/unittest/ocprovisioningmanager.cpp | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c index 9153740..7ac40d9 100644 --- a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c +++ b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c @@ -76,7 +76,7 @@ OCStackResult OCInitPM(const char* dbPath) */ OCStackResult OCDiscoverUnownedDevices(unsigned short timeout, OCProvisionDev_t **ppList) { - if( ppList == NULL || *ppList != NULL) + if( ppList == NULL || *ppList != NULL || 0 == timeout) { return OC_STACK_INVALID_PARAM; } @@ -95,7 +95,7 @@ OCStackResult OCDiscoverUnownedDevices(unsigned short timeout, OCProvisionDev_t */ OCStackResult OCDiscoverOwnedDevices(unsigned short timeout, OCProvisionDev_t **ppList) { - if( ppList == NULL || *ppList != NULL) + if( ppList == NULL || *ppList != NULL || 0 == timeout) { return OC_STACK_INVALID_PARAM; } @@ -621,7 +621,7 @@ OCStackResult OCGetDevInfoFromNetwork(unsigned short waittime, { //TODO will be replaced by more efficient logic if (pOwnedDevList == NULL || *pOwnedDevList != NULL || pUnownedDevList == NULL - || *pUnownedDevList != NULL) + || *pUnownedDevList != NULL || 0 == waittime) { return OC_STACK_INVALID_PARAM; } diff --git a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp index 2e38f6b..8bc94b7 100644 --- a/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp +++ b/resource/csdk/security/provisioning/unittest/ocprovisioningmanager.cpp @@ -70,14 +70,23 @@ TEST(OCRemoveDeviceTest, ZeroWaitTime) TEST(OCGetDevInfoFromNetworkTest, NullUnOwnedDeviceInfo) { + unsigned short waitTime = 10; OCProvisionDev_t *ownedList = NULL; - EXPECT_EQ(OC_STACK_INVALID_PARAM, OCGetDevInfoFromNetwork(0, &ownedList, NULL)); + EXPECT_EQ(OC_STACK_INVALID_PARAM, OCGetDevInfoFromNetwork(waitTime, &ownedList, NULL)); } TEST(OCGetDevInfoFromNetworkTest, NullOwnedDeviceInfo) { + unsigned short waitTime = 10; OCProvisionDev_t *unownedList = NULL; - EXPECT_EQ(OC_STACK_INVALID_PARAM, OCGetDevInfoFromNetwork(0, NULL, &unownedList)); + EXPECT_EQ(OC_STACK_INVALID_PARAM, OCGetDevInfoFromNetwork(waitTime, NULL, &unownedList)); +} + +TEST(OCGetDevInfoFromNetworkTest, ZeroWaitTime) +{ + unsigned short waitTime = 0; + OCProvisionDev_t *ownedList; + EXPECT_EQ(OC_STACK_INVALID_PARAM, OCGetDevInfoFromNetwork(waitTime, &ownedList, NULL)); } TEST(OCGetLinkedStatusTest, NULLDeviceID) -- 2.7.4