Check enabled before sending rfcomm details

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-rfcomm-client.c

diff --git a/bt-api/bt-rfcomm-client.c b/bt-api/bt-rfcomm-client.c
index 0e4b1e7..c362fd0 100644 (file)
--- a/bt-api/bt-rfcomm-client.c
+++ b/bt-api/bt-rfcomm-client.c
@@ -28,10 +28,7 @@
 #include "bt-common.h"
 #include "bt-request-sender.h"
 #include "bt-event-handler.h"
-
-#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-dpm.h"
-#endif
 
 /* Variable for privilege, only for write API,
   before we should reduce time to bt-service dbus calling
@@ -368,6 +365,7 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond,
        GIOStatus status = G_IO_STATUS_NORMAL;
        GError *err = NULL;
        int fd;
+       static int resource_unavailable_cnt = 0;
 
        retv_if(info == NULL, FALSE);
        fd = g_io_channel_unix_get_fd(chan);
@@ -396,35 +394,31 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond,
                BT_ERR("IO Channel read is failed with %d", status);
 
                g_free(buffer);
-               if (err || status == G_IO_STATUS_EOF) {
-                       if (err)
-                               BT_ERR("IO Channel read error [%s]", err->message);
-                       if ((status == G_IO_STATUS_EOF) ||
-                                       (status == G_IO_STATUS_ERROR &&
-                                       __is_error_by_disconnect(err))) {
+
+               if (err) {
+                       BT_ERR("IO Channel read error [%s]", err->message);
+                       if (status == G_IO_STATUS_ERROR &&
+                                       __is_error_by_disconnect(err)) {
 
                                BT_ERR("cond : %d", cond);
-                               if (err)
-                                       g_error_free(err);
-
-                               conn_info = __get_conn_info_from_fd(info, fd);
-                               if (conn_info == NULL) {
-                                       BT_ERR("No Connection info found with FD [%d]", fd);
-                                       return FALSE;
-                               }
-
-                               if (conn_info->disconnected == FALSE) {
-                                       close(conn_info->fd);
-                                       conn_info->disconnected = TRUE;
-                               }
-                               __rfcomm_client_disconnect(info);
-                               return FALSE;
-                       }
-                       if (err)
                                g_error_free(err);
+                               goto fail;
+                       }
+                       g_error_free(err);
                }
+
+               if (status == G_IO_STATUS_ERROR ||
+                       status == G_IO_STATUS_EOF) {
+                       goto fail;
+               } else if (status == G_IO_STATUS_AGAIN) {
+                       resource_unavailable_cnt++;
+                       if (resource_unavailable_cnt > 10)
+                               goto fail;
+               }
+
                return TRUE;
        }
+       resource_unavailable_cnt = 0;
 
        event_info = _bt_event_get_cb_data(BT_RFCOMM_CLIENT_EVENT);
        if (event_info == NULL) {
@@ -450,6 +444,21 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond,
 
        g_free(buffer);
        return TRUE;
+
+fail:
+       conn_info = __get_conn_info_from_fd(info, fd);
+       if (conn_info == NULL) {
+               BT_ERR("No Connection info found with FD [%d]", fd);
+               return FALSE;
+       }
+
+       if (conn_info->disconnected == FALSE) {
+               close(conn_info->fd);
+               conn_info->disconnected = TRUE;
+       }
+       __rfcomm_client_disconnect(info);
+
+       return FALSE;
 }
 
 static void __client_connected_cb(rfcomm_cb_data_t *cb_data, char *dev_address,
@@ -1057,7 +1066,6 @@ BT_EXPORT_API int bluetooth_rfcomm_connect(
        BT_CHECK_PARAMETER(remote_uuid, return);
        BT_CHECK_ENABLED(return);
 
-#ifdef TIZEN_FEATURE_BT_DPM
        if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_bt_address) == BT_DPM_RESTRICTED) {
                BT_ERR("Blacklist device");
                return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
@@ -1081,7 +1089,6 @@ BT_EXPORT_API int bluetooth_rfcomm_connect(
                        return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION;
                }
        }
-#endif
 
 #ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT
        BT_INFO_C("### Connect RFCOMM");