diff options
Diffstat (limited to 'libnm/nm-device-macvlan.c')
| -rw-r--r-- | libnm/nm-device-macvlan.c | 326 |
1 files changed, 164 insertions, 162 deletions
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c index 3b3ce115..ad5f8b95 100644 --- a/libnm/nm-device-macvlan.c +++ b/libnm/nm-device-macvlan.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2015 Red Hat, Inc. */ @@ -15,32 +15,28 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE ( - PROP_PARENT, - PROP_MODE, - PROP_NO_PROMISC, - PROP_TAP, -); +NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PARENT, PROP_MODE, PROP_NO_PROMISC, PROP_TAP, ); typedef struct { - NMLDBusPropertyO parent; - char *mode; - bool no_promisc; - bool tap; + NMLDBusPropertyO parent; + char * mode; + bool no_promisc; + bool tap; } NMDeviceMacvlanPrivate; struct _NMDeviceMacvlan { - NMDevice parent; - NMDeviceMacvlanPrivate _priv; + NMDevice parent; + NMDeviceMacvlanPrivate _priv; }; struct _NMDeviceMacvlanClass { - NMDeviceClass parent; + NMDeviceClass parent; }; -G_DEFINE_TYPE (NMDeviceMacvlan, nm_device_macvlan, NM_TYPE_DEVICE) +G_DEFINE_TYPE(NMDeviceMacvlan, nm_device_macvlan, NM_TYPE_DEVICE) -#define NM_DEVICE_MACVLAN_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceMacvlan, NM_IS_DEVICE_MACVLAN, NMObject, NMDevice) +#define NM_DEVICE_MACVLAN_GET_PRIVATE(self) \ + _NM_GET_PRIVATE(self, NMDeviceMacvlan, NM_IS_DEVICE_MACVLAN, NMObject, NMDevice) /*****************************************************************************/ @@ -53,11 +49,11 @@ G_DEFINE_TYPE (NMDeviceMacvlan, nm_device_macvlan, NM_TYPE_DEVICE) * Since: 1.2 **/ NMDevice * -nm_device_macvlan_get_parent (NMDeviceMacvlan *device) +nm_device_macvlan_get_parent(NMDeviceMacvlan *device) { - g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), FALSE); + g_return_val_if_fail(NM_IS_DEVICE_MACVLAN(device), FALSE); - return nml_dbus_property_o_get_obj (&NM_DEVICE_MACVLAN_GET_PRIVATE (device)->parent); + return nml_dbus_property_o_get_obj(&NM_DEVICE_MACVLAN_GET_PRIVATE(device)->parent); } /** @@ -72,11 +68,11 @@ nm_device_macvlan_get_parent (NMDeviceMacvlan *device) * Since: 1.2 **/ const char * -nm_device_macvlan_get_mode (NMDeviceMacvlan *device) +nm_device_macvlan_get_mode(NMDeviceMacvlan *device) { - g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), NULL); + g_return_val_if_fail(NM_IS_DEVICE_MACVLAN(device), NULL); - return _nml_coerce_property_str_not_empty (NM_DEVICE_MACVLAN_GET_PRIVATE (device)->mode); + return _nml_coerce_property_str_not_empty(NM_DEVICE_MACVLAN_GET_PRIVATE(device)->mode); } /** @@ -90,11 +86,11 @@ nm_device_macvlan_get_mode (NMDeviceMacvlan *device) * Since: 1.2 **/ gboolean -nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device) +nm_device_macvlan_get_no_promisc(NMDeviceMacvlan *device) { - g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), FALSE); + g_return_val_if_fail(NM_IS_DEVICE_MACVLAN(device), FALSE); - return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->no_promisc; + return NM_DEVICE_MACVLAN_GET_PRIVATE(device)->no_promisc; } /** @@ -108,11 +104,11 @@ nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device) * Since: 1.2 **/ gboolean -nm_device_macvlan_get_tap (NMDeviceMacvlan *device) +nm_device_macvlan_get_tap(NMDeviceMacvlan *device) { - g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), FALSE); + g_return_val_if_fail(NM_IS_DEVICE_MACVLAN(device), FALSE); - return NM_DEVICE_MACVLAN_GET_PRIVATE (device)->tap; + return NM_DEVICE_MACVLAN_GET_PRIVATE(device)->tap; } /** @@ -131,167 +127,173 @@ nm_device_macvlan_get_tap (NMDeviceMacvlan *device) * Deprecated: 1.24: Use nm_device_get_hw_address() instead. **/ const char * -nm_device_macvlan_get_hw_address (NMDeviceMacvlan *device) +nm_device_macvlan_get_hw_address(NMDeviceMacvlan *device) { - g_return_val_if_fail (NM_IS_DEVICE_MACVLAN (device), NULL); + g_return_val_if_fail(NM_IS_DEVICE_MACVLAN(device), NULL); - return nm_device_get_hw_address (NM_DEVICE (device)); + return nm_device_get_hw_address(NM_DEVICE(device)); } static gboolean -connection_compatible (NMDevice *device, NMConnection *connection, GError **error) +connection_compatible(NMDevice *device, NMConnection *connection, GError **error) { - NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (device); - NMSettingMacvlan *s_macvlan; - - if (!NM_DEVICE_CLASS (nm_device_macvlan_parent_class)->connection_compatible (device, connection, error)) - return FALSE; - - if (!nm_connection_is_type (connection, NM_SETTING_MACVLAN_SETTING_NAME)) { - g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, - _("The connection was not a MAC-VLAN connection.")); - return FALSE; - } - - s_macvlan = nm_connection_get_setting_macvlan (connection); - if (s_macvlan) { - if (nm_setting_macvlan_get_tap (s_macvlan) != priv->tap) - return FALSE; - } - - return TRUE; + NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE(device); + NMSettingMacvlan * s_macvlan; + + if (!NM_DEVICE_CLASS(nm_device_macvlan_parent_class) + ->connection_compatible(device, connection, error)) + return FALSE; + + if (!nm_connection_is_type(connection, NM_SETTING_MACVLAN_SETTING_NAME)) { + g_set_error_literal(error, + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, + _("The connection was not a MAC-VLAN connection.")); + return FALSE; + } + + s_macvlan = nm_connection_get_setting_macvlan(connection); + if (s_macvlan) { + if (nm_setting_macvlan_get_tap(s_macvlan) != priv->tap) + return FALSE; + } + + return TRUE; } static GType -get_setting_type (NMDevice *device) +get_setting_type(NMDevice *device) { - return NM_TYPE_SETTING_MACVLAN; + return NM_TYPE_SETTING_MACVLAN; } /*****************************************************************************/ static void -nm_device_macvlan_init (NMDeviceMacvlan *device) -{ -} +nm_device_macvlan_init(NMDeviceMacvlan *device) +{} static void -finalize (GObject *object) +finalize(GObject *object) { - NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (object); + NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE(object); - g_free (priv->mode); + g_free(priv->mode); - G_OBJECT_CLASS (nm_device_macvlan_parent_class)->finalize (object); + G_OBJECT_CLASS(nm_device_macvlan_parent_class)->finalize(object); } static void -get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMDeviceMacvlan *device = NM_DEVICE_MACVLAN (object); - - switch (prop_id) { - case PROP_PARENT: - g_value_set_object (value, nm_device_macvlan_get_parent (device)); - break; - case PROP_MODE: - g_value_set_string (value, nm_device_macvlan_get_mode (device)); - break; - case PROP_NO_PROMISC: - g_value_set_boolean (value, nm_device_macvlan_get_no_promisc (device)); - break; - case PROP_TAP: - g_value_set_boolean (value, nm_device_macvlan_get_tap (device)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMDeviceMacvlan *device = NM_DEVICE_MACVLAN(object); + + switch (prop_id) { + case PROP_PARENT: + g_value_set_object(value, nm_device_macvlan_get_parent(device)); + break; + case PROP_MODE: + g_value_set_string(value, nm_device_macvlan_get_mode(device)); + break; + case PROP_NO_PROMISC: + g_value_set_boolean(value, nm_device_macvlan_get_no_promisc(device)); + break; + case PROP_TAP: + g_value_set_boolean(value, nm_device_macvlan_get_tap(device)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } -const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_macvlan = NML_DBUS_META_IFACE_INIT_PROP ( - NM_DBUS_INTERFACE_DEVICE_MACVLAN, - nm_device_macvlan_get_type, - NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, - NML_DBUS_META_IFACE_DBUS_PROPERTIES ( - NML_DBUS_META_PROPERTY_INIT_S ("Mode", PROP_MODE, NMDeviceMacvlan, _priv.mode ), - NML_DBUS_META_PROPERTY_INIT_B ("NoPromisc", PROP_NO_PROMISC, NMDeviceMacvlan, _priv.no_promisc ), - NML_DBUS_META_PROPERTY_INIT_O_PROP ("Parent", PROP_PARENT, NMDeviceMacvlan, _priv.parent, nm_device_get_type ), - NML_DBUS_META_PROPERTY_INIT_B ("Tap", PROP_TAP, NMDeviceMacvlan, _priv.tap ), - ), -); +const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_macvlan = NML_DBUS_META_IFACE_INIT_PROP( + NM_DBUS_INTERFACE_DEVICE_MACVLAN, + nm_device_macvlan_get_type, + NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, + NML_DBUS_META_IFACE_DBUS_PROPERTIES( + NML_DBUS_META_PROPERTY_INIT_S("Mode", PROP_MODE, NMDeviceMacvlan, _priv.mode), + NML_DBUS_META_PROPERTY_INIT_B("NoPromisc", + PROP_NO_PROMISC, + NMDeviceMacvlan, + _priv.no_promisc), + NML_DBUS_META_PROPERTY_INIT_O_PROP("Parent", + PROP_PARENT, + NMDeviceMacvlan, + _priv.parent, + nm_device_get_type), + NML_DBUS_META_PROPERTY_INIT_B("Tap", PROP_TAP, NMDeviceMacvlan, _priv.tap), ), ); static void -nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass) +nm_device_macvlan_class_init(NMDeviceMacvlanClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (klass); - NMDeviceClass *device_class = NM_DEVICE_CLASS (klass); - - object_class->get_property = get_property; - object_class->finalize = finalize; - - _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT (nm_object_class, NMDeviceMacvlan); - - _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1 (nm_object_class, NMDeviceMacvlanPrivate, parent); - - device_class->connection_compatible = connection_compatible; - device_class->get_setting_type = get_setting_type; - - /** - * NMDeviceMacvlan:parent: - * - * The devices's parent device. - * - * Since: 1.2 - **/ - obj_properties[PROP_PARENT] = - g_param_spec_object (NM_DEVICE_MACVLAN_PARENT, "", "", - NM_TYPE_DEVICE, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - /** - * NMDeviceMacvlan:mode: - * - * The MACVLAN mode. - * - * Since: 1.2 - **/ - obj_properties[PROP_MODE] = - g_param_spec_string (NM_DEVICE_MACVLAN_MODE, "", "", - NULL, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - /** - * NMDeviceMacvlan:no-promisc: - * - * Whether the device has the no-promiscuos flag. - * - * Since: 1.2 - **/ - obj_properties[PROP_NO_PROMISC] = - g_param_spec_boolean (NM_DEVICE_MACVLAN_NO_PROMISC, "", "", - FALSE, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - /** - * NMDeviceMacvlan:tap: - * - * Whether the device is a MACVTAP. - * - * Since: 1.2 - **/ - obj_properties[PROP_TAP] = - g_param_spec_boolean (NM_DEVICE_MACVLAN_TAP, "", "", - FALSE, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); - - _nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_device_macvlan); + GObjectClass * object_class = G_OBJECT_CLASS(klass); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS(klass); + NMDeviceClass *device_class = NM_DEVICE_CLASS(klass); + + object_class->get_property = get_property; + object_class->finalize = finalize; + + _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceMacvlan); + + _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceMacvlanPrivate, parent); + + device_class->connection_compatible = connection_compatible; + device_class->get_setting_type = get_setting_type; + + /** + * NMDeviceMacvlan:parent: + * + * The devices's parent device. + * + * Since: 1.2 + **/ + obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_MACVLAN_PARENT, + "", + "", + NM_TYPE_DEVICE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + /** + * NMDeviceMacvlan:mode: + * + * The MACVLAN mode. + * + * Since: 1.2 + **/ + obj_properties[PROP_MODE] = g_param_spec_string(NM_DEVICE_MACVLAN_MODE, + "", + "", + NULL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + /** + * NMDeviceMacvlan:no-promisc: + * + * Whether the device has the no-promiscuos flag. + * + * Since: 1.2 + **/ + obj_properties[PROP_NO_PROMISC] = + g_param_spec_boolean(NM_DEVICE_MACVLAN_NO_PROMISC, + "", + "", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + /** + * NMDeviceMacvlan:tap: + * + * Whether the device is a MACVTAP. + * + * Since: 1.2 + **/ + obj_properties[PROP_TAP] = g_param_spec_boolean(NM_DEVICE_MACVLAN_TAP, + "", + "", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + + _nml_dbus_meta_class_init_with_properties(object_class, + &_nml_dbus_meta_iface_nm_device_macvlan); } |