delete unused code of EntityHandler in Provider Side.

Our service is not using the headeroption.
second patch inlcuded delete white space.

Change-Id: Iffa8cafbc30eac8a424ff935c523d7438e441d72
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9811
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c
index 00e1cbe..dae2364 100644 (file)
--- a/service/notification/src/provider/NSProviderListener.c
+++ b/service/notification/src/provider/NSProviderListener.c
@@ -81,53 +81,6 @@ OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag,
                     entityHandlerRequest->method);\r
             ehResult = OC_EH_OK;\r
         }\r
-\r
-        // If the result isn't an error or forbidden, send response\r
-        if (!((ehResult == OC_EH_ERROR) || (ehResult == OC_EH_FORBIDDEN)))\r
-        {\r
-            // Format the response.  Note this requires some info about the request\r
-            response.requestHandle = entityHandlerRequest->requestHandle;\r
-            response.resourceHandle = entityHandlerRequest->resource;\r
-            response.ehResult = ehResult;\r
-            //response.payload = reinterpret_cast<OCPayload*>(payload);\r
-            response.payload = (OCPayload*) payload;\r
-            // Indicate that response is NOT in a persistent buffer\r
-            response.persistentBufferFlag = 0;\r
-\r
-            // Handle vendor specific options\r
-            if (entityHandlerRequest->rcvdVendorSpecificHeaderOptions\r
-                    && entityHandlerRequest->numRcvdVendorSpecificHeaderOptions)\r
-            {\r
-                NS_LOG (DEBUG, "Received vendor specific options");\r
-                uint8_t i = 0;\r
-                OCHeaderOption * rcvdOptions = entityHandlerRequest->rcvdVendorSpecificHeaderOptions;\r
-                for (i = 0; i < entityHandlerRequest->numRcvdVendorSpecificHeaderOptions; i++)\r
-                {\r
-                    if (((OCHeaderOption) rcvdOptions[i]).protocolID == OC_COAP_ID)\r
-                    {\r
-                        OIC_LOG_V(DEBUG, LISTENER_TAG, "Received option with OC_COAP_ID and ID %u with",\r
-                                ((OCHeaderOption)rcvdOptions[i]).optionID );\r
-\r
-                        OIC_LOG_BUFFER(DEBUG, LISTENER_TAG, ((OCHeaderOption)rcvdOptions[i]).optionData,\r
-                                MAX_HEADER_OPTION_DATA_LENGTH);\r
-                    }\r
-                }\r
-                OCHeaderOption * sendOptions = response.sendVendorSpecificHeaderOptions;\r
-                uint8_t option2[] =\r
-                { 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 };\r
-                uint8_t option3[] =\r
-                { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 };\r
-                sendOptions[0].protocolID = OC_COAP_ID;\r
-                sendOptions[0].optionID = 2248;\r
-                memcpy(sendOptions[0].optionData, option2, sizeof(option2));\r
-                sendOptions[0].optionLength = 10;\r
-                sendOptions[1].protocolID = OC_COAP_ID;\r
-                sendOptions[1].optionID = 2600;\r
-                memcpy(sendOptions[1].optionData, option3, sizeof(option3));\r
-                sendOptions[1].optionLength = 10;\r
-                response.numSendVendorSpecificHeaderOptions = 2;\r
-            }\r
-        }\r
     }\r
 \r
     OCPayloadDestroy(response.payload);\r
@@ -192,53 +145,6 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag,
                     entityHandlerRequest->method);\r
             ehResult = OC_EH_OK;\r
         }\r
-\r
-        // If the result isn't an error or forbidden, send response\r
-        if (!((ehResult == OC_EH_ERROR) || (ehResult == OC_EH_FORBIDDEN)))\r
-        {\r
-            // Format the response.  Note this requires some info about the request\r
-            response.requestHandle = entityHandlerRequest->requestHandle;\r
-            response.resourceHandle = entityHandlerRequest->resource;\r
-            response.ehResult = ehResult;\r
-            //response.payload = reinterpret_cast<OCPayload*>(payload);\r
-            response.payload = (OCPayload*) payload;\r
-            // Indicate that response is NOT in a persistent buffer\r
-            response.persistentBufferFlag = 0;\r
-\r
-            // Handle vendor specific options\r
-            if (entityHandlerRequest->rcvdVendorSpecificHeaderOptions\r
-                    && entityHandlerRequest->numRcvdVendorSpecificHeaderOptions)\r
-            {\r
-                NS_LOG(DEBUG, "Received vendor specific options");\r
-                uint8_t i = 0;\r
-                OCHeaderOption * rcvdOptions = entityHandlerRequest->rcvdVendorSpecificHeaderOptions;\r
-                for (i = 0; i < entityHandlerRequest->numRcvdVendorSpecificHeaderOptions; i++)\r
-                {\r
-                    if (((OCHeaderOption) rcvdOptions[i]).protocolID == OC_COAP_ID)\r
-                    {\r
-                        OIC_LOG_V(DEBUG, LISTENER_TAG, "Received option with OC_COAP_ID and ID %u with",\r
-                                ((OCHeaderOption)rcvdOptions[i]).optionID );\r
-\r
-                        OIC_LOG_BUFFER(DEBUG, LISTENER_TAG, ((OCHeaderOption)rcvdOptions[i]).optionData,\r
-                                MAX_HEADER_OPTION_DATA_LENGTH);\r
-                    }\r
-                }\r
-                OCHeaderOption * sendOptions = response.sendVendorSpecificHeaderOptions;\r
-                uint8_t option2[] =\r
-                { 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 };\r
-                uint8_t option3[] =\r
-                { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 };\r
-                sendOptions[0].protocolID = OC_COAP_ID;\r
-                sendOptions[0].optionID = 2248;\r
-                memcpy(sendOptions[0].optionData, option2, sizeof(option2));\r
-                sendOptions[0].optionLength = 10;\r
-                sendOptions[1].protocolID = OC_COAP_ID;\r
-                sendOptions[1].optionID = 2600;\r
-                memcpy(sendOptions[1].optionData, option3, sizeof(option3));\r
-                sendOptions[1].optionLength = 10;\r
-                response.numSendVendorSpecificHeaderOptions = 2;\r
-            }\r
-        }\r
     }\r
 \r
     if (flag & OC_OBSERVE_FLAG)\r
@@ -333,53 +239,6 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
                     entityHandlerRequest->method);\r
             ehResult = OC_EH_OK;\r
         }\r
-\r
-        // If the result isn't an error or forbidden, send response\r
-        if (!((ehResult == OC_EH_ERROR) || (ehResult == OC_EH_FORBIDDEN)))\r
-        {\r
-            // Format the response.  Note this requires some info about the request\r
-            response.requestHandle = entityHandlerRequest->requestHandle;\r
-            response.resourceHandle = entityHandlerRequest->resource;\r
-            response.ehResult = ehResult;\r
-            //response.payload = reinterpret_cast<OCPayload*>(payload);\r
-            response.payload = (OCPayload*) payload;\r
-            // Indicate that response is NOT in a persistent buffer\r
-            response.persistentBufferFlag = 0;\r
-\r
-            // Handle vendor specific options\r
-            if (entityHandlerRequest->rcvdVendorSpecificHeaderOptions\r
-                    && entityHandlerRequest->numRcvdVendorSpecificHeaderOptions)\r
-            {\r
-                NS_LOG(DEBUG, "Received vendor specific options");\r
-                uint8_t i = 0;\r
-                OCHeaderOption * rcvdOptions = entityHandlerRequest->rcvdVendorSpecificHeaderOptions;\r
-                for (i = 0; i < entityHandlerRequest->numRcvdVendorSpecificHeaderOptions; i++)\r
-                {\r
-                    if (((OCHeaderOption) rcvdOptions[i]).protocolID == OC_COAP_ID)\r
-                    {\r
-                        OIC_LOG_V(DEBUG, LISTENER_TAG, "Received option with OC_COAP_ID and ID %u with",\r
-                                ((OCHeaderOption)rcvdOptions[i]).optionID );\r
-\r
-                        OIC_LOG_BUFFER(DEBUG, LISTENER_TAG, ((OCHeaderOption)rcvdOptions[i]).optionData,\r
-                                MAX_HEADER_OPTION_DATA_LENGTH);\r
-                    }\r
-                }\r
-                OCHeaderOption * sendOptions = response.sendVendorSpecificHeaderOptions;\r
-                uint8_t option2[] =\r
-                { 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 };\r
-                uint8_t option3[] =\r
-                { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 };\r
-                sendOptions[0].protocolID = OC_COAP_ID;\r
-                sendOptions[0].optionID = 2248;\r
-                memcpy(sendOptions[0].optionData, option2, sizeof(option2));\r
-                sendOptions[0].optionLength = 10;\r
-                sendOptions[1].protocolID = OC_COAP_ID;\r
-                sendOptions[1].optionID = 2600;\r
-                memcpy(sendOptions[1].optionData, option3, sizeof(option3));\r
-                sendOptions[1].optionLength = 10;\r
-                response.numSendVendorSpecificHeaderOptions = 2;\r
-            }\r
-        }\r
     }\r
 \r
     if (flag & OC_OBSERVE_FLAG)\r
@@ -389,7 +248,6 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
 \r
         NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_OBSERVE_FLAG");\r
 \r
-\r
         OCObserveAction ocObAction = entityHandlerRequest->obsInfo.action;\r
 \r
         if (ocObAction == OC_OBSERVE_REGISTER)\r