X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsamples%2Flinux%2Fsecure%2Focclientdirectpairing.cpp;h=74dd8226fb0e24ed1093639c003b92c7ab1d5c60;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=5ae096b5f9e68664e2c129488264bbc20e921f85;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp b/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp index 5ae096b..74dd822 100644 --- a/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp +++ b/resource/csdk/stack/samples/linux/secure/occlientdirectpairing.cpp @@ -61,8 +61,8 @@ static char DISCOVERY_QUERY[] = "%s/oic/res"; //Secure Virtual Resource database for Iotivity Client application //It contains Client's Identity and the PSK credentials //of other devices which the client trusts -static char CRED_FILE[] = "oic_svr_db_client_directpairing.dat"; - +static char CRED_FILE[] = "oic_svr_db_client_directpairing.dat"; + static const OCDPDev_t *discoveredDevs = NULL; static const OCDPDev_t *pairedDevs = NULL; @@ -335,8 +335,8 @@ int DeviceDiscovery() /* Start a discovery query*/ OIC_LOG_V(INFO, TAG, "Resource Discovery : %s\n", queryUri); - ret = OCDoResource(NULL, OC_REST_DISCOVER, queryUri, 0, 0, CT_DEFAULT, - OC_LOW_QOS, &cbData, NULL, 0); + ret = OCDoRequest(NULL, OC_REST_DISCOVER, queryUri, 0, 0, CT_DEFAULT, + OC_LOW_QOS, &cbData, NULL, 0); if (ret != OC_STACK_OK) { OIC_LOG(ERROR, TAG, "OCStack resource error"); @@ -400,8 +400,8 @@ OCStackResult SendGetRequest(OCDPDev_t* peer) cbData.cd = NULL; OIC_LOG(INFO, TAG, "Request to /a/light "); - ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, - &endpoint, NULL, peer->connType, OC_LOW_QOS, &cbData, NULL, 0); + ret = OCDoRequest(&handle, OC_REST_GET, szQueryUri, + &endpoint, NULL, peer->connType, OC_LOW_QOS, &cbData, NULL, 0); if (ret != OC_STACK_OK) { OIC_LOG_V(ERROR, TAG, "OCDoResource returns error %d with method %d", ret, OC_REST_GET); @@ -527,8 +527,8 @@ void *CLInterface(void *data) OIC_LOG(ERROR, TAG, "Invalid PIN"); continue; } - sscanf(input, "%8s", pinNumber); - printf("\n"); + sscanf(input, "%8s", pinNumber); + printf("\n"); ret = DoDirectPairing(peer, pmSel, pinNumber); if (OC_STACK_OK != ret)