From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 10 Jun 2026 19:04:33 +0000 (+0100)
Subject: network: fix modem Bearers/Ports property signatures
X-Git-Tag: v261-rc4~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aaba6eb83e7c0bb02556949c1697bd26f0ce6e4;p=thirdparty%2Fsystemd.git

network: fix modem Bearers/Ports property signatures

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 f8a4c3d375b83f3ee249ca3f4b7f407b618a9491
---

diff --git a/src/network/networkd-wwan-bus.c b/src/network/networkd-wwan-bus.c
index 13a860e2dc0..98c6a28c269 100644
--- a/src/network/networkd-wwan-bus.c
+++ b/src/network/networkd-wwan-bus.c
@@ -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;