From 4da1e5ea6eb24f5fd4b12f366313dd6ffb1e8010 Mon Sep 17 00:00:00 2001 From: Ashwini Kumar Date: Fri, 7 Oct 2016 12:06:34 +0530 Subject: [PATCH] Modified CloudClient (CPP) to use DEFAULT_PORT 5683 Change-Id: I32c5d5c7e373250ac2af3354c5a345a02d4cdbea Signed-off-by: Ashwini Kumar Reviewed-on: https://gerrit.iotivity.org/gerrit/12935 Tested-by: jenkins-iotivity Reviewed-by: Randeep Singh Reviewed-on: https://gerrit.iotivity.org/gerrit/13017 --- resource/include/OCCloudProvisioning.h | 1 + resource/provisioning/examples/cloudClient.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/resource/include/OCCloudProvisioning.h b/resource/include/OCCloudProvisioning.h index deb5250..491f68a 100755 --- a/resource/include/OCCloudProvisioning.h +++ b/resource/include/OCCloudProvisioning.h @@ -26,6 +26,7 @@ #include "occloudprovisioning.h" #include "OCApi.h" #include "OCPlatform_impl.h" +#include "CAManager.h" namespace OC { diff --git a/resource/provisioning/examples/cloudClient.cpp b/resource/provisioning/examples/cloudClient.cpp index a933cf2..a546bed 100644 --- a/resource/provisioning/examples/cloudClient.cpp +++ b/resource/provisioning/examples/cloudClient.cpp @@ -42,7 +42,7 @@ #define TAG "cloudClient" using namespace OC; -#define DEFAULT_HOST "10.113.68.85"//"127.0.0.1" +#define DEFAULT_HOST "127.0.0.1" #define DEFAULT_PORT OC_MULTICAST_PORT #define DEFAULT_DEVICEID "6A757374-776F-726B-4465-765575696430" #define DEFAULT_USERID "6A757374-776F-726B-4465-765575696430" @@ -63,8 +63,8 @@ static uint16_t g_credId = 0; oc_cond cond; oc_mutex mutex; -std::string ip(""); -OCCloudProvisioning g_cloudProv(ip, 0); +std::string ip(DEFAULT_HOST); +OCCloudProvisioning g_cloudProv(ip, (uint16_t)DEFAULT_PORT); typedef enum { SIGN_UP = 1, @@ -187,9 +187,9 @@ void printMenu() void handleCB(void* ctx, OCStackResult result, void* data) { OC_UNUSED(ctx); - OC_UNUSED(result); OC_UNUSED(data); + printf("Cloud request Result is == %d", result); oc_mutex_lock(mutex); oc_cond_signal(cond); oc_mutex_unlock(mutex); @@ -197,9 +197,9 @@ void handleCB(void* ctx, OCStackResult result, void* data) void handleCB1(OCStackResult result, void *data) { - OC_UNUSED(result); OC_UNUSED(data); + printf("Cloud request Result is == %d", result); oc_mutex_lock(mutex); oc_cond_signal(cond); oc_mutex_unlock(mutex); @@ -207,8 +207,8 @@ void handleCB1(OCStackResult result, void *data) void handleCB2(OCStackResult result, std::string data) { - OC_UNUSED(result); - OC_UNUSED(data); + printf("Cloud request Result is == %d", result); + printf("ACL ID for the device is == %s", data.c_str()); oc_mutex_lock(mutex); oc_cond_signal(cond); @@ -391,7 +391,7 @@ static void userRequests(void *data) res = OCWrapperCertificateIssueRequest( g_cloudProv, handleCB1); break; case USE_RSA: -// CASelectCipherSuite(0x35, CA_ADAPTER_TCP); + res = CAManager::setCipherSuite(0x35, OC_ADAPTER_TCP); break; case SAVE_TRUST_CERT: saveTrustCert(); -- 2.7.4