mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-02-12 04:27:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Make use of getsockopt() to determine MTU configurable

Browse source 
A recent patch changed the MTU size from the default value of 48 to the value
returned by getsockopt(). This breaks HSP for some setups. To circumvent the
problem, this patch introduces a boolean parameter "autodetect_mtu" for
module-bluetooth-discover, module-bluez5-discover and module-bluez5-device to
make this use of getsockopt() configurable.
This commit is contained in:
Georg Chini 2017-02-04 20:32:15 +01:00 • committed by Tanu Kaskinen
parent ca6c3f80f5
commit 1c80af147d
5 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/bluetooth/backend-native.c
View file

@ -103,7 +103,6 @@ static pa_dbus_pending* send_and_add_to_pending(pa_bluetooth_backend *backend, D
static int bluez5_sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu) {
pa_bluetooth_device *d = t->device;
struct sockaddr_sco addr;
struct sco_options sco_opt;
socklen_t len;
int err, i;
int sock;
@ -147,18 +146,21 @@ static int bluez5_sco_acquire_cb(pa_bluetooth_transport *t, bool optional, size_
goto fail_close;
}
len = sizeof(sco_opt);
memset(&sco_opt, 0, len);
if (imtu) *imtu = 48;
if (omtu) *omtu = 48;
if (getsockopt(sock, SOL_SCO, SCO_OPTIONS, &sco_opt, &len) < 0) {
pa_log_warn("getsockopt(SCO_OPTIONS) failed, loading defaults");
if (t->device->autodetect_mtu) {
struct sco_options sco_opt;
/* Setting defaults in case of error */
if (imtu) *imtu = 48;
if (omtu) *omtu = 48;
} else {
if (imtu) *imtu = sco_opt.mtu;
if (omtu) *omtu = sco_opt.mtu;
len = sizeof(sco_opt);
memset(&sco_opt, 0, len);
if (getsockopt(sock, SOL_SCO, SCO_OPTIONS, &sco_opt, &len) < 0)
pa_log_warn("getsockopt(SCO_OPTIONS) failed, loading defaults");
else {
if (imtu) *imtu = sco_opt.mtu;
if (omtu) *omtu = sco_opt.mtu;
}
}
return sock;