SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: fix modem Bearers/Ports property signatures

Browse Source 
The Bearers and Ports entries in the WWAN modem property maps declared
signatures "a{sv}" and "a{su}", but the callbacks read "ao" and "a(su)".
The mismatch was harmless while the declared signature was never checked,
but becomes a dropped property once it is enforced. Declare the actual
signatures.

Follow-up for f8a4c3d375
This commit is contained in:
Luca Boccassi
2026-06-11 09:43:09 +02:00
committed by Daan De Meyer
parent 7cc0f65d63
commit 0aaba6eb83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-wwan-bus.c
+3 -3
View File
@@ -882,12 +882,12 @@ static int modem_properties_changed_signal(
sd_bus_error *ret_error) {
static const struct bus_properties_map map[] = {
{ "Bearers", "a{sv}", modem_map_bearers, 0, },
{ "Bearers", "ao", modem_map_bearers, 0, },
{ "State", "i", NULL, offsetof(Modem, state) },
{ "StateFailedReason", "u", NULL, offsetof(Modem, state_fail_reason) },
{ "Manufacturer", "s", NULL, offsetof(Modem, manufacturer) },
{ "Model", "s", NULL, offsetof(Modem, model) },
{ "Ports", "a{su}", modem_map_ports, 0, },
{ "Ports", "a(su)", modem_map_ports, 0, },
{}
};
Modem *modem = ASSERT_PTR(userdata);
@@ -969,7 +969,7 @@ static int modem_add(Manager *m, const char *path, sd_bus_message *message, sd_b
{ "StateFailedReason", "u", NULL, offsetof(Modem, state_fail_reason) },
{ "Manufacturer", "s", NULL, offsetof(Modem, manufacturer) },
{ "Model", "s", NULL, offsetof(Modem, model) },
{ "Ports", "a{su}", modem_map_ports, 0, },
{ "Ports", "a(su)", modem_map_ports, 0, },
{}
};
Modem *modem;