diff options
Diffstat (limited to 'libnm/nm-device-bond.c')
| -rw-r--r-- | libnm/nm-device-bond.c | 182 |
1 files changed, 92 insertions, 90 deletions
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index ebc438a957..4f51aa2420 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -15,29 +15,27 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE ( - PROP_CARRIER, - PROP_SLAVES, -); +NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_CARRIER, PROP_SLAVES, ); typedef struct { - NMLDBusPropertyAO slaves; - char *hw_address; - bool carrier; + NMLDBusPropertyAO slaves; + char * hw_address; + bool carrier; } NMDeviceBondPrivate; struct _NMDeviceBond { - NMDevice parent; - NMDeviceBondPrivate _priv; + NMDevice parent; + NMDeviceBondPrivate _priv; }; struct _NMDeviceBondClass { - NMDeviceClass parent; + NMDeviceClass parent; }; -G_DEFINE_TYPE (NMDeviceBond, nm_device_bond, NM_TYPE_DEVICE) +G_DEFINE_TYPE(NMDeviceBond, nm_device_bond, NM_TYPE_DEVICE) -#define NM_DEVICE_BOND_GET_PRIVATE(self) _NM_GET_PRIVATE(self, NMDeviceBond, NM_IS_DEVICE_BOND, NMObject, NMDevice) +#define NM_DEVICE_BOND_GET_PRIVATE(self) \ + _NM_GET_PRIVATE(self, NMDeviceBond, NM_IS_DEVICE_BOND, NMObject, NMDevice) /*****************************************************************************/ @@ -53,11 +51,11 @@ G_DEFINE_TYPE (NMDeviceBond, nm_device_bond, NM_TYPE_DEVICE) * Deprecated: 1.24: Use nm_device_get_hw_address() instead. **/ const char * -nm_device_bond_get_hw_address (NMDeviceBond *device) +nm_device_bond_get_hw_address(NMDeviceBond *device) { - g_return_val_if_fail (NM_IS_DEVICE_BOND (device), NULL); + g_return_val_if_fail(NM_IS_DEVICE_BOND(device), NULL); - return nm_device_get_hw_address (NM_DEVICE (device)); + return nm_device_get_hw_address(NM_DEVICE(device)); } /** @@ -69,11 +67,11 @@ nm_device_bond_get_hw_address (NMDeviceBond *device) * Returns: %TRUE if the device has carrier **/ gboolean -nm_device_bond_get_carrier (NMDeviceBond *device) +nm_device_bond_get_carrier(NMDeviceBond *device) { - g_return_val_if_fail (NM_IS_DEVICE_BOND (device), FALSE); + g_return_val_if_fail(NM_IS_DEVICE_BOND(device), FALSE); - return NM_DEVICE_BOND_GET_PRIVATE (device)->carrier; + return NM_DEVICE_BOND_GET_PRIVATE(device)->carrier; } /** @@ -87,123 +85,127 @@ nm_device_bond_get_carrier (NMDeviceBond *device) * copy used by the device, and must not be modified. **/ const GPtrArray * -nm_device_bond_get_slaves (NMDeviceBond *device) +nm_device_bond_get_slaves(NMDeviceBond *device) { - g_return_val_if_fail (NM_IS_DEVICE_BOND (device), FALSE); + g_return_val_if_fail(NM_IS_DEVICE_BOND(device), FALSE); - return nml_dbus_property_ao_get_objs_as_ptrarray (&NM_DEVICE_BOND_GET_PRIVATE (device)->slaves); + return nml_dbus_property_ao_get_objs_as_ptrarray(&NM_DEVICE_BOND_GET_PRIVATE(device)->slaves); } static gboolean -connection_compatible (NMDevice *device, NMConnection *connection, GError **error) +connection_compatible(NMDevice *device, NMConnection *connection, GError **error) { - if (!NM_DEVICE_CLASS (nm_device_bond_parent_class)->connection_compatible (device, connection, error)) - return FALSE; + if (!NM_DEVICE_CLASS(nm_device_bond_parent_class) + ->connection_compatible(device, connection, error)) + return FALSE; - if (!nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME)) { - g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, - _("The connection was not a bond connection.")); - return FALSE; - } + if (!nm_connection_is_type(connection, NM_SETTING_BOND_SETTING_NAME)) { + g_set_error_literal(error, + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, + _("The connection was not a bond connection.")); + return FALSE; + } - /* FIXME: check slaves? */ + /* FIXME: check slaves? */ - return TRUE; + return TRUE; } static GType -get_setting_type (NMDevice *device) +get_setting_type(NMDevice *device) { - return NM_TYPE_SETTING_BOND; + return NM_TYPE_SETTING_BOND; } /*****************************************************************************/ static void -nm_device_bond_init (NMDeviceBond *device) -{ -} +nm_device_bond_init(NMDeviceBond *device) +{} static void -finalize (GObject *object) +finalize(GObject *object) { - NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE (object); + NMDeviceBondPrivate *priv = NM_DEVICE_BOND_GET_PRIVATE(object); - g_free (priv->hw_address); + g_free(priv->hw_address); - G_OBJECT_CLASS (nm_device_bond_parent_class)->finalize (object); + G_OBJECT_CLASS(nm_device_bond_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) { - NMDeviceBond *device = NM_DEVICE_BOND (object); - - switch (prop_id) { - case PROP_CARRIER: - g_value_set_boolean (value, nm_device_bond_get_carrier (device)); - break; - case PROP_SLAVES: - g_value_take_boxed (value, _nm_utils_copy_object_array (nm_device_bond_get_slaves (device))); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMDeviceBond *device = NM_DEVICE_BOND(object); + + switch (prop_id) { + case PROP_CARRIER: + g_value_set_boolean(value, nm_device_bond_get_carrier(device)); + break; + case PROP_SLAVES: + g_value_take_boxed(value, _nm_utils_copy_object_array(nm_device_bond_get_slaves(device))); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } -const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bond = NML_DBUS_META_IFACE_INIT_PROP ( - NM_DBUS_INTERFACE_DEVICE_BOND, - nm_device_bond_get_type, - NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, - NML_DBUS_META_IFACE_DBUS_PROPERTIES ( - NML_DBUS_META_PROPERTY_INIT_B ("Carrier", PROP_CARRIER, NMDeviceBond, _priv.carrier ), - NML_DBUS_META_PROPERTY_INIT_FCN ("HwAddress", 0, "s", _nm_device_notify_update_prop_hw_address ), - NML_DBUS_META_PROPERTY_INIT_AO_PROP ("Slaves", PROP_SLAVES, NMDeviceBond, _priv.slaves, nm_device_get_type ), - ), -); +const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bond = NML_DBUS_META_IFACE_INIT_PROP( + NM_DBUS_INTERFACE_DEVICE_BOND, + nm_device_bond_get_type, + NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH, + NML_DBUS_META_IFACE_DBUS_PROPERTIES( + NML_DBUS_META_PROPERTY_INIT_B("Carrier", PROP_CARRIER, NMDeviceBond, _priv.carrier), + NML_DBUS_META_PROPERTY_INIT_FCN("HwAddress", + 0, + "s", + _nm_device_notify_update_prop_hw_address), + NML_DBUS_META_PROPERTY_INIT_AO_PROP("Slaves", + PROP_SLAVES, + NMDeviceBond, + _priv.slaves, + nm_device_get_type), ), ); static void -nm_device_bond_class_init (NMDeviceBondClass *klass) +nm_device_bond_class_init(NMDeviceBondClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NMObjectClass *nm_object_class = NM_OBJECT_CLASS (klass); - NMDeviceClass *device_class = NM_DEVICE_CLASS (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; + object_class->get_property = get_property; + object_class->finalize = finalize; - _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT (nm_object_class, NMDeviceBond); + _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceBond); - _NM_OBJECT_CLASS_INIT_PROPERTY_AO_FIELDS_1 (nm_object_class, NMDeviceBondPrivate, slaves); + _NM_OBJECT_CLASS_INIT_PROPERTY_AO_FIELDS_1(nm_object_class, NMDeviceBondPrivate, slaves); - device_class->connection_compatible = connection_compatible; - device_class->get_setting_type = get_setting_type; + device_class->connection_compatible = connection_compatible; + device_class->get_setting_type = get_setting_type; - /** + /** * NMDeviceBond:carrier: * * Whether the device has carrier. **/ - obj_properties[PROP_CARRIER] = - g_param_spec_boolean (NM_DEVICE_BOND_CARRIER, "", "", - FALSE, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); + obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_BOND_CARRIER, + "", + "", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - /** + /** * NMDeviceBond:slaves: (type GPtrArray(NMDevice)) * * The devices enslaved to the bond device. **/ - obj_properties[PROP_SLAVES] = - g_param_spec_boxed (NM_DEVICE_BOND_SLAVES, "", "", - G_TYPE_PTR_ARRAY, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); + obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_BOND_SLAVES, + "", + "", + G_TYPE_PTR_ARRAY, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - _nml_dbus_meta_class_init_with_properties (object_class, &_nml_dbus_meta_iface_nm_device_bond); + _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device_bond); } |