diff options
Diffstat (limited to 'libnm-core/nm-setting-ovs-port.c')
| -rw-r--r-- | libnm-core/nm-setting-ovs-port.c | 517 |
1 files changed, 269 insertions, 248 deletions
diff --git a/libnm-core/nm-setting-ovs-port.c b/libnm-core/nm-setting-ovs-port.c index a2073ed330..b68fd32797 100644 --- a/libnm-core/nm-setting-ovs-port.c +++ b/libnm-core/nm-setting-ovs-port.c @@ -21,14 +21,12 @@ /*****************************************************************************/ -NM_GOBJECT_PROPERTIES_DEFINE_BASE ( - PROP_VLAN_MODE, - PROP_TAG, - PROP_LACP, - PROP_BOND_MODE, - PROP_BOND_UPDELAY, - PROP_BOND_DOWNDELAY, -); +NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_VLAN_MODE, + PROP_TAG, + PROP_LACP, + PROP_BOND_MODE, + PROP_BOND_UPDELAY, + PROP_BOND_DOWNDELAY, ); /** * NMSettingOvsPort: @@ -36,21 +34,21 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( * OvsPort Link Settings */ struct _NMSettingOvsPort { - NMSetting parent; - - char *vlan_mode; - char *lacp; - char *bond_mode; - guint tag; - guint bond_updelay; - guint bond_downdelay; + NMSetting parent; + + char *vlan_mode; + char *lacp; + char *bond_mode; + guint tag; + guint bond_updelay; + guint bond_downdelay; }; struct _NMSettingOvsPortClass { - NMSettingClass parent; + NMSettingClass parent; }; -G_DEFINE_TYPE (NMSettingOvsPort, nm_setting_ovs_port, NM_TYPE_SETTING) +G_DEFINE_TYPE(NMSettingOvsPort, nm_setting_ovs_port, NM_TYPE_SETTING) /*****************************************************************************/ @@ -63,11 +61,11 @@ G_DEFINE_TYPE (NMSettingOvsPort, nm_setting_ovs_port, NM_TYPE_SETTING) * Since: 1.10 **/ const char * -nm_setting_ovs_port_get_vlan_mode (NMSettingOvsPort *self) +nm_setting_ovs_port_get_vlan_mode(NMSettingOvsPort *self) { - g_return_val_if_fail (NM_IS_SETTING_OVS_PORT (self), NULL); + g_return_val_if_fail(NM_IS_SETTING_OVS_PORT(self), NULL); - return self->vlan_mode; + return self->vlan_mode; } /** @@ -79,11 +77,11 @@ nm_setting_ovs_port_get_vlan_mode (NMSettingOvsPort *self) * Since: 1.10 **/ guint -nm_setting_ovs_port_get_tag (NMSettingOvsPort *self) +nm_setting_ovs_port_get_tag(NMSettingOvsPort *self) { - g_return_val_if_fail (NM_IS_SETTING_OVS_PORT (self), 0); + g_return_val_if_fail(NM_IS_SETTING_OVS_PORT(self), 0); - return self->tag; + return self->tag; } /** @@ -95,11 +93,11 @@ nm_setting_ovs_port_get_tag (NMSettingOvsPort *self) * Since: 1.10 **/ const char * -nm_setting_ovs_port_get_lacp (NMSettingOvsPort *self) +nm_setting_ovs_port_get_lacp(NMSettingOvsPort *self) { - g_return_val_if_fail (NM_IS_SETTING_OVS_PORT (self), NULL); + g_return_val_if_fail(NM_IS_SETTING_OVS_PORT(self), NULL); - return self->lacp; + return self->lacp; } /** @@ -111,11 +109,11 @@ nm_setting_ovs_port_get_lacp (NMSettingOvsPort *self) * Since: 1.10 **/ const char * -nm_setting_ovs_port_get_bond_mode (NMSettingOvsPort *self) +nm_setting_ovs_port_get_bond_mode(NMSettingOvsPort *self) { - g_return_val_if_fail (NM_IS_SETTING_OVS_PORT (self), NULL); + g_return_val_if_fail(NM_IS_SETTING_OVS_PORT(self), NULL); - return self->bond_mode; + return self->bond_mode; } /** @@ -127,11 +125,11 @@ nm_setting_ovs_port_get_bond_mode (NMSettingOvsPort *self) * Since: 1.10 **/ guint -nm_setting_ovs_port_get_bond_updelay (NMSettingOvsPort *self) +nm_setting_ovs_port_get_bond_updelay(NMSettingOvsPort *self) { - g_return_val_if_fail (NM_IS_SETTING_OVS_PORT (self), 0); + g_return_val_if_fail(NM_IS_SETTING_OVS_PORT(self), 0); - return self->bond_updelay; + return self->bond_updelay; } /** @@ -143,178 +141,195 @@ nm_setting_ovs_port_get_bond_updelay (NMSettingOvsPort *self) * Since: 1.10 **/ guint -nm_setting_ovs_port_get_bond_downdelay (NMSettingOvsPort *self) +nm_setting_ovs_port_get_bond_downdelay(NMSettingOvsPort *self) { - g_return_val_if_fail (NM_IS_SETTING_OVS_PORT (self), 0); + g_return_val_if_fail(NM_IS_SETTING_OVS_PORT(self), 0); - return self->bond_downdelay; + return self->bond_downdelay; } /*****************************************************************************/ static int -verify (NMSetting *setting, NMConnection *connection, GError **error) +verify(NMSetting *setting, NMConnection *connection, GError **error) { - NMSettingOvsPort *self = NM_SETTING_OVS_PORT (setting); - - if (!_nm_connection_verify_required_interface_name (connection, error)) - return FALSE; - - if (connection) { - NMSettingConnection *s_con; - const char *slave_type; - - s_con = nm_connection_get_setting_connection (connection); - if (!s_con) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_MISSING_SETTING, - _("missing setting")); - g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_SETTING_NAME); - return FALSE; - } - - if (!nm_setting_connection_get_master (s_con)) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have a master."), - NM_SETTING_OVS_PORT_SETTING_NAME); - g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_MASTER); - return FALSE; - } - - slave_type = nm_setting_connection_get_slave_type (s_con); - if ( slave_type - && strcmp (slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("A connection with a '%s' setting must have the slave-type set to '%s'. Instead it is '%s'"), - NM_SETTING_OVS_PORT_SETTING_NAME, - NM_SETTING_OVS_BRIDGE_SETTING_NAME, - slave_type); - g_prefix_error (error, "%s.%s: ", NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_SLAVE_TYPE); - return FALSE; - } - } - - if (!NM_IN_STRSET (self->vlan_mode, "access", "native-tagged", "native-untagged", "trunk", NULL)) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("'%s' is not allowed in vlan_mode"), - self->vlan_mode); - g_prefix_error (error, "%s.%s: ", NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_PORT_VLAN_MODE); - return FALSE; - } - - if (self->tag >= 4095) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("the tag id must be in range 0-4094 but is %u"), - self->tag); - g_prefix_error (error, "%s.%s: ", NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_PORT_TAG); - return FALSE; - } - - if (!NM_IN_STRSET (self->lacp, "active", "off", "passive", NULL)) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("'%s' is not allowed in lacp"), - self->lacp); - g_prefix_error (error, "%s.%s: ", NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_PORT_LACP); - return FALSE; - } - - if (!NM_IN_STRSET (self->bond_mode, "active-backup", "balance-slb", "balance-tcp", NULL)) { - g_set_error (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("'%s' is not allowed in bond_mode"), - self->bond_mode); - g_prefix_error (error, "%s.%s: ", NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_PORT_BOND_MODE); - return FALSE; - } - - return TRUE; + NMSettingOvsPort *self = NM_SETTING_OVS_PORT(setting); + + if (!_nm_connection_verify_required_interface_name(connection, error)) + return FALSE; + + if (connection) { + NMSettingConnection *s_con; + const char * slave_type; + + s_con = nm_connection_get_setting_connection(connection); + if (!s_con) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_MISSING_SETTING, + _("missing setting")); + g_prefix_error(error, "%s: ", NM_SETTING_CONNECTION_SETTING_NAME); + return FALSE; + } + + if (!nm_setting_connection_get_master(s_con)) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("A connection with a '%s' setting must have a master."), + NM_SETTING_OVS_PORT_SETTING_NAME); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_MASTER); + return FALSE; + } + + slave_type = nm_setting_connection_get_slave_type(s_con); + if (slave_type && strcmp(slave_type, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("A connection with a '%s' setting must have the slave-type set to '%s'. " + "Instead it is '%s'"), + NM_SETTING_OVS_PORT_SETTING_NAME, + NM_SETTING_OVS_BRIDGE_SETTING_NAME, + slave_type); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_CONNECTION_SETTING_NAME, + NM_SETTING_CONNECTION_SLAVE_TYPE); + return FALSE; + } + } + + if (!NM_IN_STRSET(self->vlan_mode, + "access", + "native-tagged", + "native-untagged", + "trunk", + NULL)) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is not allowed in vlan_mode"), + self->vlan_mode); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_OVS_PORT_SETTING_NAME, + NM_SETTING_OVS_PORT_VLAN_MODE); + return FALSE; + } + + if (self->tag >= 4095) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("the tag id must be in range 0-4094 but is %u"), + self->tag); + g_prefix_error(error, "%s.%s: ", NM_SETTING_OVS_PORT_SETTING_NAME, NM_SETTING_OVS_PORT_TAG); + return FALSE; + } + + if (!NM_IN_STRSET(self->lacp, "active", "off", "passive", NULL)) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is not allowed in lacp"), + self->lacp); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_OVS_PORT_SETTING_NAME, + NM_SETTING_OVS_PORT_LACP); + return FALSE; + } + + if (!NM_IN_STRSET(self->bond_mode, "active-backup", "balance-slb", "balance-tcp", NULL)) { + g_set_error(error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("'%s' is not allowed in bond_mode"), + self->bond_mode); + g_prefix_error(error, + "%s.%s: ", + NM_SETTING_OVS_PORT_SETTING_NAME, + NM_SETTING_OVS_PORT_BOND_MODE); + return FALSE; + } + + return TRUE; } /*****************************************************************************/ static void -get_property (GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) +get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMSettingOvsPort *self = NM_SETTING_OVS_PORT (object); - - switch (prop_id) { - case PROP_VLAN_MODE: - g_value_set_string (value, self->vlan_mode); - break; - case PROP_TAG: - g_value_set_uint (value, self->tag); - break; - case PROP_LACP: - g_value_set_string (value, self->lacp); - break; - case PROP_BOND_MODE: - g_value_set_string (value, self->bond_mode); - break; - case PROP_BOND_UPDELAY: - g_value_set_uint (value, self->bond_updelay); - break; - case PROP_BOND_DOWNDELAY: - g_value_set_uint (value, self->bond_downdelay); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMSettingOvsPort *self = NM_SETTING_OVS_PORT(object); + + switch (prop_id) { + case PROP_VLAN_MODE: + g_value_set_string(value, self->vlan_mode); + break; + case PROP_TAG: + g_value_set_uint(value, self->tag); + break; + case PROP_LACP: + g_value_set_string(value, self->lacp); + break; + case PROP_BOND_MODE: + g_value_set_string(value, self->bond_mode); + break; + case PROP_BOND_UPDELAY: + g_value_set_uint(value, self->bond_updelay); + break; + case PROP_BOND_DOWNDELAY: + g_value_set_uint(value, self->bond_downdelay); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } static void -set_property (GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) +set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMSettingOvsPort *self = NM_SETTING_OVS_PORT (object); - - switch (prop_id) { - case PROP_VLAN_MODE: - g_free (self->vlan_mode); - self->vlan_mode = g_value_dup_string (value); - break; - case PROP_TAG: - self->tag = g_value_get_uint (value); - break; - case PROP_LACP: - g_free (self->lacp); - self->lacp = g_value_dup_string (value); - break; - case PROP_BOND_MODE: - g_free (self->bond_mode); - self->bond_mode = g_value_dup_string (value); - break; - case PROP_BOND_UPDELAY: - self->bond_updelay = g_value_get_uint (value); - break; - case PROP_BOND_DOWNDELAY: - self->bond_downdelay = g_value_get_uint (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + NMSettingOvsPort *self = NM_SETTING_OVS_PORT(object); + + switch (prop_id) { + case PROP_VLAN_MODE: + g_free(self->vlan_mode); + self->vlan_mode = g_value_dup_string(value); + break; + case PROP_TAG: + self->tag = g_value_get_uint(value); + break; + case PROP_LACP: + g_free(self->lacp); + self->lacp = g_value_dup_string(value); + break; + case PROP_BOND_MODE: + g_free(self->bond_mode); + self->bond_mode = g_value_dup_string(value); + break; + case PROP_BOND_UPDELAY: + self->bond_updelay = g_value_get_uint(value); + break; + case PROP_BOND_DOWNDELAY: + self->bond_downdelay = g_value_get_uint(value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } } /*****************************************************************************/ static void -nm_setting_ovs_port_init (NMSettingOvsPort *self) -{ -} +nm_setting_ovs_port_init(NMSettingOvsPort *self) +{} /** * nm_setting_ovs_port_new: @@ -326,36 +341,36 @@ nm_setting_ovs_port_init (NMSettingOvsPort *self) * Since: 1.10 **/ NMSetting * -nm_setting_ovs_port_new (void) +nm_setting_ovs_port_new(void) { - return (NMSetting *) g_object_new (NM_TYPE_SETTING_OVS_PORT, NULL); + return (NMSetting *) g_object_new(NM_TYPE_SETTING_OVS_PORT, NULL); } static void -finalize (GObject *object) +finalize(GObject *object) { - NMSettingOvsPort *self = NM_SETTING_OVS_PORT (object); + NMSettingOvsPort *self = NM_SETTING_OVS_PORT(object); - g_free (self->vlan_mode); - g_free (self->lacp); - g_free (self->bond_mode); + g_free(self->vlan_mode); + g_free(self->lacp); + g_free(self->bond_mode); - G_OBJECT_CLASS (nm_setting_ovs_port_parent_class)->finalize (object); + G_OBJECT_CLASS(nm_setting_ovs_port_parent_class)->finalize(object); } static void -nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass) +nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - NMSettingClass *setting_class = NM_SETTING_CLASS (klass); + GObjectClass * object_class = G_OBJECT_CLASS(klass); + NMSettingClass *setting_class = NM_SETTING_CLASS(klass); - object_class->get_property = get_property; - object_class->set_property = set_property; - object_class->finalize = finalize; + object_class->get_property = get_property; + object_class->set_property = set_property; + object_class->finalize = finalize; - setting_class->verify = verify; + setting_class->verify = verify; - /** + /** * NMSettingOvsPort:vlan-mode: * * The VLAN mode. One of "access", "native-tagged", "native-untagged", @@ -363,84 +378,90 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *klass) * * Since: 1.10 **/ - obj_properties[PROP_VLAN_MODE] = - g_param_spec_string (NM_SETTING_OVS_PORT_VLAN_MODE, "", "", - NULL, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - /** + obj_properties[PROP_VLAN_MODE] = g_param_spec_string( + NM_SETTING_OVS_PORT_VLAN_MODE, + "", + "", + NULL, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); + + /** * NMSettingOvsPort:tag: * * The VLAN tag in the range 0-4095. * * Since: 1.10 **/ - obj_properties[PROP_TAG] = - g_param_spec_uint (NM_SETTING_OVS_PORT_TAG, "", "", - 0, 4095, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - /** + obj_properties[PROP_TAG] = + g_param_spec_uint(NM_SETTING_OVS_PORT_TAG, + "", + "", + 0, + 4095, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); + + /** * NMSettingOvsPort:lacp: * * LACP mode. One of "active", "off", or "passive". * * Since: 1.10 **/ - obj_properties[PROP_LACP] = - g_param_spec_string (NM_SETTING_OVS_PORT_LACP, "", "", - NULL, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - /** + obj_properties[PROP_LACP] = g_param_spec_string(NM_SETTING_OVS_PORT_LACP, + "", + "", + NULL, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE + | G_PARAM_STATIC_STRINGS); + + /** * NMSettingOvsPort:bond-mode: * * Bonding mode. One of "active-backup", "balance-slb", or "balance-tcp". * * Since: 1.10 **/ - obj_properties[PROP_BOND_MODE] = - g_param_spec_string (NM_SETTING_OVS_PORT_BOND_MODE, "", "", - NULL, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - /** + obj_properties[PROP_BOND_MODE] = g_param_spec_string( + NM_SETTING_OVS_PORT_BOND_MODE, + "", + "", + NULL, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); + + /** * NMSettingOvsPort:bond-updelay: * * The time port must be active before it starts forwarding traffic. * * Since: 1.10 **/ - obj_properties[PROP_BOND_UPDELAY] = - g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_UPDELAY, "", "", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - /** + obj_properties[PROP_BOND_UPDELAY] = + g_param_spec_uint(NM_SETTING_OVS_PORT_BOND_UPDELAY, + "", + "", + 0, + G_MAXUINT, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); + + /** * NMSettingOvsPort:bond-downdelay: * * The time port must be inactive in order to be considered down. * * Since: 1.10 **/ - obj_properties[PROP_BOND_DOWNDELAY] = - g_param_spec_uint (NM_SETTING_OVS_PORT_BOND_DOWNDELAY, "", "", - 0, G_MAXUINT, 0, - G_PARAM_READWRITE | - NM_SETTING_PARAM_INFERRABLE | - G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties); - - _nm_setting_class_commit (setting_class, NM_META_SETTING_TYPE_OVS_PORT); + obj_properties[PROP_BOND_DOWNDELAY] = + g_param_spec_uint(NM_SETTING_OVS_PORT_BOND_DOWNDELAY, + "", + "", + 0, + G_MAXUINT, + 0, + G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties); + + _nm_setting_class_commit(setting_class, NM_META_SETTING_TYPE_OVS_PORT); } |