From: Sakthivel Samidurai Date: Thu, 12 Feb 2015 19:23:29 +0000 (-0300) Subject: Fix C samples format and style X-Git-Tag: 0.9.1-alpha1~38^2~170 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3abe9bc917d3a3440c87bf1be0ccf566df42de64;p=contrib%2Fiotivity.git Fix C samples format and style Fix lines that exceed 100 characters limit and format style. Change-Id: I86ac0fc29ae037034da6f643934484bce93fc52f Signed-off-by: Sakthivel Samidurai Reviewed-on: https://gerrit.iotivity.org/gerrit/336 Tested-by: jenkins-iotivity Reviewed-by: Sudarshan Prasad --- diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/common.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/common.cpp index af0c749..e398c98 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/common.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/common.cpp @@ -22,65 +22,70 @@ #include #include -const char *getResult(OCStackResult result) { - switch (result) { - case OC_STACK_OK: - return "OC_STACK_OK"; - case OC_STACK_RESOURCE_CREATED: - return "OC_STACK_RESOURCE_CREATED"; - case OC_STACK_RESOURCE_DELETED: - return "OC_STACK_RESOURCE_DELETED"; - case OC_STACK_INVALID_URI: - return "OC_STACK_INVALID_URI"; - case OC_STACK_INVALID_QUERY: - return "OC_STACK_INVALID_QUERY"; - case OC_STACK_INVALID_IP: - return "OC_STACK_INVALID_IP"; - case OC_STACK_INVALID_PORT: - return "OC_STACK_INVALID_PORT"; - case OC_STACK_INVALID_CALLBACK: - return "OC_STACK_INVALID_CALLBACK"; - case OC_STACK_INVALID_METHOD: - return "OC_STACK_INVALID_METHOD"; - case OC_STACK_NO_MEMORY: - return "OC_STACK_NO_MEMORY"; - case OC_STACK_COMM_ERROR: - return "OC_STACK_COMM_ERROR"; - case OC_STACK_INVALID_PARAM: - return "OC_STACK_INVALID_PARAM"; - case OC_STACK_NOTIMPL: - return "OC_STACK_NOTIMPL"; - case OC_STACK_NO_RESOURCE: - return "OC_STACK_NO_RESOURCE"; - case OC_STACK_RESOURCE_ERROR: - return "OC_STACK_RESOURCE_ERROR"; - case OC_STACK_SLOW_RESOURCE: - return "OC_STACK_SLOW_RESOURCE"; - case OC_STACK_NO_OBSERVERS: - return "OC_STACK_NO_OBSERVERS"; - #ifdef WITH_PRESENCE - case OC_STACK_VIRTUAL_DO_NOT_HANDLE: - return "OC_STACK_VIRTUAL_DO_NOT_HANDLE"; - case OC_STACK_PRESENCE_STOPPED: - return "OC_STACK_PRESENCE_STOPPED"; - case OC_STACK_PRESENCE_TIMEOUT: - return "OC_STACK_PRESENCE_TIMEOUT"; - #endif - case OC_STACK_ERROR: - return "OC_STACK_ERROR"; - default: - return "UNKNOWN"; +const char *getResult(OCStackResult result) +{ + switch (result) + { + case OC_STACK_OK: + return "OC_STACK_OK"; + case OC_STACK_RESOURCE_CREATED: + return "OC_STACK_RESOURCE_CREATED"; + case OC_STACK_RESOURCE_DELETED: + return "OC_STACK_RESOURCE_DELETED"; + case OC_STACK_INVALID_URI: + return "OC_STACK_INVALID_URI"; + case OC_STACK_INVALID_QUERY: + return "OC_STACK_INVALID_QUERY"; + case OC_STACK_INVALID_IP: + return "OC_STACK_INVALID_IP"; + case OC_STACK_INVALID_PORT: + return "OC_STACK_INVALID_PORT"; + case OC_STACK_INVALID_CALLBACK: + return "OC_STACK_INVALID_CALLBACK"; + case OC_STACK_INVALID_METHOD: + return "OC_STACK_INVALID_METHOD"; + case OC_STACK_NO_MEMORY: + return "OC_STACK_NO_MEMORY"; + case OC_STACK_COMM_ERROR: + return "OC_STACK_COMM_ERROR"; + case OC_STACK_INVALID_PARAM: + return "OC_STACK_INVALID_PARAM"; + case OC_STACK_NOTIMPL: + return "OC_STACK_NOTIMPL"; + case OC_STACK_NO_RESOURCE: + return "OC_STACK_NO_RESOURCE"; + case OC_STACK_RESOURCE_ERROR: + return "OC_STACK_RESOURCE_ERROR"; + case OC_STACK_SLOW_RESOURCE: + return "OC_STACK_SLOW_RESOURCE"; + case OC_STACK_NO_OBSERVERS: + return "OC_STACK_NO_OBSERVERS"; +#ifdef WITH_PRESENCE + case OC_STACK_VIRTUAL_DO_NOT_HANDLE: + return "OC_STACK_VIRTUAL_DO_NOT_HANDLE"; + case OC_STACK_PRESENCE_STOPPED: + return "OC_STACK_PRESENCE_STOPPED"; + case OC_STACK_PRESENCE_TIMEOUT: + return "OC_STACK_PRESENCE_TIMEOUT"; +#endif + case OC_STACK_ERROR: + return "OC_STACK_ERROR"; + default: + return "UNKNOWN"; } } -void StripNewLineChar(char* str) { +void StripNewLineChar(char* str) +{ int i = 0; if (str) { while( str[i]) { if (str[i] == '\n') + { str[i] = '\0'; + } i++; } } diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp index cb22f4f..1d0a6a6 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp @@ -62,8 +62,10 @@ int gNumPresenceNotifies = 0; int gQuitFlag = 0; /* SIGINT handler: set gQuitFlag to 1 for graceful termination */ -void handleSigInt(int signum) { - if (signum == SIGINT) { +void handleSigInt(int signum) +{ + if (signum == SIGINT) + { gQuitFlag = 1; } } @@ -79,20 +81,20 @@ static void PrintUsage() OC_LOG(INFO, TAG, "-t 4 : Discover Resources and Initiate Nonconfirmable Post Requests"); OC_LOG(INFO, TAG, "-t 5 : Discover Resources and Initiate Nonconfirmable Delete Requests"); OC_LOG(INFO, TAG, "-t 6 : Discover Resources and Initiate Nonconfirmable Observe Requests"); - OC_LOG(INFO, TAG, "-t 7 : Discover Resources and Initiate Nonconfirmable Get Request for a resource which is unavailable"); - + OC_LOG(INFO, TAG, "-t 7 : Discover Resources and Initiate Nonconfirmable Get Request "\ + "for a resource which is unavailable"); OC_LOG(INFO, TAG, "-t 8 : Discover Resources and Initiate Confirmable Get Request"); OC_LOG(INFO, TAG, "-t 9 : Discover Resources and Initiate Confirmable Post Request"); OC_LOG(INFO, TAG, "-t 10 : Discover Resources and Initiate Confirmable Delete Requests"); OC_LOG(INFO, TAG, "-t 11 : Discover Resources and Initiate Confirmable Observe Requests"); - #ifdef WITH_PRESENCE +#ifdef WITH_PRESENCE OC_LOG(INFO, TAG, "-t 12 : Discover Resources and Initiate Nonconfirmable presence"); OC_LOG(INFO, TAG, "-t 13 : Discover Resources and Initiate Nonconfirmable presence with "\ "filter"); OC_LOG(INFO, TAG, "-t 14 : Discover Resources and Initiate Nonconfirmable presence with "\ "2 filters"); - #endif +#endif OC_LOG(INFO, TAG, "-t 15 : Discover Resources and Initiate Nonconfirmable Observe Requests "\ "then cancel immediately"); @@ -102,8 +104,11 @@ static void PrintUsage() } OCStackResult InvokeOCDoResource(std::ostringstream &query, - OCMethod method, OCQualityOfService qos, - OCClientResponseHandler cb, OCHeaderOption * options, uint8_t numOptions) + OCMethod method, + OCQualityOfService qos, + OCClientResponseHandler cb, + OCHeaderOption * options, + uint8_t numOptions) { OCStackResult ret; OCCallbackData cbData; @@ -125,17 +130,18 @@ OCStackResult InvokeOCDoResource(std::ostringstream &query, { gObserveDoHandle = handle; } - #ifdef WITH_PRESENCE +#ifdef WITH_PRESENCE else if (method == OC_REST_PRESENCE) { gPresenceHandle = handle; } - #endif +#endif return ret; } -OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) { +OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) +{ if(ctx == (void*)DEFAULT_CONTEXT_VALUE) { OC_LOG(INFO, TAG, "Callback Context for PUT recvd successfully"); @@ -144,7 +150,8 @@ OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse if(clientResponse) { OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - OC_LOG_V(INFO, TAG, "JSON = %s =============> Put Response", clientResponse->resJSONPayload); + OC_LOG_V(INFO, TAG, "JSON = %s =============> Put Response", + clientResponse->resJSONPayload); } return OC_STACK_DELETE_TRANSACTION; } @@ -159,12 +166,14 @@ OCStackApplicationResult postReqCB(void *ctx, OCDoHandle handle, OCClientRespons if(clientResponse) { OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - OC_LOG_V(INFO, TAG, "JSON = %s =============> Post Response", clientResponse->resJSONPayload); + OC_LOG_V(INFO, TAG, "JSON = %s =============> Post Response", + clientResponse->resJSONPayload); } return OC_STACK_DELETE_TRANSACTION; } -OCStackApplicationResult deleteReqCB(void *ctx, OCDoHandle handle, OCClientResponse *clientResponse) +OCStackApplicationResult deleteReqCB(void *ctx, + OCDoHandle handle, OCClientResponse *clientResponse) { if(ctx == (void*)DEFAULT_CONTEXT_VALUE) { @@ -174,7 +183,8 @@ OCStackApplicationResult deleteReqCB(void *ctx, OCDoHandle handle, OCClientRespo if(clientResponse) { OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - OC_LOG_V(INFO, TAG, "JSON = %s =============> Delete Response", clientResponse->resJSONPayload); + OC_LOG_V(INFO, TAG, "JSON = %s =============> Delete Response", + clientResponse->resJSONPayload); } return OC_STACK_DELETE_TRANSACTION; } @@ -215,7 +225,8 @@ OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse return OC_STACK_DELETE_TRANSACTION; } -OCStackApplicationResult obsReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) { +OCStackApplicationResult obsReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) +{ if(ctx == (void*)DEFAULT_CONTEXT_VALUE) { OC_LOG(INFO, TAG, "Callback Context for OBS query recvd successfully"); @@ -225,28 +236,40 @@ OCStackApplicationResult obsReqCB(void* ctx, OCDoHandle handle, OCClientResponse { OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber); - OC_LOG_V(INFO, TAG, "Callback Context for OBSERVE notification recvd successfully %d", gNumObserveNotifies); - OC_LOG_V(INFO, TAG, "JSON = %s =============> Obs Response", clientResponse->resJSONPayload); + OC_LOG_V(INFO, TAG, "Callback Context for OBSERVE notification recvd successfully %d", + gNumObserveNotifies); + OC_LOG_V(INFO, TAG, "JSON = %s =============> Obs Response", + clientResponse->resJSONPayload); gNumObserveNotifies++; - if (gNumObserveNotifies == 3) //large number to test observing in DELETE case. + if (gNumObserveNotifies == 3) //large number to test observing in DELETE case. { - if(TEST_CASE == TEST_OBS_REQ_NON || TEST_CASE == TEST_OBS_REQ_CON){ - if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK){ + if(TEST_CASE == TEST_OBS_REQ_NON || TEST_CASE == TEST_OBS_REQ_CON) + { + if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "Observe cancel error"); } return OC_STACK_DELETE_TRANSACTION; - }else if(TEST_CASE == TEST_OBS_REQ_NON_CANCEL_IMM){ - if (OCCancel (gObserveDoHandle, OC_HIGH_QOS, NULL, 0) != OC_STACK_OK){ + } + else if(TEST_CASE == TEST_OBS_REQ_NON_CANCEL_IMM) + { + if (OCCancel (gObserveDoHandle, OC_HIGH_QOS, NULL, 0) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "Observe cancel error"); } } } - if(clientResponse->sequenceNumber == OC_OBSERVE_REGISTER){ + if(clientResponse->sequenceNumber == OC_OBSERVE_REGISTER) + { OC_LOG(INFO, TAG, "This also serves as a registration confirmation"); - }else if(clientResponse->sequenceNumber == OC_OBSERVE_DEREGISTER){ + } + else if(clientResponse->sequenceNumber == OC_OBSERVE_DEREGISTER) + { OC_LOG(INFO, TAG, "This also serves as a deregistration confirmation"); return OC_STACK_DELETE_TRANSACTION; - }else if(clientResponse->sequenceNumber == OC_OBSERVE_NO_OPTION){ + } + else if(clientResponse->sequenceNumber == OC_OBSERVE_NO_OPTION) + { OC_LOG(INFO, TAG, "This also tells you that registration/deregistration failed"); return OC_STACK_DELETE_TRANSACTION; } @@ -254,22 +277,26 @@ OCStackApplicationResult obsReqCB(void* ctx, OCDoHandle handle, OCClientResponse return OC_STACK_KEEP_TRANSACTION; } #ifdef WITH_PRESENCE -OCStackApplicationResult presenceCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) { - if(ctx == (void*)DEFAULT_CONTEXT_VALUE) +OCStackApplicationResult presenceCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) +{ + if (ctx == (void*) DEFAULT_CONTEXT_VALUE) { OC_LOG(INFO, TAG, "Callback Context for Presence recvd successfully"); } - if(clientResponse) + if (clientResponse) { - OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); + OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); OC_LOG_V(INFO, TAG, "NONCE NUMBER: %u", clientResponse->sequenceNumber); - OC_LOG_V(INFO, TAG, "Callback Context for Presence notification recvd successfully %d", gNumPresenceNotifies); - OC_LOG_V(INFO, TAG, "JSON = %s =============> Presence Response", clientResponse->resJSONPayload); + OC_LOG_V(INFO, TAG, "Callback Context for Presence notification recvd successfully %d", + gNumPresenceNotifies); + OC_LOG_V(INFO, TAG, "JSON = %s =============> Presence Response", + clientResponse->resJSONPayload); gNumPresenceNotifies++; if (gNumPresenceNotifies == 20) { - if (OCCancel (gPresenceHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK){ + if (OCCancel(gPresenceHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "Presence cancel error"); } return OC_STACK_DELETE_TRANSACTION; @@ -281,7 +308,8 @@ OCStackApplicationResult presenceCB(void* ctx, OCDoHandle handle, OCClientRespon // This is a function called back when a device is discovered OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle handle, - OCClientResponse * clientResponse) { + OCClientResponse * clientResponse) +{ uint8_t remoteIpAddr[4]; uint16_t remotePortNu; @@ -340,13 +368,13 @@ OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle handle, case TEST_OBS_REQ_CON: InitObserveRequest(OC_HIGH_QOS); break; - #ifdef WITH_PRESENCE +#ifdef WITH_PRESENCE case TEST_OBS_PRESENCE: case TEST_OBS_PRESENCE_WITH_FILTER: case TEST_OBS_PRESENCE_WITH_FILTERS: InitPresence(); break; - #endif +#endif case TEST_GET_REQ_NON_WITH_VENDOR_HEADER_OPTIONS: InitGetRequest(OC_LOW_QOS, 1); break; @@ -426,7 +454,8 @@ int InitObserveRequest(OCQualityOfService qos) OC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__); std::ostringstream query; query << "coap://" << coapServerIP << ":" << coapServerPort << coapServerResource; - return (InvokeOCDoResource(query, OC_REST_OBSERVE, (qos == OC_HIGH_QOS)? OC_HIGH_QOS:OC_LOW_QOS, obsReqCB, NULL, 0)); + return (InvokeOCDoResource(query, + OC_REST_OBSERVE, (qos == OC_HIGH_QOS)? OC_HIGH_QOS:OC_LOW_QOS, obsReqCB, NULL, 0)); } int InitPutRequest() @@ -471,7 +500,7 @@ int InitPostRequest(OCQualityOfService qos) void* RequestDeleteDeathResourceTask(void* myqos) { - sleep (30); //long enough to give the server time to finish deleting the resource. + sleep (30);//long enough to give the server time to finish deleting the resource. std::ostringstream query; query << "coap://" << coapServerIP << ":" << coapServerPort << coapServerResource; @@ -480,9 +509,13 @@ void* RequestDeleteDeathResourceTask(void* myqos) // Second DELETE operation to delete the resource that might have been removed already. OCQualityOfService qos; if (myqos == NULL) + { qos = OC_LOW_QOS; + } else + { qos = OC_HIGH_QOS; + } OCStackResult result = InvokeOCDoResource(query, OC_REST_DELETE, qos, @@ -532,10 +565,10 @@ int InitGetRequest(OCQualityOfService qos, uint8_t withVendorSpecificHeaderOptio std::ostringstream query; query << "coap://" << coapServerIP << ":" << coapServerPort << coapServerResource; - if(withVendorSpecificHeaderOptions) + if (withVendorSpecificHeaderOptions) { - uint8_t option0[] = {1,2,3,4,5,6,7,8,9,10}; - uint8_t option1[] = {11,12,13,14,15,16,17,18,19,20}; + uint8_t option0[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; + uint8_t option1[] = { 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 }; memset(options, 0, sizeof(OCHeaderOption) * MAX_HEADER_OPTIONS); options[0].protocolID = OC_COAP_ID; options[0].optionID = 2048; @@ -546,13 +579,15 @@ int InitGetRequest(OCQualityOfService qos, uint8_t withVendorSpecificHeaderOptio memcpy(options[1].optionData, option1, sizeof(option1)); options[1].optionLength = 10; } - if(withVendorSpecificHeaderOptions) + if (withVendorSpecificHeaderOptions) { - return (InvokeOCDoResource(query, OC_REST_GET, (qos == OC_HIGH_QOS)? OC_HIGH_QOS:OC_LOW_QOS, getReqCB, options, 2)); + return (InvokeOCDoResource(query, OC_REST_GET, + (qos == OC_HIGH_QOS) ? OC_HIGH_QOS : OC_LOW_QOS, getReqCB, options, 2)); } else { - return (InvokeOCDoResource(query, OC_REST_GET, (qos == OC_HIGH_QOS)? OC_HIGH_QOS:OC_LOW_QOS, getReqCB, NULL, 0)); + return (InvokeOCDoResource(query, OC_REST_GET, + (qos == OC_HIGH_QOS) ? OC_HIGH_QOS : OC_LOW_QOS, getReqCB, NULL, 0)); } } @@ -633,7 +668,8 @@ int InitDiscovery() return ret; } -int main(int argc, char* argv[]) { +int main(int argc, char* argv[]) +{ int opt; while ((opt = getopt(argc, argv, "u:t:c:")) != -1) @@ -663,7 +699,8 @@ int main(int argc, char* argv[]) { } /* Initialize OCStack*/ - if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK) { + if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack init error"); return 0; } @@ -672,7 +709,7 @@ int main(int argc, char* argv[]) { printf("Enter IPv4 address of the Server hosting resource (Ex: 192.168.0.15)\n"); if (fgets(ipv4addr, IPV4_ADDR_SIZE, stdin)) { - //Strip newline char from ipv4addr + //Strip newline char from ipv4addr StripNewLineChar(ipv4addr); } else @@ -694,9 +731,11 @@ int main(int argc, char* argv[]) { // Break from loop with Ctrl+C OC_LOG(INFO, TAG, "Entering occlient main loop..."); signal(SIGINT, handleSigInt); - while (!gQuitFlag) { + while (!gQuitFlag) + { - if (OCProcess() != OC_STACK_OK) { + if (OCProcess() != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack process error"); return 0; } @@ -705,29 +744,51 @@ int main(int argc, char* argv[]) { } OC_LOG(INFO, TAG, "Exiting occlient main loop..."); - if (OCStop() != OC_STACK_OK) { + if (OCStop() != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack stop error"); } return 0; } -std::string getIPAddrTBServer(OCClientResponse * clientResponse) { - if(!clientResponse) return ""; - if(!clientResponse->addr) return ""; +std::string getIPAddrTBServer(OCClientResponse * clientResponse) +{ + if (!clientResponse) + { + return ""; + } + if (!clientResponse->addr) + { + return ""; + } uint8_t a, b, c, d = 0; - if(0 != OCDevAddrToIPv4Addr(clientResponse->addr, &a, &b, &c, &d) ) return ""; + if (0 != OCDevAddrToIPv4Addr(clientResponse->addr, &a, &b, &c, &d)) + { + return ""; + } char ipaddr[16] = {'\0'}; - snprintf(ipaddr, sizeof(ipaddr), "%d.%d.%d.%d", a,b,c,d); // ostringstream not working correctly here, hence snprintf + // ostringstream not working correctly here, hence snprintf + snprintf(ipaddr, sizeof(ipaddr), "%d.%d.%d.%d", a,b,c,d); return std::string (ipaddr); } -std::string getPortTBServer(OCClientResponse * clientResponse){ - if(!clientResponse) return ""; - if(!clientResponse->addr) return ""; +std::string getPortTBServer(OCClientResponse * clientResponse) +{ + if (!clientResponse) + { + return ""; + } + if (!clientResponse->addr) + { + return ""; + } uint16_t p = 0; - if(0 != OCDevAddrToPort(clientResponse->addr, &p) ) return ""; + if (0 != OCDevAddrToPort(clientResponse->addr, &p)) + { + return ""; + } std::ostringstream ss; ss << p; return ss.str(); @@ -754,12 +815,14 @@ std::string getConnectivityType (OCConnectivityType connType) } } -std::string getQueryStrForGetPut(OCClientResponse * clientResponse){ +std::string getQueryStrForGetPut(OCClientResponse * clientResponse) +{ return "/a/light"; } -void parseClientResponse(OCClientResponse * clientResponse){ +void parseClientResponse(OCClientResponse * clientResponse) +{ coapServerIP = getIPAddrTBServer(clientResponse); coapServerPort = getPortTBServer(clientResponse); coapServerResource = getQueryStrForGetPut(clientResponse); diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp index 06059bf..f90d4bc 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp @@ -52,7 +52,8 @@ static const char * MULTICAST_RESOURCE_DISCOVERY_QUERY = "/oc/core"; int gQuitFlag = 0; -namespace { +namespace +{ typedef std::pair extract_result_t; typedef std::string sid_t; typedef std::set SID_set_t; @@ -114,7 +115,8 @@ OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse if(clientResponse) { OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - OC_LOG_V(INFO, TAG, "JSON = %s =============> Put Response", clientResponse->resJSONPayload); + OC_LOG_V(INFO, TAG, "JSON = %s =============> Put Response", + clientResponse->resJSONPayload); } return OC_STACK_DELETE_TRANSACTION; } @@ -380,8 +382,14 @@ int main(int argc, char* argv[]) std::string getIPAddrTBServer(OCClientResponse * clientResponse) { - if(!clientResponse) return ""; - if(!clientResponse->addr) return ""; + if (!clientResponse) + { + return ""; + } + if (!clientResponse->addr) + { + return ""; + } uint8_t a, b, c, d = 0; if(0 != OCDevAddrToIPv4Addr(clientResponse->addr, &a, &b, &c, &d) ) return ""; @@ -394,10 +402,19 @@ std::string getIPAddrTBServer(OCClientResponse * clientResponse) std::string getPortTBServer(OCClientResponse * clientResponse) { - if(!clientResponse) return ""; - if(!clientResponse->addr) return ""; + if (!clientResponse) + { + return ""; + } + if (!clientResponse->addr) + { + return ""; + } uint16_t p = 0; - if(0 != OCDevAddrToPort(clientResponse->addr, &p) ) return ""; + if (0 != OCDevAddrToPort(clientResponse->addr, &p)) + { + return ""; + } std::ostringstream ss; ss << p; return ss.str(); @@ -420,7 +437,8 @@ extract_result_t extract_value(const std::string& search_key, const std::string& const size_t key_edge = key_mark + key.length(); const size_t val_mark = input.find_first_of("\"", key_edge); - if(std::string::npos == key_mark || std::string::npos == val_mark) { + if(std::string::npos == key_mark || std::string::npos == val_mark) + { std::ostringstream os; os << "extract_value(): \"" << search_key << "\" not found in input"; @@ -458,19 +476,25 @@ void collateSIDs(const OCClientResponse * clientResponse, const std::string& ser const extract_result_t sid_result = parseSID(clientResponse); - if(false == sid_result.first) - return; + if (false == sid_result.first) + { + return; + } const sid_t& sid = sid_result.second; /* ...there's no need for an application to take any special action, but we can tell - if we've seen a resource before, regardless of the transport it arrive on: */ + if we've seen a resource before, regardless of the transport it arrive on: */ std::ostringstream msg; - if(not sids.insert(sid).second) - msg << "SID " << sid << " has been seen before.\n"; + if (not sids.insert(sid).second) + { + msg << "SID " << sid << " has been seen before.\n"; + } else - msg << "SID " << sid << " is new.\n"; + { + msg << "SID " << sid << " is new.\n"; + } OC_LOG(INFO, TAG, msg.str().c_str()); } diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp index c69caf1..99bd9cd 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp @@ -38,7 +38,8 @@ std::string getQueryStrForGetPut(unsigned const char * responsePayload); #define MAX_LENGTH_IPv4_ADDR 16 #endif -typedef enum { +typedef enum +{ TEST_INVALID = 0, TEST_GET_DEFAULT, TEST_GET_BATCH, @@ -87,8 +88,10 @@ int gNumObserveNotifies = 1; int gQuitFlag = 0; /* SIGINT handler: set gQuitFlag to 1 for graceful termination */ -void handleSigInt(int signum) { - if (signum == SIGINT) { +void handleSigInt(int signum) +{ + if (signum == SIGINT) + { gQuitFlag = 1; } } @@ -125,13 +128,15 @@ void PrintUsage() "unavailable resource using link list interface."); } -OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) { +OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) +{ if(clientResponse == NULL) { OC_LOG(INFO, TAG, "The clientResponse is NULL"); return OC_STACK_DELETE_TRANSACTION; } - if(ctx == (void*)DEFAULT_CONTEXT_VALUE) { + if(ctx == (void*)DEFAULT_CONTEXT_VALUE) + { OC_LOG_V(INFO, TAG, "Callback Context for PUT query recvd successfully"); OC_LOG_V(INFO, TAG, "JSON = %s =============> Discovered", clientResponse->resJSONPayload); } @@ -139,22 +144,28 @@ OCStackApplicationResult putReqCB(void* ctx, OCDoHandle handle, OCClientResponse return OC_STACK_KEEP_TRANSACTION; } -OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) { +OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) +{ OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - if(ctx == (void*)DEFAULT_CONTEXT_VALUE) { + if(ctx == (void*)DEFAULT_CONTEXT_VALUE) + { OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber); - if(clientResponse->sequenceNumber == 0) { + if(clientResponse->sequenceNumber == 0) + { OC_LOG_V(INFO, TAG, "Callback Context for GET query recvd successfully"); OC_LOG_V(INFO, TAG, "Fnd' Rsrc': %s", clientResponse->resJSONPayload); } - else { - OC_LOG_V(INFO, TAG, "Callback Context for Get recvd successfully %d", gNumObserveNotifies); + else + { + OC_LOG_V(INFO, TAG, "Callback Context for Get recvd successfully %d", + gNumObserveNotifies); OC_LOG_V(INFO, TAG, "Fnd' Rsrc': %s", clientResponse->resJSONPayload); gNumObserveNotifies++; if (gNumObserveNotifies == 3) { - if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK){ + if (OCCancel (gObserveDoHandle, OC_LOW_QOS, NULL, 0) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "Observe cancel error"); } } @@ -170,7 +181,8 @@ OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse // This is a function called back when a device is discovered OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle handle, - OCClientResponse * clientResponse) { + OCClientResponse * clientResponse) +{ uint8_t remoteIpAddr[4]; uint16_t remotePortNu; @@ -179,7 +191,8 @@ OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle handle, OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - if (ctx == (void*) DEFAULT_CONTEXT_VALUE) { + if (ctx == (void*) DEFAULT_CONTEXT_VALUE) + { OC_LOG_V(INFO, TAG, "Callback Context recvd successfully"); } @@ -211,7 +224,8 @@ int InitGetRequestToUnavailableResource(OCClientResponse * clientResponse) OCCallbackData cbData; OCDoHandle handle; std::ostringstream getQuery; - getQuery << "coap://" << getIPAddrTBServer(clientResponse) << ":" << getPortTBServer(clientResponse) << "/SomeUnknownResource"; + getQuery << "coap://" << getIPAddrTBServer(clientResponse) << ":" << + getPortTBServer(clientResponse) << "/SomeUnknownResource"; cbData.cb = getReqCB; cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; @@ -232,7 +246,9 @@ int InitObserveRequest(OCClientResponse * clientResponse) OCCallbackData cbData; OCDoHandle handle; std::ostringstream obsReg; - obsReg << "coap://" << getIPAddrTBServer(clientResponse) << ":" << getPortTBServer(clientResponse) << getQueryStrForGetPut(clientResponse->resJSONPayload); + obsReg << "coap://" << getIPAddrTBServer(clientResponse) << ":" << + getPortTBServer(clientResponse) << + getQueryStrForGetPut(clientResponse->resJSONPayload); cbData.cb = getReqCB; cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; @@ -259,8 +275,9 @@ int InitPutRequest(OCClientResponse * clientResponse) OCDoHandle handle; //* Make a PUT query*/ std::ostringstream getQuery; - getQuery << "coap://" << getIPAddrTBServer(clientResponse) << ":" << getPortTBServer(clientResponse) << - "/a/room" << queryInterface[TEST].text; + getQuery << "coap://" << getIPAddrTBServer(clientResponse) << ":" << + getPortTBServer(clientResponse) << + "/a/room" << queryInterface[TEST].text; cbData.cb = putReqCB; cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; @@ -291,15 +308,17 @@ int InitGetRequest(OCClientResponse * clientResponse) //* Make a GET query*/ std::ostringstream getQuery; - getQuery << "coap://" << getIPAddrTBServer(clientResponse) << ":" << getPortTBServer(clientResponse) << - "/a/room" << queryInterface[TEST].text; + getQuery << "coap://" << getIPAddrTBServer(clientResponse) << ":" << + getPortTBServer(clientResponse) << + "/a/room" << queryInterface[TEST].text; std::cout << "Get Query: " << getQuery.str() << std::endl; cbData.cb = getReqCB; cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; - ret = OCDoResource(&handle, OC_REST_GET, getQuery.str().c_str(), 0, 0, OC_CONNTYPE, OC_LOW_QOS, + ret = OCDoResource(&handle, OC_REST_GET, + getQuery.str().c_str(), 0, 0, OC_CONNTYPE, OC_LOW_QOS, &cbData, NULL, 0); if (ret != OC_STACK_OK) { @@ -331,32 +350,34 @@ int InitDiscovery() return ret; } -int main(int argc, char* argv[]) { +int main(int argc, char* argv[]) +{ int opt; while ((opt = getopt(argc, argv, "t:c:")) != -1) { - switch(opt) + switch (opt) { - case 't': - TEST = atoi(optarg); - break; - case 'c': - OC_CONNTYPE = OCConnectivityType(atoi(optarg)); - break; - default: - PrintUsage(); - return -1; + case 't': + TEST = atoi(optarg); + break; + case 'c': + OC_CONNTYPE = OCConnectivityType(atoi(optarg)); + break; + default: + PrintUsage(); + return -1; } } - if(TEST <= TEST_INVALID || TEST >= MAX_TESTS){ + if (TEST <= TEST_INVALID || TEST >= MAX_TESTS) + { PrintUsage(); return -1; } - /* Initialize OCStack*/ - if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK) { + if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack init error"); return 0; } @@ -366,48 +387,70 @@ int main(int argc, char* argv[]) { // Break from loop with Ctrl+C OC_LOG(INFO, TAG, "Entering occlient main loop..."); signal(SIGINT, handleSigInt); - while (!gQuitFlag) { + while (!gQuitFlag) + { - if (OCProcess() != OC_STACK_OK) { + if (OCProcess() != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack process error"); return 0; } sleep(2); - } - OC_LOG(INFO, TAG, "Exiting occlient main loop..."); + } OC_LOG(INFO, TAG, "Exiting occlient main loop..."); - if (OCStop() != OC_STACK_OK) { + if (OCStop() != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack stop error"); } return 0; } -std::string getIPAddrTBServer(OCClientResponse * clientResponse) { - if(!clientResponse) return ""; - if(!clientResponse->addr) return ""; +std::string getIPAddrTBServer(OCClientResponse * clientResponse) +{ + if (!clientResponse) + { + return ""; + } + if (!clientResponse->addr) + { + return ""; + } uint8_t a, b, c, d = 0; - if(0 != OCDevAddrToIPv4Addr(clientResponse->addr, &a, &b, &c, &d) ) return ""; + if (0 != OCDevAddrToIPv4Addr(clientResponse->addr, &a, &b, &c, &d)) + { + return ""; + } char ipaddr[16] = {'\0'}; - snprintf(ipaddr, sizeof(ipaddr), "%d.%d.%d.%d", a,b,c,d); // ostringstream not working correctly here, hence snprintf - //printf("IP address string of the TB server = %s\n", *out_ipaddr); + // ostringstream not working correctly here, hence snprintf + snprintf(ipaddr, sizeof(ipaddr), "%d.%d.%d.%d", a,b,c,d); return std::string (ipaddr); } - -std::string getPortTBServer(OCClientResponse * clientResponse){ - if(!clientResponse) return ""; - if(!clientResponse->addr) return ""; +std::string getPortTBServer(OCClientResponse * clientResponse) +{ + if (!clientResponse) + { + return ""; + } + if (!clientResponse->addr) + { + return ""; + } uint16_t p = 0; - if(0 != OCDevAddrToPort(clientResponse->addr, &p) ) return ""; + if (0 != OCDevAddrToPort(clientResponse->addr, &p)) + { + return ""; + } std::ostringstream ss; ss << p; return ss.str(); } -std::string getQueryStrForGetPut(unsigned const char * responsePayload){ +std::string getQueryStrForGetPut(unsigned const char * responsePayload) +{ std::string jsonPayload(reinterpret_cast(const_cast(responsePayload))); diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp index 8831174..f9f5eab 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp @@ -302,7 +302,6 @@ std::string getIPAddrTBServer(OCClientResponse * clientResponse) return std::string (ipaddr); } - std::string getPortTBServer(OCClientResponse * clientResponse) { if(!clientResponse) return ""; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.h b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.h index 60713d7..a2df222 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.h +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.h @@ -39,7 +39,8 @@ /** * List of methods that can be inititated from the client */ -typedef enum { +typedef enum +{ TEST_DISCOVER_REQ = 1, TEST_NON_CON_OP, TEST_CON_OP, diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp index be440e8..7800f96 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp @@ -56,9 +56,12 @@ static int stopPresenceCount = 10; #endif //TODO: Follow the pattern used in constructJsonResponse() when the payload is decided. -const char responsePayloadDeleteOk[] = "{App determines payload: Delete Resource operation succeeded.}"; -const char responsePayloadDeleteNotOK[] = "{App determines payload: Delete Resource operation failed.}"; -const char responsePayloadResourceDoesNotExist[] = "{App determines payload: The resource does not exist.}"; +const char responsePayloadDeleteOk[] = + "{App determines payload: Delete Resource operation succeeded.}"; +const char responsePayloadDeleteNotOK[] = + "{App determines payload: Delete Resource operation failed.}"; +const char responsePayloadResourceDoesNotExist[] = + "{App determines payload: The resource does not exist.}"; const char responsePayloadDeleteResourceNotSupported[] = "{App determines payload: The request is received for a non-support resource.}"; @@ -119,7 +122,8 @@ char* constructJsonResponse (OCEntityHandlerRequest *ehRequest) return jsonResponse; } -OCEntityHandlerResult ProcessGetRequest (OCEntityHandlerRequest *ehRequest, char *payload, uint16_t maxPayloadSize) +OCEntityHandlerResult ProcessGetRequest (OCEntityHandlerRequest *ehRequest, + char *payload, uint16_t maxPayloadSize) { OCEntityHandlerResult ehResult; char *getResp = constructJsonResponse(ehRequest); @@ -141,7 +145,8 @@ OCEntityHandlerResult ProcessGetRequest (OCEntityHandlerRequest *ehRequest, char return ehResult; } -OCEntityHandlerResult ProcessPutRequest (OCEntityHandlerRequest *ehRequest, char *payload, uint16_t maxPayloadSize) +OCEntityHandlerResult ProcessPutRequest (OCEntityHandlerRequest *ehRequest, + char *payload, uint16_t maxPayloadSize) { OCEntityHandlerResult ehResult; char *putResp = constructJsonResponse(ehRequest); @@ -163,7 +168,8 @@ OCEntityHandlerResult ProcessPutRequest (OCEntityHandlerRequest *ehRequest, char return ehResult; } -OCEntityHandlerResult ProcessPostRequest (OCEntityHandlerRequest *ehRequest, OCEntityHandlerResponse *response, char *payload, uint16_t maxPayloadSize) +OCEntityHandlerResult ProcessPostRequest (OCEntityHandlerRequest *ehRequest, + OCEntityHandlerResponse *response, char *payload, uint16_t maxPayloadSize) { OCEntityHandlerResult ehResult = OC_EH_OK; char *respPLPost_light = NULL; @@ -251,7 +257,8 @@ OCEntityHandlerResult ProcessPostRequest (OCEntityHandlerRequest *ehRequest, OCE return ehResult; } -OCEntityHandlerResult ProcessDeleteRequest (OCEntityHandlerRequest *ehRequest, char *payload, uint16_t maxPayloadSize) +OCEntityHandlerResult ProcessDeleteRequest (OCEntityHandlerRequest *ehRequest, + char *payload, uint16_t maxPayloadSize) { if(ehRequest == NULL) { @@ -331,7 +338,8 @@ OCEntityHandlerResult ProcessDeleteRequest (OCEntityHandlerRequest *ehRequest, c return ehResult; } -OCEntityHandlerResult ProcessNonExistingResourceRequest(OCEntityHandlerRequest *ehRequest, char *payload, uint16_t maxPayloadSize) +OCEntityHandlerResult ProcessNonExistingResourceRequest(OCEntityHandlerRequest *ehRequest, + char *payload, uint16_t maxPayloadSize) { OC_LOG_V(INFO, TAG, "\n\nExecuting %s ", __func__); @@ -409,7 +417,8 @@ OCDeviceEntityHandlerCb (OCEntityHandlerFlag flag, // Initialize certain response fields response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, 0, + sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof response.resourceUri); if (flag & OC_INIT_FLAG) @@ -419,9 +428,11 @@ OCDeviceEntityHandlerCb (OCEntityHandlerFlag flag, if (flag & OC_REQUEST_FLAG) { OC_LOG (INFO, TAG, "Flag includes OC_REQUEST_FLAG"); - if (entityHandlerRequest->resource == NULL) { + if (entityHandlerRequest->resource == NULL) + { OC_LOG (INFO, TAG, "Received request from client to a non-existing resource"); - ehResult = ProcessNonExistingResourceRequest(entityHandlerRequest, payload, sizeof(payload) - 1); + ehResult = ProcessNonExistingResourceRequest(entityHandlerRequest, + payload, sizeof(payload) - 1); } else if (OC_REST_GET == entityHandlerRequest->method) { @@ -509,7 +520,8 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag, // Initialize certain response fields response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, + 0, sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof response.resourceUri); if (flag & OC_INIT_FLAG) @@ -532,7 +544,8 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag, else if (OC_REST_POST == entityHandlerRequest->method) { OC_LOG (INFO, TAG, "Received OC_REST_POST from client"); - ehResult = ProcessPostRequest (entityHandlerRequest, &response, payload, sizeof(payload) - 1); + ehResult = ProcessPostRequest (entityHandlerRequest, + &response, payload, sizeof(payload) - 1); } else if (OC_REST_DELETE == entityHandlerRequest->method) { @@ -563,7 +576,8 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag, { OC_LOG (INFO, TAG, "Received vendor specific options"); uint8_t i = 0; - OCHeaderOption * rcvdOptions = entityHandlerRequest->rcvdVendorSpecificHeaderOptions; + OCHeaderOption * rcvdOptions = + entityHandlerRequest->rcvdVendorSpecificHeaderOptions; for( i = 0; i < entityHandlerRequest->numRcvdVendorSpecificHeaderOptions; i++) { if(((OCHeaderOption)rcvdOptions[i]).protocolID == OC_COAP_ID) @@ -616,8 +630,10 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag, } /* SIGINT handler: set gQuitFlag to 1 for graceful termination */ -void handleSigInt(int signum) { - if (signum == SIGINT) { +void handleSigInt(int signum) +{ + if (signum == SIGINT) + { gQuitFlag = 1; } } @@ -779,12 +795,14 @@ int main(int argc, char* argv[]) OC_LOG(DEBUG, TAG, "OCServer is starting..."); - if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK) { + if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack init error"); return 0; } #ifdef WITH_PRESENCE - if (OCStartPresence(0) != OC_STACK_OK) { + if (OCStartPresence(0) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack presence/discovery error"); return 0; } @@ -836,8 +854,10 @@ int main(int argc, char* argv[]) OC_LOG(INFO, TAG, "Entering ocserver main loop..."); DeleteDeviceInfo(); signal(SIGINT, handleSigInt); - while (!gQuitFlag) { - if (OCProcess() != OC_STACK_OK) { + while (!gQuitFlag) + { + if (OCProcess() != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack process error"); return 0; } @@ -855,7 +875,8 @@ int main(int argc, char* argv[]) OC_LOG(INFO, TAG, "Exiting ocserver main loop..."); - if (OCStop() != OC_STACK_OK) { + if (OCStop() != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack process error"); } @@ -908,7 +929,6 @@ bool DuplicateString(char** targetString, const char* sourceString) else { *targetString = (char *) malloc(strlen(sourceString) + 1); - if(targetString) { strncpy(*targetString, sourceString, (strlen(sourceString) + 1)); diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.h b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.h index 81a9507..7857a90 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.h +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.h @@ -35,16 +35,18 @@ //----------------------------------------------------------------------------- /* Structure to represent a Light resource */ -typedef struct LIGHTRESOURCE{ +typedef struct LIGHTRESOURCE +{ OCResourceHandle handle; bool state; int power; } LightResource; /* Structure to represent the observers */ -typedef struct { +typedef struct +{ OCObservationId observationId; - bool valid; + bool valid; OCResourceHandle resourceHandle; } Observers; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp index 95bb9e1..5413298 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp @@ -53,10 +53,12 @@ const char rspPutRoomCollection[] = "{\"href\":\"/a/room\"}"; const char rspFailureRoom[] = "{\"href\":\"/a/room\",\"rep\":{\"error\":\"ROOM_OP_FAIL\"}}"; // TODO : hard coded for now, change after Sprint4 -const char rspGetLightDefault[] = "{\"href\":\"/a/light\",\"rep\":{\"state\":\"false\",\"color\":\"0\"}}"; +const char rspGetLightDefault[] = + "{\"href\":\"/a/light\",\"rep\":{\"state\":\"false\",\"color\":\"0\"}}"; const char rspGetLightCollection[] = "{\"href\":\"/a/light\"}"; // TODO : Needs to be changed to retrieve current status of light and return that in response -const char rspPutLightDefault[] = "{\"href\":\"/a/light\",\"rep\":{\"state\":\"true\",\"color\":\"0\"}}"; +const char rspPutLightDefault[] = + "{\"href\":\"/a/light\",\"rep\":{\"state\":\"true\",\"color\":\"0\"}}"; const char rspPutLightCollection[] = "{\"href\":\"/a/light\"}"; const char rspFailureLight[] = "{\"href\":\"/a/light\",\"rep\":{\"error\":\"LIGHT_OP_FAIL\"}}"; @@ -69,7 +71,8 @@ const char rspPutFanDefault[] = "{\"href\":\"/a/fan\",\"rep\":{\"state\":\"false const char rspPutFanCollection[] = "{\"href\":\"/a/fan\"}"; const char rspFailureFan[] = "{\"href\":\"/a/fan\",\"rep\":{\"error\":\"FAN_OP_FAIL\"}}"; -typedef enum { +typedef enum +{ TEST_INVALID = 0, TEST_DEFAULT_COLL_EH, TEST_APP_COLL_EH, @@ -79,8 +82,10 @@ typedef enum { void PrintUsage() { OC_LOG(INFO, TAG, "Usage : ocservercoll -t "); - OC_LOG(INFO, TAG, "Test Case 1 : Create room resource with default collection entity handler."); - OC_LOG(INFO, TAG, "Test Case 2 : Create room resource with application collection entity handler."); + OC_LOG(INFO, TAG, + "Test Case 1 : Create room resource with default collection entity handler."); + OC_LOG(INFO, TAG, + "Test Case 2 : Create room resource with application collection entity handler."); } unsigned static int TEST = TEST_INVALID; @@ -118,7 +123,8 @@ PrintReceivedMsgInfo(OCEntityHandlerFlag flag, OCEntityHandlerRequest * ehReques { const char* typeOfMessage; - switch (flag) { + switch (flag) + { case OC_INIT_FLAG: typeOfMessage = "OC_INIT_FLAG"; break; @@ -133,8 +139,8 @@ PrintReceivedMsgInfo(OCEntityHandlerFlag flag, OCEntityHandlerRequest * ehReques } OC_LOG_V(INFO, TAG, "Receiving message type: %s, method %s", - typeOfMessage, - (ehRequest->method == OC_REST_GET) ? "OC_REST_GET" : "OC_REST_PUT" ); + typeOfMessage, + (ehRequest->method == OC_REST_GET) ? "OC_REST_GET" : "OC_REST_PUT" ); } OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, @@ -155,44 +161,53 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, { if(query.find("oc.mi.def") != std::string::npos) { - ret = HandleCallback(ehRequest, rspGetRoomDefault, rspFailureRoom, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetRoomDefault, rspFailureRoom, payload, sizeof(payload)); if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspGetLightCollection, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetLightCollection, rspFailureLight, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspGetFanCollection, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetFanCollection, rspFailureFan, payload, sizeof(payload)); } } else if(query.find("oc.mi.ll") != std::string::npos) { - ret = HandleCallback(ehRequest, rspGetRoomCollection, rspFailureRoom, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetRoomCollection, rspFailureRoom, payload, sizeof(payload)); if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspGetLightCollection, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetLightCollection, rspFailureLight, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspGetFanCollection, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetFanCollection, rspFailureFan, payload, sizeof(payload)); } } else if(query.find("oc.mi.b") != std::string::npos) { - ret = HandleCallback(ehRequest, rspGetRoomCollection, rspFailureRoom, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetRoomCollection, rspFailureRoom, payload, sizeof(payload)); if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspGetLightDefault, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetLightDefault, rspFailureLight, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspGetFanDefault, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetFanDefault, rspFailureFan, payload, sizeof(payload)); } } if (ret == OC_EH_OK) @@ -204,7 +219,8 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, response.payload = (unsigned char *)payload; response.payloadSize = strlen(payload); response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, + 0, sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof response.resourceUri); // Indicate that response is NOT in a persistent buffer response.persistentBufferFlag = 0; @@ -222,41 +238,48 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, { if(ret != OC_EH_ERROR) { - ret = HandleCallback(ehRequest, rspPutRoomDefault, rspFailureRoom, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutRoomDefault, rspFailureRoom, payload, sizeof(payload)); } } if(query.find("oc.mi.ll") != std::string::npos) { if(ret != OC_EH_ERROR) { - ret = HandleCallback(ehRequest, rspPutRoomCollection, rspFailureRoom, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutRoomCollection, rspFailureRoom, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspPutLightCollection, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutLightCollection, rspFailureLight, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspPutFanCollection, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutFanCollection, rspFailureFan, payload, sizeof(payload)); } } if(query.find("oc.mi.b") != std::string::npos) { if(ret != OC_EH_ERROR) { - ret = HandleCallback(ehRequest, rspPutRoomCollection, rspFailureRoom, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutRoomCollection, rspFailureRoom, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspPutLightDefault, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutLightDefault, rspFailureLight, payload, sizeof(payload)); } if(ret != OC_EH_ERROR) { ret = HandleCallback(ehRequest, ",", ",", payload, sizeof(payload)); - ret = HandleCallback(ehRequest, rspPutFanDefault, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutFanDefault, rspFailureFan, payload, sizeof(payload)); } } if (ret == OC_EH_OK) @@ -268,7 +291,8 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, response.payload = (unsigned char *)payload; response.payloadSize = strlen(payload); response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, + 0, sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof response.resourceUri); // Indicate that response is NOT in a persistent buffer response.persistentBufferFlag = 0; @@ -294,7 +318,8 @@ OCEntityHandlerResult OCEntityHandlerRoomCb(OCEntityHandlerFlag flag, return ret; } -OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag, OCEntityHandlerRequest * ehRequest) +OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag, + OCEntityHandlerRequest * ehRequest) { OCEntityHandlerResult ret = OC_EH_OK; OCEntityHandlerResponse response; @@ -307,11 +332,13 @@ OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag, OCEntityH { if(OC_REST_GET == ehRequest->method) { - ret = HandleCallback(ehRequest, rspGetLightDefault, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspGetLightDefault, rspFailureLight, payload, sizeof(payload)); } else if(OC_REST_PUT == ehRequest->method) { - ret = HandleCallback(ehRequest, rspPutLightDefault, rspFailureLight, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, + rspPutLightDefault, rspFailureLight, payload, sizeof(payload)); } else { @@ -329,7 +356,8 @@ OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag, OCEntityH response.payload = (unsigned char *)payload; response.payloadSize = strlen(payload); response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, + 0, sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof response.resourceUri); // Indicate that response is NOT in a persistent buffer response.persistentBufferFlag = 0; @@ -350,7 +378,8 @@ OCEntityHandlerResult OCEntityHandlerLightCb(OCEntityHandlerFlag flag, OCEntityH return ret; } -OCEntityHandlerResult OCEntityHandlerFanCb(OCEntityHandlerFlag flag, OCEntityHandlerRequest * ehRequest) +OCEntityHandlerResult OCEntityHandlerFanCb(OCEntityHandlerFlag flag, + OCEntityHandlerRequest * ehRequest) { OCEntityHandlerResult ret = OC_EH_OK; OCEntityHandlerResponse response; @@ -363,11 +392,13 @@ OCEntityHandlerResult OCEntityHandlerFanCb(OCEntityHandlerFlag flag, OCEntityHan { if(OC_REST_GET == ehRequest->method) { - ret = HandleCallback(ehRequest, rspGetFanDefault, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, rspGetFanDefault, + rspFailureFan, payload, sizeof(payload)); } else if(OC_REST_PUT == ehRequest->method) { - ret = HandleCallback(ehRequest, rspPutFanDefault, rspFailureFan, payload, sizeof(payload)); + ret = HandleCallback(ehRequest, rspPutFanDefault, + rspFailureFan, payload, sizeof(payload)); } else { @@ -385,7 +416,8 @@ OCEntityHandlerResult OCEntityHandlerFanCb(OCEntityHandlerFlag flag, OCEntityHan response.payload = (unsigned char *)payload; response.payloadSize = strlen(payload); response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, + 0, sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof response.resourceUri); // Indicate that response is NOT in a persistent buffer response.persistentBufferFlag = 0; @@ -456,13 +488,15 @@ int main(int argc, char* argv[]) return -1; } } - if(TEST <= TEST_INVALID || TEST >= MAX_TESTS){ + if(TEST <= TEST_INVALID || TEST >= MAX_TESTS) + { PrintUsage(); return -1; } OC_LOG(DEBUG, TAG, "OCServer is starting..."); - if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK) { + if (OCInit(NULL, 0, OC_SERVER) != OC_STACK_OK) + { OC_LOG(ERROR, TAG, "OCStack init error"); return 0; } diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp index 937ed45..beac534 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp @@ -108,7 +108,8 @@ void ProcessGetRequest (OCEntityHandlerRequest *ehRequest) response.payload = (unsigned char *)getResp; response.payloadSize = strlen(getResp) + 1; response.numSendVendorSpecificHeaderOptions = 0; - memset(response.sendVendorSpecificHeaderOptions, 0, sizeof response.sendVendorSpecificHeaderOptions); + memset(response.sendVendorSpecificHeaderOptions, + 0, sizeof response.sendVendorSpecificHeaderOptions); memset(response.resourceUri, 0, sizeof(response.resourceUri)); // Indicate that response is NOT in a persistent buffer response.persistentBufferFlag = 0; @@ -125,22 +126,26 @@ void ProcessGetRequest (OCEntityHandlerRequest *ehRequest) OCEntityHandlerRequest *CopyRequest(OCEntityHandlerRequest *entityHandlerRequest) { OC_LOG(INFO, TAG, "Copying received request for slow response"); - OCEntityHandlerRequest *request = (OCEntityHandlerRequest *)OCMalloc(sizeof(OCEntityHandlerRequest)); + OCEntityHandlerRequest *request = + (OCEntityHandlerRequest *)OCMalloc(sizeof(OCEntityHandlerRequest)); if (request) { // Do shallow copy memcpy(request, entityHandlerRequest, sizeof(OCEntityHandlerRequest)); // Do deep copy of query - request->query = (unsigned char * )OCMalloc(strlen((const char *)entityHandlerRequest->query) + 1); + request->query = + (unsigned char * )OCMalloc(strlen((const char *)entityHandlerRequest->query) + 1); if (request->query) { strcpy((char *)request->query, (const char *)entityHandlerRequest->query); // Copy the request payload - request->reqJSONPayload = (unsigned char * )OCMalloc(strlen((const char *)entityHandlerRequest->reqJSONPayload) + 1); + request->reqJSONPayload = (unsigned char * )OCMalloc( + strlen((const char *)entityHandlerRequest->reqJSONPayload) + 1); if (request->reqJSONPayload) { - strcpy((char *)request->reqJSONPayload, (const char *)entityHandlerRequest->reqJSONPayload); + strcpy((char *)request->reqJSONPayload, + (const char *)entityHandlerRequest->reqJSONPayload); // Ignore vendor specific header options for example request->numRcvdVendorSpecificHeaderOptions = 0; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.h b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.h index bf37c34..1167453 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.h +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.h @@ -33,7 +33,8 @@ //----------------------------------------------------------------------------- /* Structure to represent a LED resource */ -typedef struct LEDRESOURCE{ +typedef struct LEDRESOURCE +{ OCResourceHandle handle; bool state; int power;