diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 627c3e3492..d0bf73adcf 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -17,6 +17,7 @@ libnm_util_include_HEADERS = \ nm-setting-bluetooth.h \ nm-setting-bond.h \ nm-setting-connection.h \ + nm-setting-infiniband.h \ nm-setting-ip4-config.h \ nm-setting-ip6-config.h \ nm-setting-ppp.h \ @@ -47,6 +48,7 @@ libnm_util_la_csources = \ nm-setting-bluetooth.c \ nm-setting-bond.c \ nm-setting-connection.c \ + nm-setting-infiniband.c \ nm-setting-ip4-config.c \ nm-setting-ip6-config.c \ nm-setting-ppp.c \ diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index 674f1b5381..f3c0eb22ed 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -21,6 +21,7 @@ global: nm_connection_get_setting_cdma; nm_connection_get_setting_connection; nm_connection_get_setting_gsm; + nm_connection_get_setting_infiniband; nm_connection_get_setting_ip4_config; nm_connection_get_setting_ip6_config; nm_connection_get_setting_olpc_mesh; @@ -234,6 +235,12 @@ global: nm_setting_gsm_get_type; nm_setting_gsm_get_username; nm_setting_gsm_new; + nm_setting_infiniband_error_get_type; + nm_setting_infiniband_error_quark; + nm_setting_infiniband_get_mac_address; + nm_setting_infiniband_get_mtu; + nm_setting_infiniband_get_type; + nm_setting_infiniband_new; nm_setting_ip4_config_add_address; nm_setting_ip4_config_add_dns; nm_setting_ip4_config_add_dns_search; diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index de6e94879f..a7e6a23ded 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -34,6 +34,7 @@ #include "nm-setting-8021x.h" #include "nm-setting-bluetooth.h" #include "nm-setting-connection.h" +#include "nm-setting-infiniband.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" #include "nm-setting-ppp.h" @@ -136,7 +137,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static GHashTable *registered_settings = NULL; -#define DEFAULT_MAP_SIZE 17 +#define DEFAULT_MAP_SIZE 18 static struct SettingInfo { const char *name; @@ -248,6 +249,11 @@ register_default_settings (void) NM_SETTING_BOND_ERROR, 1, TRUE); + register_one_setting (NM_SETTING_INFINIBAND_SETTING_NAME, + NM_TYPE_SETTING_INFINIBAND, + NM_SETTING_INFINIBAND_ERROR, + 1, TRUE); + register_one_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_ERROR, @@ -1412,6 +1418,23 @@ nm_connection_get_setting_gsm (NMConnection *connection) return (NMSettingGsm *) nm_connection_get_setting (connection, NM_TYPE_SETTING_GSM); } +/** + * nm_connection_get_setting_infiniband: + * @connection: the #NMConnection + * + * A shortcut to return any #NMSettingInfiniband the connection might contain. + * + * Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise NULL + **/ +NMSettingInfiniband * +nm_connection_get_setting_infiniband (NMConnection *connection) +{ + g_return_val_if_fail (connection != NULL, NULL); + g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); + + return (NMSettingInfiniband *) nm_connection_get_setting (connection, NM_TYPE_SETTING_INFINIBAND); +} + /** * nm_connection_get_setting_ip4_config: * @connection: the #NMConnection diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index 60141384bb..0f3651a94f 100644 --- a/libnm-util/nm-connection.h +++ b/libnm-util/nm-connection.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -188,6 +189,7 @@ NMSettingBond * nm_connection_get_setting_bond (NMConnec NMSettingCdma * nm_connection_get_setting_cdma (NMConnection *connection); NMSettingConnection * nm_connection_get_setting_connection (NMConnection *connection); NMSettingGsm * nm_connection_get_setting_gsm (NMConnection *connection); +NMSettingInfiniband * nm_connection_get_setting_infiniband (NMConnection *connection); NMSettingIP4Config * nm_connection_get_setting_ip4_config (NMConnection *connection); NMSettingIP6Config * nm_connection_get_setting_ip6_config (NMConnection *connection); NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection); diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c new file mode 100644 index 0000000000..10a20ad482 --- /dev/null +++ b/libnm-util/nm-setting-infiniband.c @@ -0,0 +1,259 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2011 Red Hat, Inc. + */ + +#include +#include + +#include "nm-setting-infiniband.h" +#include "nm-param-spec-specialized.h" +#include "nm-utils-private.h" + +/** + * SECTION:nm-setting-infiniband + * @short_description: Describes connection properties for IP-over-Infiniband networks + * @include: nm-setting-infiniband.h + * + * The #NMSettingInfiniband object is a #NMSetting subclass that describes properties + * necessary for connection to IP-over-Infiniband networks. + **/ + +/** + * nm_setting_infiniband_error_quark: + * + * Registers an error quark for #NMSettingInfiniband if necessary. + * + * Returns: the error quark used for #NMSettingInfiniband errors. + **/ +GQuark +nm_setting_infiniband_error_quark (void) +{ + static GQuark quark; + + if (G_UNLIKELY (!quark)) + quark = g_quark_from_static_string ("nm-setting-infiniband-error-quark"); + return quark; +} + +/* This should really be standard. */ +#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } + +GType +nm_setting_infiniband_error_get_type (void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GEnumValue values[] = { + /* Unknown error. */ + ENUM_ENTRY (NM_SETTING_INFINIBAND_ERROR_UNKNOWN, "UnknownError"), + /* The specified property was invalid. */ + ENUM_ENTRY (NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, "InvalidProperty"), + /* The specified property was missing and is required. */ + ENUM_ENTRY (NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY, "MissingProperty"), + { 0, 0, 0 } + }; + etype = g_enum_register_static ("NMSettingInfinibandError", values); + } + return etype; +} + +G_DEFINE_TYPE (NMSettingInfiniband, nm_setting_infiniband, NM_TYPE_SETTING) + +#define NM_SETTING_INFINIBAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandPrivate)) + +typedef struct { + GByteArray *mac_address; + guint32 mtu; +} NMSettingInfinibandPrivate; + +enum { + PROP_0, + PROP_MAC_ADDRESS, + PROP_MTU, + + LAST_PROP +}; + +/** + * nm_setting_infiniband_new: + * + * Creates a new #NMSettingInfiniband object with default values. + * + * Returns: (transfer full): the new empty #NMSettingInfiniband object + **/ +NMSetting * +nm_setting_infiniband_new (void) +{ + return (NMSetting *) g_object_new (NM_TYPE_SETTING_INFINIBAND, NULL); +} + +/** + * nm_setting_infiniband_get_mac_address: + * @setting: the #NMSettingInfiniband + * + * Returns: the #NMSettingInfiniband:mac-address property of the setting + **/ +const GByteArray * +nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_INFINIBAND (setting), NULL); + + return NM_SETTING_INFINIBAND_GET_PRIVATE (setting)->mac_address; +} + +/** + * nm_setting_infiniband_get_mtu: + * @setting: the #NMSettingInfiniband + * + * Returns: the #NMSettingInfiniband:mtu property of the setting + **/ +guint32 +nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting) +{ + g_return_val_if_fail (NM_IS_SETTING_INFINIBAND (setting), 0); + + return NM_SETTING_INFINIBAND_GET_PRIVATE (setting)->mtu; +} + + +static gboolean +verify (NMSetting *setting, GSList *all_settings, GError **error) +{ + NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (setting); + + if (priv->mac_address && priv->mac_address->len != INFINIBAND_ALEN) { + g_set_error (error, + NM_SETTING_INFINIBAND_ERROR, + NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, + NM_SETTING_INFINIBAND_MAC_ADDRESS); + return FALSE; + } + + return TRUE; +} + +static void +nm_setting_infiniband_init (NMSettingInfiniband *setting) +{ + g_object_set (setting, NM_SETTING_NAME, NM_SETTING_INFINIBAND_SETTING_NAME, NULL); +} + +static void +finalize (GObject *object) +{ + NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (object); + + if (priv->mac_address) + g_byte_array_free (priv->mac_address, TRUE); + + G_OBJECT_CLASS (nm_setting_infiniband_parent_class)->finalize (object); +} + +static void +set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (object); + + switch (prop_id) { + case PROP_MAC_ADDRESS: + if (priv->mac_address) + g_byte_array_free (priv->mac_address, TRUE); + priv->mac_address = g_value_dup_boxed (value); + break; + case PROP_MTU: + priv->mtu = g_value_get_uint (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + NMSettingInfiniband *setting = NM_SETTING_INFINIBAND (object); + + switch (prop_id) { + case PROP_MAC_ADDRESS: + g_value_set_boxed (value, nm_setting_infiniband_get_mac_address (setting)); + break; + case PROP_MTU: + g_value_set_uint (value, nm_setting_infiniband_get_mtu (setting)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (setting_class); + NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class); + + g_type_class_add_private (setting_class, sizeof (NMSettingInfinibandPrivate)); + + /* virtual methods */ + object_class->set_property = set_property; + object_class->get_property = get_property; + object_class->finalize = finalize; + parent_class->verify = verify; + + /* Properties */ + /** + * NMSettingInfiniband:mac-address: + * + * If specified, this connection will only apply to the IPoIB + * device whose permanent MAC address matches. This property does + * not change the MAC address of the device (i.e. MAC spoofing). + **/ + g_object_class_install_property + (object_class, PROP_MAC_ADDRESS, + _nm_param_spec_specialized (NM_SETTING_INFINIBAND_MAC_ADDRESS, + "Device MAC Address", + "If specified, this connection will only apply to " + "the IPoIB device whose permanent MAC address matches. " + "This property does not change the MAC address " + "of the device (i.e. MAC spoofing).", + DBUS_TYPE_G_UCHAR_ARRAY, + G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE)); + + /** + * NMSettingInfiniband:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple frames. + **/ + g_object_class_install_property + (object_class, PROP_MTU, + g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, + "MTU", + "If non-zero, only transmit packets of the specified " + "size or smaller, breaking larger packets up into " + "multiple frames.", + 0, G_MAXUINT32, 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE)); +} + diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h new file mode 100644 index 0000000000..4707cb95f3 --- /dev/null +++ b/libnm-util/nm-setting-infiniband.h @@ -0,0 +1,82 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2011 Red Hat, Inc. + */ + +#ifndef NM_SETTING_INFINIBAND_H +#define NM_SETTING_INFINIBAND_H + +#include + +G_BEGIN_DECLS + +#define NM_TYPE_SETTING_INFINIBAND (nm_setting_infiniband_get_type ()) +#define NM_SETTING_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_INFINIBAND, NMSettingInfiniband)) +#define NM_SETTING_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandClass)) +#define NM_IS_SETTING_INFINIBAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_INFINIBAND)) +#define NM_IS_SETTING_INFINIBAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_INFINIBAND)) +#define NM_SETTING_INFINIBAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_INFINIBAND, NMSettingInfinibandClass)) + +#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband" + +/** + * NMSettingInfinibandError: + * @NM_SETTING_INFINIBAND_ERROR_UNKNOWN: unknown or unclassified error + * @NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: the property was invalid + * @NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: the property was missing and is + * required + */ +typedef enum { + NM_SETTING_INFINIBAND_ERROR_UNKNOWN = 0, + NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, + NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY +} NMSettingInfinibandError; + +#define NM_TYPE_SETTING_INFINIBAND_ERROR (nm_setting_infiniband_error_get_type ()) +GType nm_setting_infiniband_error_get_type (void); + +#define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark () +GQuark nm_setting_infiniband_error_quark (void); + +#define NM_SETTING_INFINIBAND_MAC_ADDRESS "mac-address" +#define NM_SETTING_INFINIBAND_MTU "mtu" + +typedef struct { + NMSetting parent; +} NMSettingInfiniband; + +typedef struct { + NMSettingClass parent; + + /* Padding for future expansion */ + void (*_reserved1) (void); + void (*_reserved2) (void); + void (*_reserved3) (void); + void (*_reserved4) (void); +} NMSettingInfinibandClass; + +GType nm_setting_infiniband_get_type (void); + +NMSetting * nm_setting_infiniband_new (void); +const GByteArray *nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting); +guint32 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting); + +G_END_DECLS + +#endif /* NM_SETTING_INFINIBAND_H */