From 1a016ef372bd715d68e95fd54fc2d1af2f874a12 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Thu, 3 Mar 2016 16:59:29 +0900 Subject: [PATCH] To add "coap+tcp://" header to url for EDR and BLE since CoAP over TCP was applied to EDR and BLE transport type, coap+tcp:// header has to be used. Change-Id: I682d7b4adcb9be51fa811461b8eb24bc7522c211 Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/5333 Tested-by: jenkins-iotivity Reviewed-by: Jon A. Cruz --- resource/src/OCResource.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resource/src/OCResource.cpp b/resource/src/OCResource.cpp index 47bb950..9dd6b46 100644 --- a/resource/src/OCResource.cpp +++ b/resource/src/OCResource.cpp @@ -126,7 +126,6 @@ void OCResource::setHost(const std::string& host) 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); } else { @@ -423,7 +422,9 @@ std::string OCResource::host() const { ss << COAPS; } - else if (m_devAddr.adapter & OC_ADAPTER_TCP) + else if ((m_devAddr.adapter & OC_ADAPTER_TCP) + || (m_devAddr.adapter & OC_ADAPTER_GATT_BTLE) + || (m_devAddr.adapter & OC_ADAPTER_RFCOMM_BTEDR)) { ss << COAP_TCP; } -- 2.7.4