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: AT+XEVENT input validation, cleanups & respond OK

Browse source 
Also support AT+XEVENT=BATTERY,%u which some devices apparently send.
This commit is contained in:
Pauli Virtanen 2023-04-20 17:59:58 +03:00 • committed by Wim Taymans
parent 65ddd0a42b
commit 87269e85db
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -684,16 +684,19 @@ static bool device_supports_required_mSBC_transport_modes(
static int codec_switch_start_timer(struct rfcomm *rfcomm, int timeout_msec); static int codec_switch_start_timer(struct rfcomm *rfcomm, int timeout_msec);
static void process_xevent_indicator(struct rfcomm *rfcomm, unsigned int batt_p1, unsigned int batt_p2) static void process_xevent_indicator(struct rfcomm *rfcomm, unsigned int level, unsigned int nlevels)
{ {
struct impl *backend = rfcomm->backend; struct impl *backend = rfcomm->backend;
uint8_t perc;
spa_log_debug(backend->log, "batt_p1:%u batt_p2:%u", batt_p1, batt_p2); spa_log_debug(backend->log, "AT+XEVENT level:%u nlevels:%u", level, nlevels);
uint8_t level = (batt_p1 * 100) / batt_p2; if (nlevels == 0)
spa_log_debug(backend->log, "battery level: %d%%", (int) level); return;
// TODO: report without Battery Provider (using props)
spa_bt_device_report_battery_level(rfcomm->device, level); /* 0 <= level < nlevels; doesn't make much sense to report 0% so bump range up */
perc = SPA_MIN(level + 1, nlevels) * 100 / nlevels;
spa_bt_device_report_battery_level(rfcomm->device, perc);
} }
static void process_iphoneaccev_indicator(struct rfcomm *rfcomm, unsigned int key, unsigned int value) static void process_iphoneaccev_indicator(struct rfcomm *rfcomm, unsigned int key, unsigned int value)
@ -772,8 +775,8 @@ static bool rfcomm_hfp_ag(struct rfcomm *rfcomm, char* buf)
unsigned int indicator; unsigned int indicator;
unsigned int indicator_value; unsigned int indicator_value;
unsigned int value; unsigned int value;
unsigned int xevent_batt_p1; unsigned int xevent_level;
unsigned int xevent_batt_p2; unsigned int xevent_nlevels;
int xapl_vendor; int xapl_vendor;
int xapl_product; int xapl_product;
int xapl_features; int xapl_features;
@ -1085,8 +1088,12 @@ next_indicator:
rfcomm_send_reply(rfcomm, "OK"); rfcomm_send_reply(rfcomm, "OK");
} else if (spa_strstartswith(buf, "AT+XEVENT=USER-AGENT")) { } else if (spa_strstartswith(buf, "AT+XEVENT=USER-AGENT")) {
rfcomm_send_reply(rfcomm, "OK"); rfcomm_send_reply(rfcomm, "OK");
} else if (sscanf(buf, "AT+XEVENT=BATTERY,%u,%u,%*u,%*u", &xevent_batt_p1, &xevent_batt_p2) == 2) { } else if (sscanf(buf, "AT+XEVENT=BATTERY,%u,%u,%*u,%*u", &xevent_level, &xevent_nlevels) == 2) {
process_xevent_indicator(rfcomm, xevent_batt_p1, xevent_batt_p2); process_xevent_indicator(rfcomm, xevent_level, xevent_nlevels);
rfcomm_send_reply(rfcomm, "OK");
} else if (sscanf(buf, "AT+XEVENT=BATTERY,%u", &xevent_level) == 1) {
process_xevent_indicator(rfcomm, xevent_level, 10);
rfcomm_send_reply(rfcomm, "OK");
} else if (sscanf(buf, "AT+IPHONEACCEV=%u%n", &count, &r) == 1) { } else if (sscanf(buf, "AT+IPHONEACCEV=%u%n", &count, &r) == 1) {
if (count < 1 || count > 100) if (count < 1 || count > 100)
return false; return false;