colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

veth: peer property is D-Bus object path not a string

Browse Source 
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
This commit is contained in:
Fernando Fernandez Mancera
2020-12-01 11:28:00 +01:00
parent 526b484be1
commit fda6b702ba
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libnm/nm-device-veth.c
View File

@@ -19,7 +19,7 @@
NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PEER, ); NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PEER, );
typedef struct { typedef struct {
char *peer; NMLDBusPropertyO peer;
} NMDeviceVethPrivate; } NMDeviceVethPrivate;
struct _NMDeviceVeth { struct _NMDeviceVeth {
@@ -42,16 +42,16 @@ G_DEFINE_TYPE(NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET)
* nm_device_veth_get_peer: * nm_device_veth_get_peer:
* @device: a #NMDeviceVeth * @device: a #NMDeviceVeth
* *
* Returns: the device's peer name * Returns: (transfer none): the device's peer device
* *
* Since: 1.30 * Since: 1.30
**/ **/
const char * NMDevice *
nm_device_veth_get_peer(NMDeviceVeth *device) nm_device_veth_get_peer(NMDeviceVeth *device)
{ {
g_return_val_if_fail(NM_IS_DEVICE_VETH(device), NULL); g_return_val_if_fail(NM_IS_DEVICE_VETH(device), FALSE);
return _nml_coerce_property_str_not_empty(NM_DEVICE_VETH_GET_PRIVATE(device)->peer); return nml_dbus_property_o_get_obj(&NM_DEVICE_VETH_GET_PRIVATE(device)->peer);
} }
static GType static GType
@@ -69,7 +69,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
switch (prop_id) { switch (prop_id) {
case PROP_PEER: case PROP_PEER:
g_value_set_string(value, nm_device_veth_get_peer(device)); g_value_set_object(value, nm_device_veth_get_peer(device));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -81,22 +81,16 @@ static void
nm_device_veth_init(NMDeviceVeth *device) nm_device_veth_init(NMDeviceVeth *device)
{} {}
static void const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_veth =
finalize(GObject *object) NML_DBUS_META_IFACE_INIT_PROP(NM_DBUS_INTERFACE_DEVICE_VETH,
{
NMDeviceVethPrivate *priv = NM_DEVICE_VETH_GET_PRIVATE(object);
g_free(priv->peer);
G_OBJECT_CLASS(nm_device_veth_parent_class)->finalize(object);
}
const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_veth = NML_DBUS_META_IFACE_INIT_PROP(
NM_DBUS_INTERFACE_DEVICE_VETH,
nm_device_veth_get_type, nm_device_veth_get_type,
NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_20, NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_20,
NML_DBUS_META_IFACE_DBUS_PROPERTIES( NML_DBUS_META_IFACE_DBUS_PROPERTIES(
NML_DBUS_META_PROPERTY_INIT_S("peer", PROP_PEER, NMDeviceVeth, _priv.peer), ), ); NML_DBUS_META_PROPERTY_INIT_O_PROP("Peer",
PROP_PEER,
NMDeviceVeth,
_priv.peer,
nm_device_get_type), ), );
static void static void
nm_device_veth_class_init(NMDeviceVethClass *klass) nm_device_veth_class_init(NMDeviceVethClass *klass)
@@ -106,23 +100,24 @@ nm_device_veth_class_init(NMDeviceVethClass *klass)
NMDeviceClass *device_class = NM_DEVICE_CLASS(klass); NMDeviceClass *device_class = NM_DEVICE_CLASS(klass);
object_class->get_property = get_property; object_class->get_property = get_property;
object_class->finalize = finalize;
_NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceVeth); _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceVeth);
_NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceVethPrivate, peer);
device_class->get_setting_type = get_setting_type; device_class->get_setting_type = get_setting_type;
/** /**
* NMDeviceVeth:peer: * NMDeviceVeth:peer:
* *
* The device's peer name. * The device's peer device.
* *
* Since: 1.30 * Since: 1.30
**/ **/
obj_properties[PROP_PEER] = g_param_spec_string(NM_DEVICE_VETH_PEER, obj_properties[PROP_PEER] = g_param_spec_object(NM_DEVICE_VETH_PEER,
"", "",
"", "",
NULL, NM_TYPE_DEVICE,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
_nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_veth); _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_veth);

2
libnm/nm-device-veth.h
View File

@@ -34,7 +34,7 @@ NM_AVAILABLE_IN_1_30
GType nm_device_veth_get_type(void); GType nm_device_veth_get_type(void);
NM_AVAILABLE_IN_1_30 NM_AVAILABLE_IN_1_30
const char *nm_device_veth_get_peer(NMDeviceVeth *device); NMDevice *nm_device_veth_get_peer(NMDeviceVeth *device);
G_END_DECLS G_END_DECLS