From 8e9936a68f18d1460b30bb7cbf12838add46efd5 Mon Sep 17 00:00:00 2001 From: "hyuna0213.jo" Date: Thu, 1 Oct 2015 19:01:50 +0900 Subject: [PATCH] remove a preprocessor for TCP_ADAPTER in RI. since there is a preprocessor for TCP_ADAPTER in RI. when user is using a interface file(octype.h) user application have to add -DTCP_ADAPTER flag in their App. since CA already check TCP_ADAPTER flag, it is better to remove this preprocessor in RI. Change-Id: I8dd2998831d9744e25e68c024b2b3e3fbbbc1633 Signed-off-by: jihwan.seo Signed-off-by: hyuna0213.jo Reviewed-on: https://gerrit.iotivity.org/gerrit/3349 Tested-by: jenkins-iotivity Reviewed-by: Ashok Babu Channa Reviewed-by: Jon A. Cruz (cherry picked from commit 5565bfe4f9536cdaf57bc67c3bbdd109b567ec82) Reviewed-on: https://gerrit.iotivity.org/gerrit/4491 Reviewed-by: Uze Choi --- resource/csdk/stack/include/octypes.h | 6 ------ resource/csdk/stack/src/ocserverrequest.c | 6 ------ resource/csdk/stack/src/ocstack.c | 20 ++------------------ resource/src/OCResource.cpp | 7 ------- 4 files changed, 2 insertions(+), 37 deletions(-) diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index 1115c00..6486dce 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -336,11 +336,8 @@ typedef enum /**Remote Access over XMPP.*/ OC_ADAPTER_REMOTE_ACCESS = (1 << 3), #endif - -#ifdef TCP_ADAPTER /** CoAP over TCP.*/ OC_ADAPTER_TCP = (1 << 4) -#endif } OCTransportAdapter; @@ -462,11 +459,8 @@ typedef enum /** Remote Access over XMPP.*/ CT_ADAPTER_REMOTE_ACCESS = (1 << 19), #endif - -#ifdef TCP_ADAPTER /** CoAP over TCP.*/ CT_ADAPTER_TCP = (1 << 20), -#endif /** Insecure transport is the default (subject to change).*/ diff --git a/resource/csdk/stack/src/ocserverrequest.c b/resource/csdk/stack/src/ocserverrequest.c index a15fcc1..6e44d4c 100644 --- a/resource/csdk/stack/src/ocserverrequest.c +++ b/resource/csdk/stack/src/ocserverrequest.c @@ -634,10 +634,7 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse) #ifdef RA_ADAPTER , CA_ADAPTER_REMOTE_ACCESS #endif - -#ifdef TCP_ADAPTER , CA_ADAPTER_TCP -#endif }; size_t size = sizeof(CAConnTypes)/ sizeof(CATransportAdapter_t); @@ -655,10 +652,7 @@ OCStackResult HandleSingleResponse(OCEntityHandlerResponse * ehResponse) #ifdef RA_ADAP | CA_ADAPTER_REMOTE_ACCESS #endif - -#ifdef TCP_ADAPTER | CA_ADAPTER_TCP -#endif ); } diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c index dddbfdd..f530616 100755 --- a/resource/csdk/stack/src/ocstack.c +++ b/resource/csdk/stack/src/ocstack.c @@ -113,10 +113,8 @@ static bool gRASetInfo = false; #endif OCDeviceEntityHandler defaultDeviceHandler; void* defaultDeviceHandlerCallbackParameter = NULL; - -#ifdef TCP_ADAPTER static const char COAP_TCP[] = "coap+tcp:"; -#endif + //----------------------------------------------------------------------------- // Macros @@ -1877,17 +1875,6 @@ OCStackResult OCInit1(OCMode mode, OCTransportFlags serverFlags, OCTransportFlag caglobals.clientFlags = (CATransportFlags_t)(caglobals.clientFlags|CA_IPV4|CA_IPV6); } -#ifdef TCP_ADAPTER - if (!(caglobals.serverFlags & CA_IPFAMILY_MASK)) - { - caglobals.serverFlags = (CATransportFlags_t)(caglobals.serverFlags|CA_IPV4); - } - if (!(caglobals.clientFlags & CA_IPFAMILY_MASK)) - { - caglobals.clientFlags = (CATransportFlags_t)(caglobals.clientFlags|CA_IPV4); - } -#endif - defaultDeviceHandler = NULL; defaultDeviceHandlerCallbackParameter = NULL; @@ -2129,7 +2116,6 @@ static OCStackResult ParseRequestUri(const char *fullUri, return OC_STACK_INVALID_URI; } -#ifdef TCP_ADAPTER // process url scheme size_t prefixLen = slash2 - fullUri; bool istcp = false; @@ -2140,7 +2126,6 @@ static OCStackResult ParseRequestUri(const char *fullUri, istcp = true; } } -#endif // TODO: this logic should come in with unit tests exercising the various strings // processs url prefix, if any @@ -2172,13 +2157,12 @@ static OCStackResult ParseRequestUri(const char *fullUri, { // ipv4 address colon = strchr(start, ':'); end = (colon && colon < slash) ? colon : slash; -#ifdef TCP_ADAPTER + if (istcp) { // coap over tcp adapter = (OCTransportAdapter)(adapter | OC_ADAPTER_TCP); } else -#endif { adapter = (OCTransportAdapter)(adapter | OC_ADAPTER_IP); flags = (OCTransportFlags)(flags | OC_IP_USE_V4); diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index 204b0da..2d11e46 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -28,10 +28,7 @@ namespace OC { static const char COAP[] = "coap://"; static const char COAPS[] = "coaps://"; - -#ifdef TCP_ADAPTER static const char COAP_TCP[] = "coap+tcp://"; -#endif using OC::nil_guard; using OC::result_guard; @@ -127,13 +124,11 @@ void OCResource::setHost(const std::string& host) prefix_len = sizeof(COAPS) - 1; m_devAddr.flags = static_cast(m_devAddr.flags & OC_SECURE); } -#ifdef TCP_ADAPTER else if (host.compare(0, sizeof(COAP_TCP) - 1, COAP_TCP) == 0) { prefix_len = sizeof(COAP_TCP) - 1; m_devAddr.adapter = static_cast(m_devAddr.adapter & OC_ADAPTER_TCP); } -#endif else { throw ResourceInitException(m_uri.empty(), m_resourceTypes.empty(), @@ -417,12 +412,10 @@ std::string OCResource::host() const { ss << COAPS; } -#ifdef TCP_ADAPTER else if (m_devAddr.adapter & OC_ADAPTER_TCP) { ss << COAP_TCP; } -#endif else { ss << COAP; -- 2.7.4