device: Fix calling DisconnectProfile DBus call with disconnected profile UUID

When DisconnectProfile is called with disconnected UUID, bluetooth daemon often returned error "Operation already in progress". This change fixed it and no error message is returned for this case.

---
 src/device.c  | 5 +++++
 src/service.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

src/device.c +5 -0

index 149c45160..229579378 100644
@@ -2054,6 +2054,9 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,
        if (dev->disconnect)
                return btd_error_in_progress(msg);
 
+       if (btd_service_get_state(service) == BTD_SERVICE_STATE_DISCONNECTED)
+               return dbus_message_new_method_return(msg);
+
        dev->disconnect = dbus_message_ref(msg);
 
        err = btd_service_disconnect(service);

@@ -2065,6 +2068,8 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,
 
        if (err == -ENOTSUP)
                return btd_error_not_supported(msg);
+       else if (err == -EALREADY)
+               return dbus_message_new_method_return(msg);
 
        return btd_error_failed(msg, strerror(-err));
 }

src/service.c +0 -0

index c14ee0aca..e4d747a6e 100644

src/service.c +0 -1

        case BTD_SERVICE_STATE_CONNECTING:
        case BTD_SERVICE_STATE_CONNECTED:
                break;
--

2.20.1

Hi Pali,

Quoted 42 lines · Pali Rohár

When DisconnectProfile is called with disconnected UUID, bluetooth daemon often returned error "Operation already in progress". This change fixed it and no error message is returned for this case.

---
 src/device.c  | 5 +++++
 src/service.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

src/device.c +5 -0

index 149c45160..229579378 100644
@@ -2054,6 +2054,9 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,
        if (dev->disconnect)
                return btd_error_in_progress(msg);
 
+       if (btd_service_get_state(service) == BTD_SERVICE_STATE_DISCONNECTED)
+               return dbus_message_new_method_return(msg);
+
        dev->disconnect = dbus_message_ref(msg);
 
        err = btd_service_disconnect(service);

@@ -2065,6 +2068,8 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,
 
        if (err == -ENOTSUP)
                return btd_error_not_supported(msg);
+       else if (err == -EALREADY)
+               return dbus_message_new_method_return(msg);
 
        return btd_error_failed(msg, strerror(-err));
 }

src/service.c +0 -1

index c14ee0aca..e4d747a6e 100644
@@ -281,8 +281,9 @@ int btd_service_disconnect(struct btd_service *service)
        case BTD_SERVICE_STATE_UNAVAILABLE:
                return -EINVAL;
        case BTD_SERVICE_STATE_DISCONNECTED:
-       case BTD_SERVICE_STATE_DISCONNECTING:
                return -EALREADY;

src/service.c int btd_service_disconnect(struct btd_service *service) · line 286

Quoted 2 lines

src/service.c +2 -0

+       case BTD_SERVICE_STATE_DISCONNECTING:
+               return 0;

Have you checked if there are no side effects of this change? Since you have a call to btd_service_get_service I wonder if this is really necessary or you want to change the behavior to not return an error even in case of disconnecting state? But even in that case you are checking if for -EALREADY and returning no error.

Quoted 6 lines

src/service.c +0 -1

        case BTD_SERVICE_STATE_CONNECTING:
        case BTD_SERVICE_STATE_CONNECTED:
                break;
--

2.20.1

Signature · 1 line

Luiz Augusto von Dentz

Quoted 45 lines · On Monday 27 April 2020 09:37:39 Luiz Augusto von Dentz wrote:

Hi Pali,

Quoted 42 lines · Pali Rohár

When DisconnectProfile is called with disconnected UUID, bluetooth daemon often returned error "Operation already in progress". This change fixed it and no error message is returned for this case.

---
 src/device.c  | 5 +++++
 src/service.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

src/device.c +5 -0

index 149c45160..229579378 100644
@@ -2054,6 +2054,9 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,
        if (dev->disconnect)
                return btd_error_in_progress(msg);
 
+       if (btd_service_get_state(service) == BTD_SERVICE_STATE_DISCONNECTED)
+               return dbus_message_new_method_return(msg);
+
        dev->disconnect = dbus_message_ref(msg);
 
        err = btd_service_disconnect(service);

@@ -2065,6 +2068,8 @@ static DBusMessage *disconnect_profile(DBusConnection *conn, DBusMessage *msg,
 
        if (err == -ENOTSUP)
                return btd_error_not_supported(msg);
+       else if (err == -EALREADY)
+               return dbus_message_new_method_return(msg);
 
        return btd_error_failed(msg, strerror(-err));
 }

src/service.c +0 -1

index c14ee0aca..e4d747a6e 100644
@@ -281,8 +281,9 @@ int btd_service_disconnect(struct btd_service *service)
        case BTD_SERVICE_STATE_UNAVAILABLE:
                return -EINVAL;
        case BTD_SERVICE_STATE_DISCONNECTED:
-       case BTD_SERVICE_STATE_DISCONNECTING:
                return -EALREADY;

Quoted 8 lines

src/service.c int btd_service_disconnect(struct btd_service *service) · line 286

Quoted 2 lines

src/service.c +2 -0

+       case BTD_SERVICE_STATE_DISCONNECTING:
+               return 0;

Have you checked if there are no side effects of this change? Since you have a call to btd_service_get_service I wonder if this is really necessary or you want to change the behavior to not return an error even in case of disconnecting state? But even in that case you are checking if for -EALREADY and returning no error.

Same logic is used in btd_service_connect() function. When service is in disconnecting state then it will receive state change to disconnected. So returning zero is should same as issuing disconnect request again.

Quoted 5 lines

Quoted 5 lines

src/service.c +0 -1

        case BTD_SERVICE_STATE_CONNECTING:
        case BTD_SERVICE_STATE_CONNECTED:
                break;
--

2.20.1