fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-15 03:20:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

veth: refactor type definition of NMDeviceVeth

Browse source 
Embed the private data inside NMDeviceVeth structure and use NM_GOBJECT_PROPERTIES_DEFINE().
This commit is contained in:
Thomas Haller 2016-07-05 14:34:53 +02:00
parent a040e447d0
commit 87169e681a
2 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/devices/nm-device-veth.c
View file

@ -38,23 +38,44 @@
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVeth);
G_DEFINE_TYPE (NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET)
#define NM_DEVICE_VETH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_VETH, NMDeviceVethPrivate))
/*****************************************************************************/
typedef struct {
NMDevice *peer;
gboolean ever_had_peer;
} NMDeviceVethPrivate;
enum {
PROP_0,
PROP_PEER,
LAST_PROP
struct _NMDeviceVeth {
NMDeviceEthernet parent;
NMDeviceVethPrivate _priv;
};
/**************************************************************/
struct _NMDeviceVethClass {
NMDeviceEthernetClass parent_class;
};
NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceVeth,
PROP_PEER,
);
/*****************************************************************************/
G_DEFINE_TYPE (NMDeviceVeth, nm_device_veth, NM_TYPE_DEVICE_ETHERNET)
#define NM_DEVICE_VETH_GET_PRIVATE(self) \
({ \
/* preserve the const-ness of self. Unfortunately, that
* way, @self cannot be a void pointer */ \
typeof (self) _self = (self); \
\
/* Get compiler error if variable is of wrong type */ \
_nm_unused const NMDeviceVeth *_self2 = (_self); \
\
nm_assert (NM_IS_DEVICE_VETH (_self)); \
&_self->_priv; \
})
/*****************************************************************************/
static void
set_peer (NMDeviceVeth *self, NMDevice *peer)
@ -66,7 +87,7 @@ set_peer (NMDeviceVeth *self, NMDevice *peer)
priv->peer = peer;
g_object_add_weak_pointer (G_OBJECT (peer), (gpointer *) &priv->peer);
g_object_notify (G_OBJECT (self), NM_DEVICE_VETH_PEER);
_notify (self, PROP_PEER);
}
}
@ -150,8 +171,6 @@ nm_device_veth_class_init (NMDeviceVethClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
g_type_class_add_private (klass, sizeof (NMDeviceVethPrivate));
NM_DEVICE_CLASS_DECLARE_TYPES (klass, NULL, NM_LINK_TYPE_VETH)
object_class->get_property = get_property;
@ -159,13 +178,13 @@ nm_device_veth_class_init (NMDeviceVethClass *klass)
device_class->can_unmanaged_external_down = can_unmanaged_external_down;
/* properties */
g_object_class_install_property
(object_class, PROP_PEER,
g_param_spec_string (NM_DEVICE_VETH_PEER, "", "",
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
obj_properties[PROP_PEER] =
g_param_spec_string (NM_DEVICE_VETH_PEER, "", "",
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
NMDBUS_TYPE_DEVICE_VETH_SKELETON,

4
src/devices/nm-device-veth.h
View file

@ -34,8 +34,8 @@ G_BEGIN_DECLS
#define NM_DEVICE_VETH_PEER "peer"
typedef NMDeviceEthernet NMDeviceVeth;
typedef NMDeviceEthernetClass NMDeviceVethClass;
typedef struct _NMDeviceVeth NMDeviceVeth;
typedef struct _NMDeviceVethClass NMDeviceVethClass;
GType nm_device_veth_get_type (void);