X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fstack%2Fsamples%2Flinux%2FSimpleClientServer%2Focclientslow.cpp;h=c4b762baff10247fb78abfe57bac36685c78cd83;hb=refs%2Ftags%2Ftizen_4.0.m2_release;hp=e875cf2de8b07ad876db3030d1e05c9de9bbb145;hpb=07b4387b438aecacf3b6a7a4bb035f4a6b94f48d;p=platform%2Fupstream%2Fiotivity.git diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp index e875cf2..c4b762b 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp @@ -18,34 +18,40 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +#include "iotivity_config.h" #include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_WINDOWS_H +#include +#endif #include #include +#include #include "ocstack.h" #include "logger.h" #include "occlientslow.h" +#include "oic_string.h" #include "ocpayload.h" +#include "payload_logging.h" +#include "common.h" // Tracking user input -static int UNICAST_DISCOVERY = 0; -static int TEST_CASE = 0; -static int CONNECTIVITY = 0; +static int UnicastDiscovery = 0; +static int TestCase = 0; +static int ConnectivityType = 0; -static const char * UNICAST_DISCOVERY_QUERY = "coap://%s/oic/res"; -static std::string coapServerIP = "255.255.255.255"; -static uint16_t coapServerPort = 5683; static std::string coapServerResource = "/a/led"; //The following variable determines the interface protocol (IP, etc) //to be used for sending unicast messages. Default set to IP. -static OCConnectivityType OC_CONNTYPE = CT_ADAPTER_IP; -static const char * MULTICAST_RESOURCE_DISCOVERY_QUERY = "/oic/res"; -static int IPV4_ADDR_SIZE = 24; -void StripNewLineChar(char* str); +static OCConnectivityType adapterType = CT_ADAPTER_IP; +static OCDevAddr endpoint; +static const char *RESOURCE_DISCOVERY_QUERY = "%s/oic/res"; int gQuitFlag = 0; @@ -60,15 +66,15 @@ void handleSigInt(int signum) static void PrintUsage() { - OC_LOG(INFO, TAG, "Usage : occlient -c <0|1|2> -u <0|1> -t <1|2|3>"); - OC_LOG(INFO, TAG, "-c 0 : Default auto-selection"); - OC_LOG(INFO, TAG, "-c 1 : IP Connectivity Type"); - OC_LOG(INFO, TAG, "-u <0|1> : Perform multicast/unicast discovery of resources"); - OC_LOG(INFO, TAG, "-t 1 : Discover Resources"); - OC_LOG(INFO, TAG, "-t 2 : Discover Resources and Initiate Nonconfirmable Get Request"); - OC_LOG(INFO, TAG, "-t 3 : Discover Resources and Initiate Confirmable Get Request"); - OC_LOG(INFO, TAG, "-t 4 : Discover Resources and Initiate NonConfirmable Put Request"); - OC_LOG(INFO, TAG, "-t 5 : Discover Resources and Initiate Confirmable Put Request"); + OIC_LOG(INFO, TAG, "Usage : occlient -c <0|1> -u <0|1> -t <1|2|3>"); + OIC_LOG(INFO, TAG, "-c 0 : Default auto-selection"); + OIC_LOG(INFO, TAG, "-c 1 : IP Connectivity Type"); + OIC_LOG(INFO, TAG, "-u <0|1> : Perform multicast/unicast discovery of resources"); + OIC_LOG(INFO, TAG, "-t 1 : Discover Resources"); + OIC_LOG(INFO, TAG, "-t 2 : Discover Resources and Initiate Nonconfirmable Get Request"); + OIC_LOG(INFO, TAG, "-t 3 : Discover Resources and Initiate Confirmable Get Request"); + OIC_LOG(INFO, TAG, "-t 4 : Discover Resources and Initiate NonConfirmable Put Request"); + OIC_LOG(INFO, TAG, "-t 5 : Discover Resources and Initiate Confirmable Put Request"); } OCPayload* putPayload() @@ -88,7 +94,7 @@ OCPayload* putPayload() } OCStackResult InvokeOCDoResource(std::ostringstream &query, - OCMethod method, OCQualityOfService qos, + OCMethod method, OCDevAddr *dest, OCQualityOfService qos, OCClientResponseHandler cb, OCHeaderOption * options, uint8_t numOptions) { OCStackResult ret; @@ -98,49 +104,53 @@ OCStackResult InvokeOCDoResource(std::ostringstream &query, cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; - ret = OCDoResource(NULL, method, query.str().c_str(), 0, - (method == OC_REST_PUT) ? putPayload() : NULL, - OC_CONNTYPE, qos, &cbData, options, numOptions); + OCPayload* payload = (method == OC_REST_PUT) ? putPayload() : NULL; + + ret = OCDoRequest(NULL, method, query.str().c_str(), dest, + payload, adapterType, qos, &cbData, options, numOptions); + + OCPayloadDestroy(payload); if (ret != OC_STACK_OK) { - OC_LOG_V(ERROR, TAG, "OCDoResource returns error %d with method %d", ret, method); + OIC_LOG_V(ERROR, TAG, "OCDoResource returns error %d with method %d", ret, method); } return ret; } -OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse * clientResponse) +OCStackApplicationResult getReqCB(void* ctx, + OCDoHandle /*handle*/, OCClientResponse * clientResponse) { if(clientResponse == NULL) { - OC_LOG(INFO, TAG, "The clientResponse is NULL"); + OIC_LOG(INFO, TAG, "The clientResponse is NULL"); return OC_STACK_DELETE_TRANSACTION; } if(ctx == (void*)DEFAULT_CONTEXT_VALUE) { - OC_LOG(INFO, TAG, "Callback Context for GET query recvd successfully"); + OIC_LOG(INFO, TAG, "Callback Context for GET query recvd successfully"); } - OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber); - OC_LOG(INFO, TAG, "Get Response =============> "); - OC_LOG_PAYLOAD(INFO, TAG, clientResponse->payload); + OIC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); + OIC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber); + OIC_LOG(INFO, TAG, "Get Response =============> "); + OIC_LOG_PAYLOAD(INFO, clientResponse->payload); if(clientResponse->rcvdVendorSpecificHeaderOptions && clientResponse->numRcvdVendorSpecificHeaderOptions) { - OC_LOG (INFO, TAG, "Received vendor specific options"); + OIC_LOG (INFO, TAG, "Received vendor specific options"); uint8_t i = 0; OCHeaderOption * rcvdOptions = clientResponse->rcvdVendorSpecificHeaderOptions; for( i = 0; i < clientResponse->numRcvdVendorSpecificHeaderOptions; i++) { if(((OCHeaderOption)rcvdOptions[i]).protocolID == OC_COAP_ID) { - OC_LOG_V(INFO, TAG, "Received option with OC_COAP_ID and ID %u with", + OIC_LOG_V(INFO, TAG, "Received option with OC_COAP_ID and ID %u with", ((OCHeaderOption)rcvdOptions[i]).optionID ); - OC_LOG_BUFFER(INFO, TAG, ((OCHeaderOption)rcvdOptions[i]).optionData, + OIC_LOG_BUFFER(INFO, TAG, ((OCHeaderOption)rcvdOptions[i]).optionData, MAX_HEADER_OPTION_DATA_LENGTH); } } @@ -149,25 +159,25 @@ OCStackApplicationResult getReqCB(void* ctx, OCDoHandle handle, OCClientResponse } // This is a function called back when a device is discovered -OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle handle, +OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle /*handle*/, OCClientResponse * clientResponse) { if (ctx == (void*) DEFAULT_CONTEXT_VALUE) { - OC_LOG(INFO, TAG, "Callback Context for DISCOVER query recvd successfully"); + OIC_LOG(INFO, TAG, "Callback Context for DISCOVER query recvd successfully"); } if (clientResponse) { - OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); + OIC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result)); - OC_LOG_V(INFO, TAG, "Discovered @ %s:%u =============> ", + OIC_LOG_V(INFO, TAG, "Discovered @ %s:%u =============> ", clientResponse->devAddr.addr, clientResponse->devAddr.port); - OC_LOG_PAYLOAD (INFO, TAG, clientResponse->payload); + OIC_LOG_PAYLOAD (INFO, clientResponse->payload); - parseClientResponse(clientResponse); + endpoint = clientResponse->devAddr; - switch(TEST_CASE) + switch(TestCase) { case TEST_NON_CON_OP: InitGetRequest(OC_LOW_QOS); @@ -187,73 +197,67 @@ OCStackApplicationResult discoveryReqCB(void* ctx, OCDoHandle handle, } } - return (UNICAST_DISCOVERY) ? OC_STACK_DELETE_TRANSACTION : OC_STACK_KEEP_TRANSACTION ; + return UnicastDiscovery ? OC_STACK_DELETE_TRANSACTION : OC_STACK_KEEP_TRANSACTION ; } int InitGetRequest(OCQualityOfService qos) { - OC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__); + OIC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__); std::ostringstream query; - query << "coap://" << coapServerIP << ":" << coapServerPort << coapServerResource; - OC_LOG_V (INFO, TAG, "Performing GET with query : %s", query.str().c_str()); - return (InvokeOCDoResource(query, OC_REST_GET, (qos == OC_HIGH_QOS)? - OC_HIGH_QOS:OC_LOW_QOS, getReqCB, NULL, 0)); + query << coapServerResource; + OIC_LOG_V (INFO, TAG, "Performing GET with query : %s", query.str().c_str()); + return (InvokeOCDoResource(query, OC_REST_GET, &endpoint, + (qos == OC_HIGH_QOS)? OC_HIGH_QOS : OC_LOW_QOS, + getReqCB, NULL, 0)); } int InitPutRequest(OCQualityOfService qos) { - OC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__); + OIC_LOG_V(INFO, TAG, "\n\nExecuting %s", __func__); std::ostringstream query; - query << "coap://" << coapServerIP << ":" << coapServerPort << coapServerResource; - OC_LOG_V (INFO, TAG, "Performing PUT with query : %s", query.str().c_str()); - return (InvokeOCDoResource(query, OC_REST_PUT, (qos == OC_HIGH_QOS)? - OC_HIGH_QOS:OC_LOW_QOS, getReqCB, NULL, 0)); + query << coapServerResource; + OIC_LOG_V (INFO, TAG, "Performing PUT with query : %s", query.str().c_str()); + return (InvokeOCDoResource(query, OC_REST_PUT, &endpoint, + (qos == OC_HIGH_QOS)? OC_HIGH_QOS:OC_LOW_QOS, + getReqCB, NULL, 0)); } int InitDiscovery() { OCStackResult ret; OCCallbackData cbData; - /* Start a discovery query*/ - char szQueryUri[64] = { 0 }; - if (UNICAST_DISCOVERY) + char queryUri[200]; + char ipaddr[100] = { '\0' }; + + if (UnicastDiscovery) { - char ipv4addr[IPV4_ADDR_SIZE]; - OC_LOG(INFO, TAG, "Enter IPv4:port of the Server hosting resource"\ - "(Ex: 192.168.0.15:1234)"); - if (fgets(ipv4addr, IPV4_ADDR_SIZE, stdin)) + OIC_LOG(INFO, TAG, "Enter IP address (with optional port) of the Server hosting resource\n"); + OIC_LOG(INFO, TAG, "IPv4: 192.168.0.15:45454\n"); + OIC_LOG(INFO, TAG, "IPv6: [fe80::20c:29ff:fe1b:9c5]:45454\n"); + + if (fgets(ipaddr, sizeof (ipaddr), stdin)) { - //Strip newline char from ipv4addr - StripNewLineChar(ipv4addr); - snprintf(szQueryUri, sizeof(szQueryUri), UNICAST_DISCOVERY_QUERY, ipv4addr); + StripNewLineChar(ipaddr); //Strip newline char from ipaddr } else { - OC_LOG(ERROR, TAG, "!! Bad input for IPV4 address. !!"); + OIC_LOG(ERROR, TAG, "!! Bad input for IP address. !!"); return OC_STACK_INVALID_PARAM; } } - else - { - strcpy(szQueryUri, MULTICAST_RESOURCE_DISCOVERY_QUERY); - } + + snprintf(queryUri, sizeof (queryUri), RESOURCE_DISCOVERY_QUERY, ipaddr); + cbData.cb = discoveryReqCB; cbData.context = (void*)DEFAULT_CONTEXT_VALUE; cbData.cd = NULL; - if(UNICAST_DISCOVERY) - { - ret = OCDoResource(NULL, OC_REST_GET, szQueryUri, 0, 0, OC_CONNTYPE, - OC_LOW_QOS, &cbData, NULL, 0); - } - else - { - ret = OCDoResource(NULL, OC_REST_DISCOVER, szQueryUri, 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) { - OC_LOG(ERROR, TAG, "OCStack resource error"); + OIC_LOG(ERROR, TAG, "OCStack resource error"); } return ret; } @@ -267,13 +271,13 @@ int main(int argc, char* argv[]) switch(opt) { case 'u': - UNICAST_DISCOVERY = atoi(optarg); + UnicastDiscovery = atoi(optarg); break; case 't': - TEST_CASE = atoi(optarg); + TestCase = atoi(optarg); break; case 'c': - CONNECTIVITY = atoi(optarg); + ConnectivityType = atoi(optarg); break; default: PrintUsage(); @@ -281,9 +285,9 @@ int main(int argc, char* argv[]) } } - if ((UNICAST_DISCOVERY != 0 && UNICAST_DISCOVERY != 1) || - (TEST_CASE < TEST_DISCOVER_REQ || TEST_CASE >= MAX_TESTS) || - (CONNECTIVITY < CT_ADAPTER_DEFAULT || CONNECTIVITY >= MAX_CT)) + if ((UnicastDiscovery != 0 && UnicastDiscovery != 1) || + (TestCase < TEST_DISCOVER_REQ || TestCase >= MAX_TESTS) || + (ConnectivityType < CT_ADAPTER_DEFAULT || ConnectivityType >= MAX_CT)) { PrintUsage(); return -1; @@ -292,54 +296,47 @@ int main(int argc, char* argv[]) /* Initialize OCStack*/ if (OCInit(NULL, 0, OC_CLIENT) != OC_STACK_OK) { - OC_LOG(ERROR, TAG, "OCStack init error"); + OIC_LOG(ERROR, TAG, "OCStack init error"); return 0; } - if(CONNECTIVITY == CT_ADAPTER_DEFAULT || CONNECTIVITY == CT_IP) + if(ConnectivityType == CT_ADAPTER_DEFAULT || ConnectivityType == CT_IP) { - OC_CONNTYPE = CT_ADAPTER_IP; + adapterType = CT_ADAPTER_IP; } else { - OC_LOG(INFO, TAG, "Default Connectivity type selected..."); - OC_CONNTYPE = CT_ADAPTER_IP; + OIC_LOG(INFO, TAG, "Default Connectivity type selected..."); + adapterType = CT_ADAPTER_IP; } InitDiscovery(); // Break from loop with Ctrl+C - OC_LOG(INFO, TAG, "Entering occlient main loop..."); + OIC_LOG(INFO, TAG, "Entering occlient main loop..."); signal(SIGINT, handleSigInt); while (!gQuitFlag) { if (OCProcess() != OC_STACK_OK) { - OC_LOG(ERROR, TAG, "OCStack process error"); + OIC_LOG(ERROR, TAG, "OCStack process error"); return 0; } sleep(2); } - OC_LOG(INFO, TAG, "Exiting occlient main loop..."); + OIC_LOG(INFO, TAG, "Exiting occlient main loop..."); if (OCStop() != OC_STACK_OK) { - OC_LOG(ERROR, TAG, "OCStack stop error"); + OIC_LOG(ERROR, TAG, "OCStack stop error"); } return 0; } -std::string getQueryStrForGetPut(OCClientResponse * clientResponse) +std::string getQueryStrForGetPut(OCClientResponse * /*clientResponse*/) { return "/a/led"; } -void parseClientResponse(OCClientResponse * clientResponse) -{ - coapServerIP = clientResponse->devAddr.addr; - coapServerPort = clientResponse->devAddr.port; - coapServerResource = getQueryStrForGetPut(clientResponse); -} -