mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle errors from BT service properly

Browse source
This commit is contained in:
Lennart Poettering 2009-02-12 16:51:02 +01:00
parent c3b0d841d1
commit e82b2fd098
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -193,6 +193,9 @@ static int service_recv(int fd, bt_audio_msg_header_t *msg, size_t expected_leng
length = expected_length ? expected_length : BT_SUGGESTED_BUFFER_SIZE; length = expected_length ? expected_length : BT_SUGGESTED_BUFFER_SIZE;
if (length < sizeof(bt_audio_error_t))
length = sizeof(bt_audio_error_t);
pa_log_debug("Trying to receive message from audio service..."); pa_log_debug("Trying to receive message from audio service...");
r = recv(fd, msg, length, 0); r = recv(fd, msg, length, 0);
@ -212,6 +215,7 @@ static int service_recv(int fd, bt_audio_msg_header_t *msg, size_t expected_leng
pa_log_debug("Received %s <- %s", pa_log_debug("Received %s <- %s",
pa_strnull(bt_audio_strtype(msg->type)), pa_strnull(bt_audio_strtype(msg->type)),
pa_strnull(bt_audio_strname(msg->name))); pa_strnull(bt_audio_strname(msg->name)));
return 0; return 0;
} }
@ -223,7 +227,7 @@ static int service_recv(int fd, bt_audio_msg_header_t *msg, size_t expected_leng
return -1; return -1;
} }
static int service_expect(int fd, bt_audio_msg_header_t *rsp, uint8_t expected_name, size_t expected_length) { static ssize_t service_expect(int fd, bt_audio_msg_header_t *rsp, uint8_t expected_name, size_t expected_length) {
int r; int r;
pa_assert(fd >= 0); pa_assert(fd >= 0);
@ -232,19 +236,17 @@ static int service_expect(int fd, bt_audio_msg_header_t *rsp, uint8_t expected_n
if ((r = service_recv(fd, rsp, expected_length)) < 0) if ((r = service_recv(fd, rsp, expected_length)) < 0)
return r; return r;
if (rsp->name != expected_name) { if (rsp->type != BT_RESPONSE || rsp->name != expected_name) {
if (rsp->type == BT_ERROR && rsp->length == sizeof(bt_audio_error_t))
pa_log_error("Received error condition: %s", pa_cstrerror(((bt_audio_error_t*) rsp)->posix_errno));
else
pa_log_error("Bogus message %s received while %s was expected", pa_log_error("Bogus message %s received while %s was expected",
pa_strnull(bt_audio_strname(rsp->name)), pa_strnull(bt_audio_strname(rsp->name)),
pa_strnull(bt_audio_strname(expected_name))); pa_strnull(bt_audio_strname(expected_name)));
return -1; return -1;
} }
if (rsp->type == BT_ERROR) {
bt_audio_error_t *error = (bt_audio_error_t *) rsp;
pa_log_error("%s failed: %s", pa_strnull(bt_audio_strname(rsp->name)), pa_cstrerror(error->posix_errno));
return -1;
}
return 0; return 0;
} }
@ -306,6 +308,7 @@ static int get_caps(struct userdata *u) {
union { union {
struct bt_get_capabilities_req getcaps_req; struct bt_get_capabilities_req getcaps_req;
struct bt_get_capabilities_rsp getcaps_rsp; struct bt_get_capabilities_rsp getcaps_rsp;
bt_audio_error_t error;
uint8_t buf[BT_SUGGESTED_BUFFER_SIZE]; uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
} msg; } msg;
@ -575,6 +578,7 @@ static int set_conf(struct userdata *u) {
union { union {
struct bt_set_configuration_req setconf_req; struct bt_set_configuration_req setconf_req;
struct bt_set_configuration_rsp setconf_rsp; struct bt_set_configuration_rsp setconf_rsp;
bt_audio_error_t error;
uint8_t buf[BT_SUGGESTED_BUFFER_SIZE]; uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
} msg; } msg;
@ -644,6 +648,7 @@ static int setup_stream_fd(struct userdata *u) {
struct bt_start_stream_req start_req; struct bt_start_stream_req start_req;
struct bt_start_stream_rsp start_rsp; struct bt_start_stream_rsp start_rsp;
struct bt_new_stream_ind streamfd_ind; struct bt_new_stream_ind streamfd_ind;
bt_audio_error_t error;
uint8_t buf[BT_SUGGESTED_BUFFER_SIZE]; uint8_t buf[BT_SUGGESTED_BUFFER_SIZE];
} msg; } msg;