[Bluez-devel] Some Audio error handling fixes.

Fabien Chevalier

author

2008-09-13 15:54 UTC #0 lore raw

Hi all,

While running tests on bluez-utils lately i found a number of big and little error handling issues.
Attached patchset fixes all of them :-)

Can anyone have a look to it ?

While reading the latest code, i noticed common/error.{c, h} is gone... There's a new one in src/, but with only one generic
error handling routine. I have the feeling this is a big step backwards, as DBUS error names get duplicated into each service
again and again, paving the way for un unmanageable level of error strings fragmentation :-( What do you guys think ?

Cheers,

Fabien

Quoted 1 line

Quoted 1 line
From a22fa4ea791b5555673cdb1729f8d72510fbb74f Mon Sep 17 00:00:00 2001

From: Fabien Chevalier <[email protected]>
Date: Sat, 13 Sep 2008 17:11:08 +0200
Subject: [PATCH] Error code fixes

In case of socket errors, we used to return a positive value where the convention is to return negative values only

---
 audio/avdtp.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

audio/avdtp.c +5 -5

index 592322f..ae56910 100644
@@ -1380,7 +1380,7 @@ static gboolean avdtp_parse_cmd(struct avdtp *session,
 		debug("Received DISCOVER_CMD");
 		return avdtp_discover_cmd(session, (void *) header, size);
 	case AVDTP_GET_CAPABILITIES:
-		debug("Received  GET_CAPABILITIES_CMD");
+		debug("Received	GET_CAPABILITIES_CMD");
 		return avdtp_getcap_cmd(session, (void *) header, size);
 	case AVDTP_SET_CONFIGURATION:
 		debug("Received SET_CONFIGURATION_CMD");

@@ -1559,9 +1559,9 @@ static void l2cap_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
 	len = sizeof(l2o);
 	if (getsockopt(sk, SOL_L2CAP, L2CAP_OPTIONS, &l2o,
 				&len) < 0) {
-		err = errno;
-		error("getsockopt(L2CAP_OPTIONS): %s (%d)", strerror(err),
-				err);
+		err = -errno;
+		error("getsockopt(L2CAP_OPTIONS): %s (%d)", strerror(-err),
+				-err);
 		goto failed;
 	}

@@ -1598,7 +1598,7 @@ failed:
 					AVDTP_STATE_IDLE);
 		session->pending_open = NULL;
 	} else
-		connection_lost(session, -err);
+		connection_lost(session, err);
 
 	return;
 }

Signature · 1 line

1.5.6.5

Quoted 1 line

Quoted 1 line
From dbaed0dc30ebe2a4503a43d2e8e9fd69f1eced2d Mon Sep 17 00:00:00 2001

From: Fabien Chevalier <[email protected]>
Date: Sat, 13 Sep 2008 17:13:27 +0200
Subject: [PATCH] Connect() fix.

In case we are unable to connect the sink, we forget to send DBUS reply. Caller is stuck forever...

---
 audio/sink.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

audio/sink.c +2 -2

index c6d2dc4..e79b9f1 100644
@@ -381,11 +381,11 @@ static void discovery_complete(struct avdtp *session, GSList *seps, struct avdtp
 	return;
 
 failed:
-	pending_request_free(pending);
+	error_failed(pending->conn, pending->msg, "Stream setup failed");
+ 	pending_request_free(pending);
 	sink->connect = NULL;
 	avdtp_unref(sink->session);
 	sink->session = NULL;
-	error_failed(pending->conn, pending->msg, "Stream setup failed");
 }
 
 static DBusMessage *sink_connect(DBusConnection *conn,

Signature · 1 line

1.5.6.5

Quoted 1 line

Quoted 1 line
From 6a3a4f1229728754e01f3bc7911c3d508348a56f Mon Sep 17 00:00:00 2001

From: Fabien Chevalier <[email protected]>
Date: Sat, 13 Sep 2008 17:14:34 +0200
Subject: [PATCH] Error value fixes.

In case the HSP/HFP headset is down, we return "not supported" : this is non-sense :
change that to connection attempt failed

---
 audio/headset.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

audio/headset.c +7 -2

index 102d0bc..45bcf34 100644
@@ -1074,7 +1074,9 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data)
 	if (err < 0) {
 		error("Unable to get service record: %s (%d)", strerror(-err),
 			-err);
-		goto failed_not_supported;
+		error_connection_attempt_failed(dev->conn, p->msg, p->err);
+
+		goto failed;
 	}
 
 	if (!recs || !recs->data) {

@@ -1140,10 +1142,13 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data)
 failed_not_supported:
 	if (p->msg) {
 		error_not_supported(dev->conn, p->msg);
+	}
+failed:
+	if (p->msg) {
 		dbus_message_unref(p->msg);
 		p->msg = NULL;
 	}
-failed:
+
 	if (classes)
 		sdp_list_free(classes, free);
 	pending_connect_finalize(dev);

Signature · 1 line

1.5.6.5

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Luiz Augusto von Dentz

maintainer

2008-09-13 16:12 UTC #1 lore raw

Hi,

Looks good to me, can you configure a git tree to pull from? If you don't have a host you can use http://gitorious.org/projects/bluez,
just create an account and clone repository.

-- =

Luiz Augusto von Dentz
Engenheiro de Computa=E7=E3o

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great priz= es
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=3D100&url=3D/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Fabien Chevalier

author

2008-09-13 19:08 UTC #2 lore raw

Hi Luiz,

Thanks for the quick answer,

I'm gonna have a look to that right away...

Fabien

Quoted 6 lines

Hi,
Looks good to me, can you configure a git tree to pull from? If you don't have a host you can use http://gitorious.org/projects/bluez,
just create an account and clone repository.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Marcel Holtmann

maintainer

2008-09-13 17:03 UTC #3 lore raw

In reply to Fabien Chevalier

Hi Fabien,

Quoted 5 lines

While running tests on bluez-utils lately i found a number of big and little error handling issues.
Attached patchset fixes all of them :-)
Can anyone have a look to it ?

actually the convention is that if it is a return value, then we use a negative error value. If it is a parameter, we use the positive one. So the connection_lost change is wrong (it was wrong before though). Please fix this too.

Quoted 6 lines

While reading the latest code, i noticed common/error.{c, h} is gone... There's a new one in src/, but with only one generic
error handling routine. I have the feeling this is a big step backwards, as DBUS error names get duplicated into each service
again and again, paving the way for un unmanageable level of error strings fragmentation :-( What do you guys think ?

It is not a big step backwards since we are using libgdbus error functions now and there are more simpler. There is a problem with the strings returned for a specific error, but I don't really thing it is that big of a problem.

In the long term we might get btd_error_* or alike functions since then the plugins can use them. However right now every plugin has to handle its own errors.

Regards

Marcel

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Fabien Chevalier

author

2008-09-13 19:49 UTC #4 lore raw

Hi Marcel,

Quoted 5 lines

actually the convention is that if it is a return value, then we use a negative error value. If it is a parameter, we use the positive one. So the connection_lost change is wrong (it was wrong before though). Please fix this too.

Ok, that might be quite a huge patch though... it has been that way for so long... virtually every function will be impacted :-(

Quoted 8 lines

Quoted 7 lines
While reading the latest code, i noticed common/error.{c, h} is gone... There's a new one in src/, but with only one generic
error handling routine. I have the feeling this is a big step backwards, as DBUS error names get duplicated into each service
again and again, paving the way for un unmanageable level of error strings fragmentation :-( What do you guys think ?

Quoted 4 lines

It is not a big step backwards since we are using libgdbus error functions now and there are more simpler. There is a problem with the strings returned for a specific error, but I don't really thing it is that big of a problem.

Ok i see the thing now. By that i guess that all error handling outside of g_dbus_create_error are on their way out ?

I guess those ones should be replaced with g_dbus equivalents ? ./src/adapter.c:static DBusHandlerResult error_failed(DBusConnection *conn,

./src/adapter.c:static DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,

Quoted 5 lines

In the long term we might get btd_error_* or alike functions since then the plugins can use them. However right now every plugin has to handle its own errors.

Thanks for the explanation,

Cheers,

Fabien

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Fabien Chevalier

author

2008-09-13 20:50 UTC #5 lore raw

In reply to Fabien Chevalier

Hi all,

Updated patchset attached !

Luiz: I tried to find some doc to get started on gitorious but didn't found any... how to i create my remote clone ?

Regards,

Fabien

Quoted 1 line

Quoted 1 line
From 66048184e4d7c88afae449236a2e62ef352c4438 Mon Sep 17 00:00:00 2001

From: Fabien Chevalier <[email protected]>
Date: Sat, 13 Sep 2008 17:11:08 +0200
Subject: [PATCH] Error code fixes

In case of socket errors, we used to return a positive value where the convention is to return negative values only : fix that

---
 audio/avdtp.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

audio/avdtp.c +9 -9

index 592322f..bf5c0d3 100644
@@ -489,7 +489,7 @@ static gboolean disconnect_timeout(gpointer user_data)
 
 	session->dc_timer = 0;
 
-	connection_lost(session, -ETIMEDOUT);
+	connection_lost(session, ETIMEDOUT);
 
 	return FALSE;
 }

@@ -728,7 +728,7 @@ static void finalize_discovery(struct avdtp *session, int err)
 {
 	struct avdtp_error avdtp_err;
 
-	avdtp_error_init(&avdtp_err, AVDTP_ERROR_ERRNO, -err);
+	avdtp_error_init(&avdtp_err, AVDTP_ERROR_ERRNO, err);
 
 	if (!session->discov_cb)
 		return;

@@ -1380,7 +1380,7 @@ static gboolean avdtp_parse_cmd(struct avdtp *session,
 		debug("Received DISCOVER_CMD");
 		return avdtp_discover_cmd(session, (void *) header, size);
 	case AVDTP_GET_CAPABILITIES:
-		debug("Received  GET_CAPABILITIES_CMD");
+		debug("Received	GET_CAPABILITIES_CMD");
 		return avdtp_getcap_cmd(session, (void *) header, size);
 	case AVDTP_SET_CONFIGURATION:
 		debug("Received SET_CONFIGURATION_CMD");

@@ -1519,7 +1519,7 @@ static gboolean session_cb(GIOChannel *chan, GIOCondition cond,
 	return TRUE;
 
 failed:
-	connection_lost(session, -EIO);
+	connection_lost(session, EIO);
 
 	return FALSE;
 }

@@ -1559,9 +1559,9 @@ static void l2cap_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
 	len = sizeof(l2o);
 	if (getsockopt(sk, SOL_L2CAP, L2CAP_OPTIONS, &l2o,
 				&len) < 0) {
-		err = errno;
-		error("getsockopt(L2CAP_OPTIONS): %s (%d)", strerror(err),
-				err);
+		err = -errno;
+		error("getsockopt(L2CAP_OPTIONS): %s (%d)", strerror(-err),
+				-err);
 		goto failed;
 	}

@@ -1710,7 +1710,7 @@ static gboolean request_timeout(gpointer user_data)
 	goto done;
 
 failed:
-	connection_lost(session, -ETIMEDOUT);
+	connection_lost(session, ETIMEDOUT);
 done:
 	pending_req_free(req);
 	return FALSE;

@@ -2716,7 +2716,7 @@ static void auth_cb(DBusError *derr, void *user_data)
 	if (derr && dbus_error_is_set(derr)) {
 		error("Access denied: %s", derr->message);
 
-		connection_lost(session, -EACCES);
+		connection_lost(session, EACCES);
 		return;
 	}

Signature · 1 line

1.5.6.5

Quoted 1 line

Quoted 1 line
From 8da5a48ab9667f13066d6e048100da9269d8a205 Mon Sep 17 00:00:00 2001

From: Fabien Chevalier <[email protected]>
Date: Sat, 13 Sep 2008 17:13:27 +0200
Subject: [PATCH] Connect() fix.

In case we are unable to connect the sink, we forget to send DBUS reply. Caller is stuck forever...

---
 audio/sink.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

audio/sink.c +2 -2

index c6d2dc4..e79b9f1 100644
@@ -381,11 +381,11 @@ static void discovery_complete(struct avdtp *session, GSList *seps, struct avdtp
 	return;
 
 failed:
-	pending_request_free(pending);
+	error_failed(pending->conn, pending->msg, "Stream setup failed");
+ 	pending_request_free(pending);
 	sink->connect = NULL;
 	avdtp_unref(sink->session);
 	sink->session = NULL;
-	error_failed(pending->conn, pending->msg, "Stream setup failed");
 }
 
 static DBusMessage *sink_connect(DBusConnection *conn,

Signature · 1 line

1.5.6.5

Quoted 1 line

Quoted 1 line
From d79457b70e1480f0c590d043208dbe61ceca4026 Mon Sep 17 00:00:00 2001

From: Fabien Chevalier <[email protected]>
Date: Sat, 13 Sep 2008 17:14:34 +0200
Subject: [PATCH] Error value fixes.

In case the HSP/HFP headset is down, we return "not supported" : this is non-sense :
change that to connection attempt failed

---
 audio/headset.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

audio/headset.c +7 -2

index 102d0bc..45bcf34 100644
@@ -1074,7 +1074,9 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data)
 	if (err < 0) {
 		error("Unable to get service record: %s (%d)", strerror(-err),
 			-err);
-		goto failed_not_supported;
+		error_connection_attempt_failed(dev->conn, p->msg, p->err);
+
+		goto failed;
 	}
 
 	if (!recs || !recs->data) {

@@ -1140,10 +1142,13 @@ static void get_record_cb(sdp_list_t *recs, int err, gpointer user_data)
 failed_not_supported:
 	if (p->msg) {
 		error_not_supported(dev->conn, p->msg);
+	}
+failed:
+	if (p->msg) {
 		dbus_message_unref(p->msg);
 		p->msg = NULL;
 	}
-failed:
+
 	if (classes)
 		sdp_list_free(classes, free);
 	pending_connect_finalize(dev);

Signature · 1 line

1.5.6.5

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/

_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Marcel Holtmann

maintainer

2008-09-13 20:57 UTC #6 lore raw

Hi Fabien,

Quoted 1 line

Updated patchset attached !

does connection_lost() handles a positive error message properly?

Quoted 2 lines

Luiz: I tried to find some doc to get started on gitorious but didn't found any... how to i create my remote clone ?

I would prefer having a tree to pull from, because that makes my life a lot easier.

Regards

Marcel

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

Fabien Chevalier

author

2008-09-14 08:14 UTC #7 lore raw

Hi Marcel,

Quoted 5 lines

Hi Fabien,
Quoted 1 line
Updated patchset attached !
does connection_lost() handles a positive error message properly?

Yes. This is the change line 30 of the patch.
Only thing connection_lost does is call finalize_discovery().

Quoted 6 lines

Quoted 3 lines
Luiz: I tried to find some doc to get started on gitorious but didn't found any... how to i create my remote clone ?
I would prefer having a tree to pull from, because that makes my life a lot easier.

I'm on it... :-)

Regards,

Fabien

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel