provide setConfigure API related BT including EDR, BLE by cautil.

It can be set Adv Flag that check whether start Adv
in initialize step or not.
and It will resolve battery consumption issue.

Change-Id: I09791c1d8ca71373c36309150dbc97c5031a8bc2
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16491
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>

diff --git a/java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java b/java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
index f8f0661..5a88476 100644 (file)
--- a/java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
+++ b/java/iotivity-android/src/main/java/org/iotivity/ca/CaInterface.java
@@ -255,6 +255,14 @@ public class CaInterface {
     }
     private static native void stopLeAdvertisingImpl();
 
+    /**
+     *  set BT configure
+     */
+    public synchronized static void setBTConfigure(int flag){
+        CaInterface.setBTConfigureImpl(flag);
+    }
+    private static native void setBTConfigureImpl(int flag);
+
     public synchronized static int setCipherSuite(OicCipher cipher, OcConnectivityType connType){
         return CaInterface.setCipherSuiteImpl(cipher.getValue(), connType.getValue());
     }

diff --git a/java/jni/JniCaInterface.c b/java/jni/JniCaInterface.c
index d7ed9b2..a2ce4a0 100644 (file)
--- a/java/jni/JniCaInterface.c
+++ b/java/jni/JniCaInterface.c
@@ -429,6 +429,16 @@ Java_org_iotivity_ca_CaInterface_stopLeAdvertisingImpl(JNIEnv *env, jclass clazz
     CAUtilStopLEAdvertising();
 }
 
+JNIEXPORT void JNICALL
+Java_org_iotivity_ca_CaInterface_setBTConfigureImpl(JNIEnv *env, jclass clazz, jint flag)
+{
+    LOGI("setConfigureImpl");
+    (void)env;
+    (void)clazz;
+    CAUtilConfig_t configs = {(CATransportBTFlags_t)flag};
+    CAUtilSetBTConfigure(configs);
+}
+
 JNIEXPORT jint JNICALL Java_org_iotivity_ca_CaInterface_setCipherSuiteImpl
   (JNIEnv *env, jclass clazz, jint cipherSuite, jint adapter)
 {

diff --git a/resource/csdk/connectivity/api/cacommon.h b/resource/csdk/connectivity/api/cacommon.h
index 949c9fd..f971ec7 100755 (executable)
--- a/resource/csdk/connectivity/api/cacommon.h
+++ b/resource/csdk/connectivity/api/cacommon.h
@@ -214,6 +214,16 @@ typedef enum
     CA_SCOPE_GLOBAL    = 0xE, // IPv6 Global scope
 } CATransportFlags_t;
 
+typedef enum
+{
+    CA_DEFAULT_BT_FLAGS = 0,
+    // flags for BLE transport
+    CA_LE_ADV_DISABLE   = 0x1,   // disable BLE advertisement
+    CA_LE_ADV_ENABLE    = 0x2,   // enable BLE advertisement
+    // flags for EDR transport
+    CA_EDR_SERVER_DISABLE = (1 << 7)
+} CATransportBTFlags_t;
+
 #define CA_IPFAMILY_MASK (CA_IPV6|CA_IPV4)
 #define CA_SCOPE_MASK 0xf     // mask scope bits above
 
@@ -619,6 +629,7 @@ typedef struct
         bool ipv6tcpenabled;    /**< IPv6 TCP enabled by OCInit flags */
     } tcp;
 #endif
+    CATransportBTFlags_t bleFlags;   /**< flags related BLE transport */
 } CAGlobals_t;
 
 extern CAGlobals_t caglobals;

diff --git a/resource/csdk/connectivity/api/cautilinterface.h b/resource/csdk/connectivity/api/cautilinterface.h
index 094fdd6..c29d486 100644 (file)
--- a/resource/csdk/connectivity/api/cautilinterface.h
+++ b/resource/csdk/connectivity/api/cautilinterface.h
@@ -52,6 +52,15 @@ typedef struct
     CMSpeedLevel_t level;
 } CMConfigureInfo_t;
 
+/*
+ * CAUtilConfig_t structure.
+ */
+typedef struct
+{
+    CATransportBTFlags_t bleFlags;
+    CMConfigureInfo_t cmInfo;
+} CAUtilConfig_t;
+
 /**
  * Callback function type for connection status changes delivery.
  * @param[out]   info           Remote endpoint information.
@@ -209,6 +218,12 @@ CAResult_t CAUtilStartLEAdvertising();
  */
 CAResult_t CAUtilStopLEAdvertising();
 
+/**
+ * set CAUtil BT configure.
+ * @param[in]  config       ::CAUtilConfig_t value
+ * @return  ::CA_STATUS_OK or ERROR CODES (::CAResult_t error codes in cacommon.h).
+ */
+CAResult_t CAUtilSetBTConfigure(CAUtilConfig_t config);
 #ifdef __cplusplus
 } /* extern "C" */
 #endif //__cplusplus

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
index ed0ac42..8350f4a 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
@@ -413,6 +413,13 @@ CAResult_t CALEServerSendResponse(JNIEnv *env, jobject device, jint requestId, j
 
 CAResult_t CALEServerStartAdvertise()
 {
+    if ((caglobals.bleFlags & CA_LE_ADV_DISABLE) || CA_DEFAULT_BT_FLAGS == caglobals.bleFlags)
+    {
+        OIC_LOG_V(INFO, TAG, "the advertisement of the bleFlags is disable[%d]",
+                  caglobals.bleFlags);
+        return CA_STATUS_OK;
+    }
+
     if (!g_jvm)
     {
         OIC_LOG(ERROR, TAG, "g_jvm is null");
@@ -1798,7 +1805,7 @@ CAResult_t CALEServerStartMulticastServer()
     }
 
     // start advertise
-    ret = CALEServerStartAdvertise(env, g_leAdvertiseCallback);
+    ret = CALEServerStartAdvertise();
     if (CA_STATUS_OK != ret)
     {
         OIC_LOG(ERROR, TAG, "CALEServerStartAdvertise has failed");

diff --git a/resource/csdk/connectivity/util/inc/camanagerleinterface.h b/resource/csdk/connectivity/util/inc/camanagerleinterface.h
index 95f4916..bfe29b5 100644 (file)
--- a/resource/csdk/connectivity/util/inc/camanagerleinterface.h
+++ b/resource/csdk/connectivity/util/inc/camanagerleinterface.h
@@ -92,6 +92,12 @@ CAResult_t CAManagerLEStartAdvertising();
  */
 CAResult_t CAManagerLEStopAdvertising();
 
+/**
+ * set CAUtilConfig_t configure.
+ * @param[in]  config       ::CAUtilConfig_t value
+ */
+void CAManagerSetConfigure(CAUtilConfig_t config);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

diff --git a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
index edefd64..2c02fce 100644 (file)
--- a/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
+++ b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
@@ -292,6 +292,12 @@ void CAManagerLEStopScan()
     CALERestartScanWithInterval(0, 0, BLE_SCAN_DISABLE);
 }
 
+void CAManagerSetConfigure(CAUtilConfig_t config)
+{
+    OIC_LOG_V(INFO, TAG, "set configure for bleFlags : %d", config.bleFlags);
+    caglobals.bleFlags = config.bleFlags;
+}
+
 CAResult_t CAManagerLEStartAdvertising()
 {
     CAResult_t ret = CALEServerStartAdvertise();

diff --git a/resource/csdk/connectivity/util/src/cautilinterface.c b/resource/csdk/connectivity/util/src/cautilinterface.c
index f570bcb..57e8261 100644 (file)
--- a/resource/csdk/connectivity/util/src/cautilinterface.c
+++ b/resource/csdk/connectivity/util/src/cautilinterface.c
@@ -335,3 +335,17 @@ CAResult_t CAUtilStopLEAdvertising()
     return CA_NOT_SUPPORTED;
 #endif
 }
+
+CAResult_t CAUtilSetBTConfigure(CAUtilConfig_t config)
+{
+    OIC_LOG_V(DEBUG, TAG, "CAUtilSetConfigure");
+    OIC_LOG_V(DEBUG, TAG, "bleFlag [%d]", config.bleFlags);
+#if (defined(__ANDROID__) && defined(LE_ADAPTER))
+    CAManagerSetConfigure(config);
+    return CA_STATUS_OK;
+#else
+    (void) config;
+    OIC_LOG(DEBUG, TAG, "it is not supported");
+    return CA_NOT_SUPPORTED;
+#endif
+}

diff --git a/resource/csdk/include/octypes.h b/resource/csdk/include/octypes.h
index 5155fa5..8adb2ac 100755 (executable)
--- a/resource/csdk/include/octypes.h
+++ b/resource/csdk/include/octypes.h
@@ -671,6 +671,16 @@ typedef enum
     OC_ADAPTER_NFC           = (1 << 5)
 } OCTransportAdapter;
 
+typedef enum
+{
+    OC_DEFAULT_BT_FLAGS = 0,
+    // flags for BLE transport
+    OC_LE_ADV_DISABLE   = 0x1,   // disable BLE advertisement
+    OC_LE_ADV_ENABLE    = 0x2,   // enable BLE advertisement
+    // flags for EDR transport
+    OC_EDR_SERVER_DISABLE = (1 << 7)
+} OCTransportBTFlags_t;
+
 /**
  *  Enum layout assumes some targets have 16-bit integer (e.g., Arduino).
  */
@@ -1821,7 +1831,6 @@ typedef OCEntityHandlerResult (*OCDeviceEntityHandler)
  */
 typedef void (*OCDirectPairingCB)(void *ctx, OCDPDev_t *peer, OCStackResult result);
 //#endif // DIRECT_PAIRING
-
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
 /**
  * Callback function definition for Change in TrustCertChain

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 355584a..08ca676 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -2394,6 +2394,10 @@ OCStackResult OCStop()
         return OC_STACK_ERROR;
     }
 
+    // unset cautil config
+    CAUtilConfig_t configs = {(CATransportBTFlags_t)CA_DEFAULT_BT_FLAGS};
+    CAUtilSetBTConfigure(configs);
+
     stackState = OC_STACK_UNINIT_IN_PROGRESS;
 
 #ifdef WITH_PRESENCE

diff --git a/resource/include/CAManager.h b/resource/include/CAManager.h
index e227b16..ba758c0 100644 (file)
--- a/resource/include/CAManager.h
+++ b/resource/include/CAManager.h
@@ -32,6 +32,23 @@ namespace OC
     */
     namespace CAManager
     {
+        /**
+         *  Data structure to provide the configuration for cautil.
+         */
+        struct CAUtilConfig
+        {
+            /** the flag for ble advertising. */
+            OCTransportBTFlags_t       bleFlag;
+
+            public:
+                CAUtilConfig()
+                    : bleFlag(OC_DEFAULT_BT_FLAGS)
+            {}
+                CAUtilConfig(OCTransportBTFlags_t bleFlag_)
+                    : bleFlag(bleFlag_)
+            {}
+        };
+
         // typedef to get adapter status changes from CA.
         typedef std::function<void(const std::string&, OCConnectivityType,
                                    bool)> ConnectionChangedCallback;
@@ -76,16 +93,23 @@ namespace OC
 
         /**
          * start BLE advertising.
-        * @return Returns ::OC_STACK_OK if success.
+         * @return Returns ::OC_STACK_OK if success.
          */
         OCStackResult startLEAdvertising();
 
         /**
          * stop BLE advertising.
-        * @return Returns ::OC_STACK_OK if success.
+         * @return Returns ::OC_STACK_OK if success.
          */
         OCStackResult stopLEAdvertising();
 
+        /**
+         * set BT configure.
+         * @param[in]  config       ::CAUtilConfig data
+         * @return Returns ::OC_STACK_OK if success.
+         */
+        OCStackResult setBTConfigure(const CAUtilConfig& config);
+
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
         /**
          * Select the cipher suite for TLS/DTLS handshake.

diff --git a/resource/src/CAManager.cpp b/resource/src/CAManager.cpp
index 47cc11c..380b3d7 100644 (file)
--- a/resource/src/CAManager.cpp
+++ b/resource/src/CAManager.cpp
@@ -29,6 +29,9 @@
 #include "CAManager.h"
 #include "cautilinterface.h"
 #include "casecurityinterface.h"
+#include "logger.h"
+
+#define TAG "OIC_CAMANAGER"
 
 using namespace OC;
 
@@ -127,6 +130,15 @@ uint16_t CAManager::getAssignedPortNumber(OCTransportAdapter adapter, OCTranspor
 {
     return CAGetAssignedPortNumber((CATransportAdapter_t) adapter, (CATransportFlags_t) flag);
 }
+
+OCStackResult CAManager::setBTConfigure(const CAUtilConfig& config)
+{
+    OIC_LOG(INFO, TAG, "setBTConfigure");
+    CAUtilConfig_t configs = {(CATransportBTFlags_t)config.bleFlag};
+    CAResult_t ret = CAUtilSetBTConfigure(configs);
+    return convertCAResultToOCResult(ret);
+}
+
 #if defined(__WITH_DTLS__) || defined(__WITH_TLS__)
 OCStackResult CAManager::setCipherSuite(const uint16_t cipher, OCTransportAdapter adapter)
 {