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

bluez5: backend-native: fixup HFP command handling

Browse source 
Strip initial \n from commands: some devices (Sennheiser HD 350BT) send
them.

Only reply OK to empty command with terminated command line;
non-terminated lines are invalid.

Add some debug in case the RFCOMM reply contains non-printable
characters.
This commit is contained in:
Pauli Virtanen 2023-01-25 20:38:11 +02:00
parent effc1974e3
commit 17049abd04
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spa/plugins/bluez5/backend-native.c
View file

@ -36,6 +36,8 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <spa/debug/mem.h>
#include <spa/debug/log.h>
#include <spa/support/log.h> #include <spa/support/log.h>
#include <spa/support/loop.h> #include <spa/support/loop.h>
#include <spa/support/dbus.h> #include <spa/support/dbus.h>
@ -779,6 +781,12 @@ static bool rfcomm_hfp_ag(struct rfcomm *rfcomm, char* buf)
int xapl_product; int xapl_product;
int xapl_features; int xapl_features;
spa_debug_log_mem(backend->log, SPA_LOG_LEVEL_DEBUG, 2, buf, strlen(buf));
/* Some devices send initial \n: be permissive */
while (*buf == '\n')
++buf;
if (sscanf(buf, "AT+BRSF=%u", &features) == 1) { if (sscanf(buf, "AT+BRSF=%u", &features) == 1) {
unsigned int ag_features = SPA_BT_HFP_AG_FEATURE_NONE; unsigned int ag_features = SPA_BT_HFP_AG_FEATURE_NONE;
@ -880,7 +888,7 @@ static bool rfcomm_hfp_ag(struct rfcomm *rfcomm, char* buf)
rfcomm_emit_volume_changed(rfcomm, -1, SPA_BT_VOLUME_INVALID); rfcomm_emit_volume_changed(rfcomm, -1, SPA_BT_VOLUME_INVALID);
} }
} }
} else if (strspn(buf, " ") == strlen(buf)) { } else if (spa_streq(buf, "\r")) {
/* No commands, reply OK (ITU-T Rec. V.250 Sec. 5.2.1 & 5.6) */ /* No commands, reply OK (ITU-T Rec. V.250 Sec. 5.2.1 & 5.6) */
rfcomm_send_reply(rfcomm, "OK"); rfcomm_send_reply(rfcomm, "OK");
} else if (!rfcomm->slc_configured) { } else if (!rfcomm->slc_configured) {