commit ccd29841c3799c68ed90eb050661ffeccea78c9b
author Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Mon Oct 24 19:32:57 2016 +0300
committer Szymon Janc <szymon.janc@codecoup.pl> Mon Oct 24 21:18:27 2016 +0200
tree 5bed5b29a063293bc9734826032528a155001254
parent 206bee144e2b7e3190677ffbf4f231dd2e728f5c

core/profile: Fix calling service_accept

service_accept shall only be used with profiles that implement .accept
callback, to set connecting state directly use service_set_connecting
which does not require .accept to be implemented.

src/profile.c

diff --git a/src/profile.c b/src/profile.c
index c81a9f9..7c5318c 100644
--- a/src/profile.c
+++ b/src/profile.c
@@ -1047,7 +1047,7 @@
 									conn);
 	}
 
-	if (conn->service && service_accept(conn->service) < 0)
+	if (conn->service && service_set_connecting(conn->service) < 0)
 		goto drop;
 
 	if (send_new_connection(ext, conn))

src/service.c

diff --git a/src/service.c b/src/service.c
index 20a41d0..207ffae 100644
--- a/src/service.c
+++ b/src/service.c
@@ -214,6 +214,25 @@
 	return 0;
 }
 
+int service_set_connecting(struct btd_service *service)
+{
+	switch (service->state) {
+	case BTD_SERVICE_STATE_UNAVAILABLE:
+		return -EINVAL;
+	case BTD_SERVICE_STATE_DISCONNECTED:
+		break;
+	case BTD_SERVICE_STATE_CONNECTING:
+	case BTD_SERVICE_STATE_CONNECTED:
+		return 0;
+	case BTD_SERVICE_STATE_DISCONNECTING:
+		return -EBUSY;
+	}
+
+	change_state(service, BTD_SERVICE_STATE_CONNECTING, 0);
+
+	return 0;
+}
+
 int btd_service_connect(struct btd_service *service)
 {
 	struct btd_profile *profile = service->profile;

src/service.h

diff --git a/src/service.h b/src/service.h
index c1f97f6..6f1edfb 100644
--- a/src/service.h
+++ b/src/service.h
@@ -49,6 +49,7 @@
 void service_remove(struct btd_service *service);
 
 int service_accept(struct btd_service *service);
+int service_set_connecting(struct btd_service *service);
 
 /* Connection control API */
 int btd_service_connect(struct btd_service *service);