mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
core: merge branch 'th/dbus-annotate-deprecated'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1829
This commit is contained in:
commit
d37431e2db
|
@ -12,7 +12,9 @@
|
|||
|
||||
Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each
|
||||
array are in network byte order. Essentially: [(addr, prefix, gateway),
|
||||
(addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway
|
||||
(addr, prefix, gateway), ...].
|
||||
|
||||
DEPRECATED: use AddressData and Gateway
|
||||
-->
|
||||
<property name="Addresses" type="aau" access="read"/>
|
||||
|
||||
|
@ -39,7 +41,9 @@
|
|||
are in network byte order. 'route' and 'next hop' are IPv4 addresses,
|
||||
while prefix and metric are simple unsigned integers. Essentially:
|
||||
[(route, prefix, next-hop, metric), (route, prefix, next-hop, metric),
|
||||
...] Deprecated: use RouteData
|
||||
...].
|
||||
|
||||
DEPRECATED: use RouteData
|
||||
-->
|
||||
<property name="Routes" type="aau" access="read"/>
|
||||
|
||||
|
@ -55,7 +59,9 @@
|
|||
<!--
|
||||
Nameservers:
|
||||
|
||||
The nameservers in use. Deprecated: use NameserverData
|
||||
The nameservers in use.
|
||||
|
||||
DEPRECATED: use NameserverData
|
||||
-->
|
||||
<property name="Nameservers" type="au" access="read"/>
|
||||
|
||||
|
@ -101,7 +107,9 @@
|
|||
WinsServers:
|
||||
|
||||
The Windows Internet Name Service servers associated with the connection.
|
||||
Each address is in network byte order. Deprecated: use WinsServerData
|
||||
Each address is in network byte order.
|
||||
|
||||
DEPRECATED: use WinsServerData
|
||||
-->
|
||||
<property name="WinsServers" type="au" access="read"/>
|
||||
|
||||
|
|
|
@ -10,8 +10,9 @@
|
|||
<!--
|
||||
Addresses:
|
||||
|
||||
Array of tuples of IPv6 address/prefix/gateway. Deprecated: use
|
||||
AddressData and Gateway.
|
||||
Array of tuples of IPv6 address/prefix/gateway.
|
||||
|
||||
DEPRECATED: use AddressData and Gateway.
|
||||
-->
|
||||
<property name="Addresses" type="a(ayuay)" access="read"/>
|
||||
|
||||
|
@ -34,7 +35,9 @@
|
|||
<!--
|
||||
Routes:
|
||||
|
||||
Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData
|
||||
Tuples of IPv6 route/prefix/next-hop/metric.
|
||||
|
||||
DEPRECATED: use RouteData.
|
||||
-->
|
||||
<property name="Routes" type="a(ayuayu)" access="read"/>
|
||||
|
||||
|
|
|
@ -683,7 +683,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_adsl = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_ADSL,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -1306,7 +1306,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_bluetooth = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Name", "s", NM_DEVICE_BT_NAME),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("BtCapabilities",
|
||||
"u",
|
||||
|
|
|
@ -212,7 +212,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_6lowpan = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_6LOWPAN,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT), ), ),
|
||||
};
|
||||
|
||||
|
|
|
@ -929,9 +929,21 @@ static const NMDBusInterfaceInfoExtended interface_info_device_bond = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_BOND,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Slaves",
|
||||
"ao",
|
||||
NM_DEVICE_SLAVES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -1141,9 +1141,21 @@ static const NMDBusInterfaceInfoExtended interface_info_device_bridge = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_BRIDGE,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Slaves",
|
||||
"ao",
|
||||
NM_DEVICE_SLAVES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -107,9 +107,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_dummy = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_DUMMY,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -2017,14 +2017,20 @@ static const NMDBusInterfaceInfoExtended interface_info_device_wired = {
|
|||
NM_DBUS_INTERFACE_DEVICE_WIRED,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PermHwAddress",
|
||||
"s",
|
||||
NM_DEVICE_PERM_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"PermHwAddress",
|
||||
"s",
|
||||
NM_DEVICE_PERM_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Speed", "u", NM_DEVICE_ETHERNET_SPEED),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("S390Subchannels",
|
||||
"as",
|
||||
NM_DEVICE_ETHERNET_S390_SUBCHANNELS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -168,7 +168,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_generic = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_GENERIC,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"TypeDescription",
|
||||
"s",
|
||||
|
|
|
@ -362,8 +362,16 @@ static const NMDBusInterfaceInfoExtended interface_info_device_infiniband = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -452,9 +452,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_tun = {
|
|||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("MultiQueue",
|
||||
"b",
|
||||
NM_DEVICE_TUN_MULTI_QUEUE),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -525,8 +525,16 @@ static const NMDBusInterfaceInfoExtended interface_info_device_vlan = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_VLAN,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("VlanId", "u", NM_DEVICE_VLAN_ID), ), ),
|
||||
};
|
||||
|
|
|
@ -576,7 +576,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_vxlan = {
|
|||
NM_DBUS_INTERFACE_DEVICE_VXLAN,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Parent", "o", NM_DEVICE_PARENT),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Id", "u", NM_DEVICE_VXLAN_ID),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Group", "s", NM_DEVICE_VXLAN_GROUP),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Local", "s", NM_DEVICE_VXLAN_LOCAL),
|
||||
|
|
|
@ -197,9 +197,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_wpan = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_WPAN,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -18662,9 +18662,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device = {
|
|||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Capabilities",
|
||||
"u",
|
||||
NM_DEVICE_CAPABILITIES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Ip4Address",
|
||||
"u",
|
||||
NM_DEVICE_IP4_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Ip4Address",
|
||||
"u",
|
||||
NM_DEVICE_IP4_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("State", "u", NM_DEVICE_STATE),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("StateReason",
|
||||
"(uu)",
|
||||
|
|
|
@ -152,7 +152,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_ovs_bridge = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Slaves",
|
||||
"ao",
|
||||
NM_DEVICE_SLAVES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -266,7 +266,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_ovs_port = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_OVS_PORT,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Slaves",
|
||||
"ao",
|
||||
NM_DEVICE_SLAVES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -1090,9 +1090,21 @@ static const NMDBusInterfaceInfoExtended interface_info_device_team = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_TEAM,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Carrier", "b", NM_DEVICE_CARRIER),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Slaves", "ao", NM_DEVICE_SLAVES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Carrier",
|
||||
"b",
|
||||
NM_DEVICE_CARRIER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Slaves",
|
||||
"ao",
|
||||
NM_DEVICE_SLAVES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Config",
|
||||
"s",
|
||||
NM_DEVICE_TEAM_CONFIG), ), ),
|
||||
|
|
|
@ -1144,7 +1144,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_wifi_p2p = {
|
|||
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_wifi_p2p_peer_added,
|
||||
&nm_signal_info_wifi_p2p_peer_removed, ),
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Peers",
|
||||
"ao",
|
||||
NM_DEVICE_IWD_P2P_PEERS), ), ),
|
||||
|
|
|
@ -497,7 +497,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_olpc_mesh = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Companion",
|
||||
"o",
|
||||
NM_DEVICE_OLPC_MESH_COMPANION),
|
||||
|
|
|
@ -1218,7 +1218,11 @@ static const NMDBusInterfaceInfoExtended interface_info_device_wifi_p2p = {
|
|||
.signals = NM_DEFINE_GDBUS_SIGNAL_INFOS(&nm_signal_info_wifi_p2p_peer_added,
|
||||
&nm_signal_info_wifi_p2p_peer_removed, ),
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"HwAddress",
|
||||
"s",
|
||||
NM_DEVICE_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Peers",
|
||||
"ao",
|
||||
NM_DEVICE_WIFI_P2P_PEERS), ), ),
|
||||
|
|
|
@ -132,7 +132,8 @@ const NMDBusInterfaceInfoExtended nm_interface_info_device_wireless = {
|
|||
NM_DEFINE_GDBUS_METHOD_INFO_INIT(
|
||||
"GetAccessPoints",
|
||||
.out_args = NM_DEFINE_GDBUS_ARG_INFOS(
|
||||
NM_DEFINE_GDBUS_ARG_INFO("access_points", "ao"), ), ),
|
||||
NM_DEFINE_GDBUS_ARG_INFO("access_points", "ao"), ),
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
.handle = impl_device_wifi_get_access_points, ),
|
||||
NM_DEFINE_DBUS_METHOD_INFO_EXTENDED(
|
||||
NM_DEFINE_GDBUS_METHOD_INFO_INIT(
|
||||
|
@ -150,9 +151,11 @@ const NMDBusInterfaceInfoExtended nm_interface_info_device_wireless = {
|
|||
&nm_signal_info_wireless_access_point_removed, ),
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("HwAddress", "s", NM_DEVICE_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("PermHwAddress",
|
||||
"s",
|
||||
NM_DEVICE_PERM_HW_ADDRESS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"PermHwAddress",
|
||||
"s",
|
||||
NM_DEVICE_PERM_HW_ADDRESS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Mode", "u", NM_DEVICE_WIFI_MODE),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Bitrate", "u", NM_DEVICE_WIFI_BITRATE),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AccessPoints",
|
||||
|
|
|
@ -1605,9 +1605,11 @@ static const NMDBusInterfaceInfoExtended interface_info_active_connection = {
|
|||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Controller",
|
||||
"o",
|
||||
NM_ACTIVE_CONNECTION_CONTROLLER),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Master",
|
||||
"o",
|
||||
NM_ACTIVE_CONNECTION_MASTER), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Master",
|
||||
"o",
|
||||
NM_ACTIVE_CONNECTION_MASTER,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -11,6 +11,18 @@
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
const GDBusAnnotationInfo _nm_gdbus_annotation_info_deprecated = {
|
||||
.key = "org.freedesktop.DBus.Deprecated",
|
||||
.value = "true",
|
||||
};
|
||||
|
||||
const GDBusAnnotationInfo *const _nm_gdbus_annotation_info_list_deprecated[] = {
|
||||
NM_GDBUS_ANNOTATION_INFO_DEPRECATED(),
|
||||
NULL,
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
GDBusPropertyInfo *
|
||||
nm_dbus_utils_interface_info_lookup_property(const GDBusInterfaceInfo *interface_info,
|
||||
const char *property_name,
|
||||
|
|
|
@ -45,34 +45,55 @@ typedef struct {
|
|||
G_STATIC_ASSERT(G_STRUCT_OFFSET(NMDBusPropertyInfoExtended, property_name)
|
||||
== G_STRUCT_OFFSET(struct _NMDBusPropertyInfoExtendedBase, property_name));
|
||||
|
||||
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(m_name, m_signature, m_property_name) \
|
||||
((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedBase){ \
|
||||
._parent = \
|
||||
{ \
|
||||
.ref_count = -1, \
|
||||
.name = m_name, \
|
||||
.signature = m_signature, \
|
||||
.flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE, \
|
||||
}, \
|
||||
.property_name = m_property_name, \
|
||||
extern const GDBusAnnotationInfo _nm_gdbus_annotation_info_deprecated;
|
||||
|
||||
#define NM_GDBUS_ANNOTATION_INFO_DEPRECATED() \
|
||||
((GDBusAnnotationInfo *) &_nm_gdbus_annotation_info_deprecated)
|
||||
|
||||
#define NM_DEFINE_DBUS_ANNOTATION_INFO(a_key, a_value) \
|
||||
((GDBusAnnotationInfo *) &((const GDBusAnnotationInfo){ \
|
||||
.key = (a_key), \
|
||||
.value = (a_value), \
|
||||
}))
|
||||
|
||||
extern const GDBusAnnotationInfo *const _nm_gdbus_annotation_info_list_deprecated[];
|
||||
|
||||
/* This is a (NULL terminated) list of GDBusAnnotationInfo with only one entry:
|
||||
* NM_GDBUS_ANNOTATION_INFO_DEPRECATED. This single instance can be reused for the
|
||||
* common case where we only have one annotation (and it's the deprecation).
|
||||
*
|
||||
* Otherwise, NM_DEFINE_DBUS_ANNOTATION_INFOS() is for defining a new list. */
|
||||
#define NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED() \
|
||||
((GDBusAnnotationInfo **) _nm_gdbus_annotation_info_list_deprecated)
|
||||
|
||||
#define NM_DEFINE_DBUS_ANNOTATION_INFOS(...) \
|
||||
((GDBusAnnotationInfo **) ((const GDBusAnnotationInfo *const[]){__VA_ARGS__, NULL}))
|
||||
|
||||
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(m_name, m_signature, m_property_name, ...) \
|
||||
((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedBase){ \
|
||||
._parent = {.ref_count = -1, \
|
||||
.name = m_name, \
|
||||
.signature = m_signature, \
|
||||
.flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE, \
|
||||
__VA_ARGS__}, \
|
||||
.property_name = m_property_name, \
|
||||
}))
|
||||
|
||||
#define NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READWRITABLE(m_name, \
|
||||
m_signature, \
|
||||
m_property_name, \
|
||||
m_permission, \
|
||||
m_audit_op) \
|
||||
m_audit_op, \
|
||||
...) \
|
||||
((GDBusPropertyInfo *) &((const struct _NMDBusPropertyInfoExtendedReadWritable){ \
|
||||
._base = \
|
||||
{ \
|
||||
._parent = \
|
||||
{ \
|
||||
.ref_count = -1, \
|
||||
.name = m_name, \
|
||||
.signature = m_signature, \
|
||||
.flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE \
|
||||
| G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, \
|
||||
}, \
|
||||
._parent = {.ref_count = -1, \
|
||||
.name = m_name, \
|
||||
.signature = m_signature, \
|
||||
.flags = G_DBUS_PROPERTY_INFO_FLAGS_READABLE \
|
||||
| G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE, \
|
||||
__VA_ARGS__}, \
|
||||
.property_name = m_property_name, \
|
||||
}, \
|
||||
.permission = m_permission, \
|
||||
|
|
|
@ -485,23 +485,31 @@ static const NMDBusInterfaceInfoExtended interface_info_ip4_config = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_IP4_CONFIG,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Addresses",
|
||||
"aau",
|
||||
NM_IP4_CONFIG_ADDRESSES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Addresses",
|
||||
"aau",
|
||||
NM_IP4_CONFIG_ADDRESSES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AddressData",
|
||||
"aa{sv}",
|
||||
NM_IP_CONFIG_ADDRESS_DATA),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Gateway", "s", NM_IP_CONFIG_GATEWAY),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Routes", "aau", NM_IP4_CONFIG_ROUTES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Routes",
|
||||
"aau",
|
||||
NM_IP4_CONFIG_ROUTES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RouteData",
|
||||
"aa{sv}",
|
||||
NM_IP_CONFIG_ROUTE_DATA),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("NameserverData",
|
||||
"aa{sv}",
|
||||
NM_IP4_CONFIG_NAMESERVER_DATA),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Nameservers",
|
||||
"au",
|
||||
NM_IP4_CONFIG_NAMESERVERS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Nameservers",
|
||||
"au",
|
||||
NM_IP4_CONFIG_NAMESERVERS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Domains", "as", NM_IP_CONFIG_DOMAINS),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Searches", "as", NM_IP_CONFIG_SEARCHES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("DnsOptions",
|
||||
|
@ -513,9 +521,11 @@ static const NMDBusInterfaceInfoExtended interface_info_ip4_config = {
|
|||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WinsServerData",
|
||||
"as",
|
||||
NM_IP4_CONFIG_WINS_SERVER_DATA),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WinsServers",
|
||||
"au",
|
||||
NM_IP4_CONFIG_WINS_SERVERS), ), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"WinsServers",
|
||||
"au",
|
||||
NM_IP4_CONFIG_WINS_SERVERS,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ), ), ),
|
||||
};
|
||||
|
||||
static void
|
||||
|
@ -614,16 +624,20 @@ static const NMDBusInterfaceInfoExtended interface_info_ip6_config = {
|
|||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(
|
||||
NM_DBUS_INTERFACE_IP6_CONFIG,
|
||||
.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS(
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Addresses",
|
||||
"a(ayuay)",
|
||||
NM_IP6_CONFIG_ADDRESSES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Addresses",
|
||||
"a(ayuay)",
|
||||
NM_IP6_CONFIG_ADDRESSES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("AddressData",
|
||||
"aa{sv}",
|
||||
NM_IP_CONFIG_ADDRESS_DATA),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Gateway", "s", NM_IP_CONFIG_GATEWAY),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("Routes",
|
||||
"a(ayuayu)",
|
||||
NM_IP6_CONFIG_ROUTES),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"Routes",
|
||||
"a(ayuayu)",
|
||||
NM_IP6_CONFIG_ROUTES,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RouteData",
|
||||
"aa{sv}",
|
||||
NM_IP_CONFIG_ROUTE_DATA),
|
||||
|
|
|
@ -9364,10 +9364,13 @@ static const NMDBusInterfaceInfoExtended interface_info_manager = {
|
|||
"b",
|
||||
NM_MANAGER_WIMAX_ENABLED,
|
||||
NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX,
|
||||
NM_AUDIT_OP_RADIO_CONTROL),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("WimaxHardwareEnabled",
|
||||
"b",
|
||||
NM_MANAGER_WIMAX_HARDWARE_ENABLED),
|
||||
NM_AUDIT_OP_RADIO_CONTROL,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE(
|
||||
"WimaxHardwareEnabled",
|
||||
"b",
|
||||
NM_MANAGER_WIMAX_HARDWARE_ENABLED,
|
||||
.annotations = NM_GDBUS_ANNOTATION_INFO_LIST_DEPRECATED(), ),
|
||||
NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE("RadioFlags",
|
||||
"u",
|
||||
NM_MANAGER_RADIO_FLAGS),
|
||||
|
|
Loading…
Reference in a new issue