about summary refs log tree commit diff
path: root/libnm-core/nm-setting-adsl.c
diff options
context:
space:
mode:
Diffstat (limited to 'libnm-core/nm-setting-adsl.c')
-rw-r--r--libnm-core/nm-setting-adsl.c557
1 files changed, 282 insertions, 275 deletions
diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index c952353d..f84baf1f 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2011 - 2013 Red Hat, Inc.
  */
@@ -22,29 +22,28 @@
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
-	PROP_USERNAME,
-	PROP_PASSWORD,
-	PROP_PASSWORD_FLAGS,
-	PROP_PROTOCOL,
-	PROP_ENCAPSULATION,
-	PROP_VPI,
-	PROP_VCI,
-);
+NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_USERNAME,
+                                  PROP_PASSWORD,
+                                  PROP_PASSWORD_FLAGS,
+                                  PROP_PROTOCOL,
+                                  PROP_ENCAPSULATION,
+                                  PROP_VPI,
+                                  PROP_VCI, );
 
 typedef struct {
-	char *  username;
-	char *  password;
-	NMSettingSecretFlags password_flags;
-	char *  protocol;
-	char *  encapsulation;
-	guint32 vpi;
-	guint32 vci;
+    char *               username;
+    char *               password;
+    NMSettingSecretFlags password_flags;
+    char *               protocol;
+    char *               encapsulation;
+    guint32              vpi;
+    guint32              vci;
 } NMSettingAdslPrivate;
 
-G_DEFINE_TYPE (NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING)
+G_DEFINE_TYPE(NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING)
 
-#define NM_SETTING_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_ADSL, NMSettingAdslPrivate))
+#define NM_SETTING_ADSL_GET_PRIVATE(o) \
+    (G_TYPE_INSTANCE_GET_PRIVATE((o), NM_TYPE_SETTING_ADSL, NMSettingAdslPrivate))
 
 /*****************************************************************************/
 
@@ -55,11 +54,11 @@ G_DEFINE_TYPE (NMSettingAdsl, nm_setting_adsl, NM_TYPE_SETTING)
  * Returns: the #NMSettingAdsl:username property of the setting
  **/
 const char *
-nm_setting_adsl_get_username (NMSettingAdsl *setting)
+nm_setting_adsl_get_username(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), NULL);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), NULL);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->username;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->username;
 }
 
 /**
@@ -69,11 +68,11 @@ nm_setting_adsl_get_username (NMSettingAdsl *setting)
  * Returns: the #NMSettingAdsl:password property of the setting
  **/
 const char *
-nm_setting_adsl_get_password (NMSettingAdsl *setting)
+nm_setting_adsl_get_password(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), NULL);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), NULL);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->password;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->password;
 }
 
 /**
@@ -83,11 +82,11 @@ nm_setting_adsl_get_password (NMSettingAdsl *setting)
  * Returns: the #NMSettingSecretFlags pertaining to the #NMSettingAdsl:password
  **/
 NMSettingSecretFlags
-nm_setting_adsl_get_password_flags (NMSettingAdsl *setting)
+nm_setting_adsl_get_password_flags(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), NM_SETTING_SECRET_FLAG_NONE);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), NM_SETTING_SECRET_FLAG_NONE);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->password_flags;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->password_flags;
 }
 
 /**
@@ -97,11 +96,11 @@ nm_setting_adsl_get_password_flags (NMSettingAdsl *setting)
  * Returns: the #NMSettingAdsl:protocol property of the setting
  **/
 const char *
-nm_setting_adsl_get_protocol (NMSettingAdsl *setting)
+nm_setting_adsl_get_protocol(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), NULL);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), NULL);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->protocol;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->protocol;
 }
 
 /**
@@ -111,11 +110,11 @@ nm_setting_adsl_get_protocol (NMSettingAdsl *setting)
  * Returns: the #NMSettingAdsl:encapsulation property of the setting
  **/
 const char *
-nm_setting_adsl_get_encapsulation (NMSettingAdsl *setting)
+nm_setting_adsl_get_encapsulation(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), NULL);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), NULL);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->encapsulation;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->encapsulation;
 }
 
 /**
@@ -125,11 +124,11 @@ nm_setting_adsl_get_encapsulation (NMSettingAdsl *setting)
  * Returns: the #NMSettingAdsl:vpi property of the setting
  **/
 guint32
-nm_setting_adsl_get_vpi (NMSettingAdsl *setting)
+nm_setting_adsl_get_vpi(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), 0);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), 0);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->vpi;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->vpi;
 }
 
 /**
@@ -139,171 +138,173 @@ nm_setting_adsl_get_vpi (NMSettingAdsl *setting)
  * Returns: the #NMSettingAdsl:vci property of the setting
  **/
 guint32
-nm_setting_adsl_get_vci (NMSettingAdsl *setting)
+nm_setting_adsl_get_vci(NMSettingAdsl *setting)
 {
-	g_return_val_if_fail (NM_IS_SETTING_ADSL (setting), 0);
+    g_return_val_if_fail(NM_IS_SETTING_ADSL(setting), 0);
 
-	return NM_SETTING_ADSL_GET_PRIVATE (setting)->vci;
+    return NM_SETTING_ADSL_GET_PRIVATE(setting)->vci;
 }
 
 static gboolean
-verify (NMSetting *setting, NMConnection *connection, GError **error)
+verify(NMSetting *setting, NMConnection *connection, GError **error)
 {
-	NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (setting);
-
-	if (!priv->username) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_MISSING_PROPERTY,
-		                     _("property is missing"));
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME);
-		return FALSE;
-	}
-	if (!priv->username[0]) {
-		g_set_error_literal (error,
-		                     NM_CONNECTION_ERROR,
-		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		                     _("property is empty"));
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME);
-		return FALSE;
-	}
-
-	if (!NM_IN_STRSET (priv->protocol, NM_SETTING_ADSL_PROTOCOL_PPPOA,
-	                                   NM_SETTING_ADSL_PROTOCOL_PPPOE,
-	                                   NM_SETTING_ADSL_PROTOCOL_IPOATM)) {
-		g_set_error (error,
-		             NM_CONNECTION_ERROR,
-		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("'%s' is not a valid value for the property"),
-		             priv->protocol ?: "(null)");
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PROTOCOL);
-		return FALSE;
-	}
-
-	if (!NM_IN_STRSET (priv->encapsulation, NULL,
-	                                        NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
-	                                        NM_SETTING_ADSL_ENCAPSULATION_LLC)) {
-		g_set_error (error,
-		             NM_CONNECTION_ERROR,
-		             NM_CONNECTION_ERROR_INVALID_PROPERTY,
-		             _("'%s' is not a valid value for the property"),
-		             priv->encapsulation);
-		g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_ENCAPSULATION);
-		return FALSE;
-	}
-
-	return TRUE;
+    NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE(setting);
+
+    if (!priv->username) {
+        g_set_error_literal(error,
+                            NM_CONNECTION_ERROR,
+                            NM_CONNECTION_ERROR_MISSING_PROPERTY,
+                            _("property is missing"));
+        g_prefix_error(error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME);
+        return FALSE;
+    }
+    if (!priv->username[0]) {
+        g_set_error_literal(error,
+                            NM_CONNECTION_ERROR,
+                            NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                            _("property is empty"));
+        g_prefix_error(error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_USERNAME);
+        return FALSE;
+    }
+
+    if (!NM_IN_STRSET(priv->protocol,
+                      NM_SETTING_ADSL_PROTOCOL_PPPOA,
+                      NM_SETTING_ADSL_PROTOCOL_PPPOE,
+                      NM_SETTING_ADSL_PROTOCOL_IPOATM)) {
+        g_set_error(error,
+                    NM_CONNECTION_ERROR,
+                    NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                    _("'%s' is not a valid value for the property"),
+                    priv->protocol ?: "(null)");
+        g_prefix_error(error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PROTOCOL);
+        return FALSE;
+    }
+
+    if (!NM_IN_STRSET(priv->encapsulation,
+                      NULL,
+                      NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
+                      NM_SETTING_ADSL_ENCAPSULATION_LLC)) {
+        g_set_error(error,
+                    NM_CONNECTION_ERROR,
+                    NM_CONNECTION_ERROR_INVALID_PROPERTY,
+                    _("'%s' is not a valid value for the property"),
+                    priv->encapsulation);
+        g_prefix_error(error,
+                       "%s.%s: ",
+                       NM_SETTING_ADSL_SETTING_NAME,
+                       NM_SETTING_ADSL_ENCAPSULATION);
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 static gboolean
-verify_secrets (NMSetting *setting, NMConnection *connection, GError **error)
+verify_secrets(NMSetting *setting, NMConnection *connection, GError **error)
 {
-	return _nm_setting_verify_secret_string (NM_SETTING_ADSL_GET_PRIVATE (setting)->password,
-	                                         NM_SETTING_ADSL_SETTING_NAME,
-	                                         NM_SETTING_ADSL_PASSWORD,
-	                                         error);
+    return _nm_setting_verify_secret_string(NM_SETTING_ADSL_GET_PRIVATE(setting)->password,
+                                            NM_SETTING_ADSL_SETTING_NAME,
+                                            NM_SETTING_ADSL_PASSWORD,
+                                            error);
 }
 
 static GPtrArray *
-need_secrets (NMSetting *setting)
+need_secrets(NMSetting *setting)
 {
-	NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (setting);
-	GPtrArray *secrets = NULL;
+    NMSettingAdslPrivate *priv    = NM_SETTING_ADSL_GET_PRIVATE(setting);
+    GPtrArray *           secrets = NULL;
 
-	if (priv->password && *priv->password)
-		return NULL;
+    if (priv->password && *priv->password)
+        return NULL;
 
-	if (!(priv->password_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) {
-		secrets = g_ptr_array_sized_new (1);
-		g_ptr_array_add (secrets, NM_SETTING_ADSL_PASSWORD);
-	}
+    if (!(priv->password_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)) {
+        secrets = g_ptr_array_sized_new(1);
+        g_ptr_array_add(secrets, NM_SETTING_ADSL_PASSWORD);
+    }
 
-	return secrets;
+    return secrets;
 }
 
 /*****************************************************************************/
 
 static void
-get_property (GObject *object, guint prop_id,
-              GValue *value, GParamSpec *pspec)
+get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	NMSettingAdsl *setting = NM_SETTING_ADSL (object);
-
-	switch (prop_id) {
-	case PROP_USERNAME:
-		g_value_set_string (value, nm_setting_adsl_get_username (setting));
-		break;
-	case PROP_PASSWORD:
-		g_value_set_string (value, nm_setting_adsl_get_password (setting));
-		break;
-	case PROP_PASSWORD_FLAGS:
-		g_value_set_flags (value, nm_setting_adsl_get_password_flags (setting));
-		break;
-	case PROP_PROTOCOL:
-		g_value_set_string (value, nm_setting_adsl_get_protocol (setting));
-		break;
-	case PROP_ENCAPSULATION:
-		g_value_set_string (value, nm_setting_adsl_get_encapsulation (setting));
-		break;
-	case PROP_VPI:
-		g_value_set_uint (value, nm_setting_adsl_get_vpi (setting));
-		break;
-	case PROP_VCI:
-		g_value_set_uint (value, nm_setting_adsl_get_vci (setting));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMSettingAdsl *setting = NM_SETTING_ADSL(object);
+
+    switch (prop_id) {
+    case PROP_USERNAME:
+        g_value_set_string(value, nm_setting_adsl_get_username(setting));
+        break;
+    case PROP_PASSWORD:
+        g_value_set_string(value, nm_setting_adsl_get_password(setting));
+        break;
+    case PROP_PASSWORD_FLAGS:
+        g_value_set_flags(value, nm_setting_adsl_get_password_flags(setting));
+        break;
+    case PROP_PROTOCOL:
+        g_value_set_string(value, nm_setting_adsl_get_protocol(setting));
+        break;
+    case PROP_ENCAPSULATION:
+        g_value_set_string(value, nm_setting_adsl_get_encapsulation(setting));
+        break;
+    case PROP_VPI:
+        g_value_set_uint(value, nm_setting_adsl_get_vpi(setting));
+        break;
+    case PROP_VCI:
+        g_value_set_uint(value, nm_setting_adsl_get_vci(setting));
+        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)
 {
-	NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
-	const char *str;
-
-	switch (prop_id) {
-	case PROP_USERNAME:
-		g_free (priv->username);
-		priv->username = g_value_dup_string (value);
-		break;
-	case PROP_PASSWORD:
-		g_free (priv->password);
-		priv->password = g_value_dup_string (value);
-		break;
-	case PROP_PASSWORD_FLAGS:
-		priv->password_flags = g_value_get_flags (value);
-		break;
-	case PROP_PROTOCOL:
-		g_free (priv->protocol);
-		str = g_value_get_string (value);
-		priv->protocol = str ? g_ascii_strdown (str, -1) : NULL;
-		break;
-	case PROP_ENCAPSULATION:
-		g_free (priv->encapsulation);
-		str = g_value_get_string (value);
-		priv->encapsulation = str ? g_ascii_strdown (str, -1) : NULL;
-		break;
-	case PROP_VPI:
-		priv->vpi = g_value_get_uint (value);
-		break;
-	case PROP_VCI:
-		priv->vci = g_value_get_uint (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+    NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE(object);
+    const char *          str;
+
+    switch (prop_id) {
+    case PROP_USERNAME:
+        g_free(priv->username);
+        priv->username = g_value_dup_string(value);
+        break;
+    case PROP_PASSWORD:
+        g_free(priv->password);
+        priv->password = g_value_dup_string(value);
+        break;
+    case PROP_PASSWORD_FLAGS:
+        priv->password_flags = g_value_get_flags(value);
+        break;
+    case PROP_PROTOCOL:
+        g_free(priv->protocol);
+        str            = g_value_get_string(value);
+        priv->protocol = str ? g_ascii_strdown(str, -1) : NULL;
+        break;
+    case PROP_ENCAPSULATION:
+        g_free(priv->encapsulation);
+        str                 = g_value_get_string(value);
+        priv->encapsulation = str ? g_ascii_strdown(str, -1) : NULL;
+        break;
+    case PROP_VPI:
+        priv->vpi = g_value_get_uint(value);
+        break;
+    case PROP_VCI:
+        priv->vci = g_value_get_uint(value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        break;
+    }
 }
 
 /*****************************************************************************/
 
 static void
-nm_setting_adsl_init (NMSettingAdsl *setting)
-{
-}
+nm_setting_adsl_init(NMSettingAdsl *setting)
+{}
 
 /**
  * nm_setting_adsl_new:
@@ -313,120 +314,126 @@ nm_setting_adsl_init (NMSettingAdsl *setting)
  * Returns: the new empty #NMSettingAdsl object
  **/
 NMSetting *
-nm_setting_adsl_new (void)
+nm_setting_adsl_new(void)
 {
-	return (NMSetting *) g_object_new (NM_TYPE_SETTING_ADSL, NULL);
+    return (NMSetting *) g_object_new(NM_TYPE_SETTING_ADSL, NULL);
 }
 
 static void
-finalize (GObject *object)
+finalize(GObject *object)
 {
-	NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object);
+    NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE(object);
 
-	g_free (priv->username);
-	g_free (priv->password);
-	g_free (priv->protocol);
-	g_free (priv->encapsulation);
+    g_free(priv->username);
+    g_free(priv->password);
+    g_free(priv->protocol);
+    g_free(priv->encapsulation);
 
-	G_OBJECT_CLASS (nm_setting_adsl_parent_class)->finalize (object);
+    G_OBJECT_CLASS(nm_setting_adsl_parent_class)->finalize(object);
 }
 
 static void
-nm_setting_adsl_class_init (NMSettingAdslClass *klass)
+nm_setting_adsl_class_init(NMSettingAdslClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	NMSettingClass *setting_class = NM_SETTING_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (NMSettingAdslPrivate));
-
-	object_class->get_property = get_property;
-	object_class->set_property = set_property;
-	object_class->finalize     = finalize;
-
-	setting_class->verify         = verify;
-	setting_class->verify_secrets = verify_secrets;
-	setting_class->need_secrets   = need_secrets;
-
-	/**
-	 * NMSettingAdsl:username:
-	 *
-	 * Username used to authenticate with the ADSL service.
-	 **/
-	obj_properties[PROP_USERNAME] =
-	    g_param_spec_string (NM_SETTING_ADSL_USERNAME, "", "",
-	                         NULL,
-	                         G_PARAM_READWRITE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingAdsl:password:
-	 *
-	 * Password used to authenticate with the ADSL service.
-	 **/
-	obj_properties[PROP_PASSWORD] =
-	    g_param_spec_string (NM_SETTING_ADSL_PASSWORD, "", "",
-	                         NULL,
-	                         G_PARAM_READWRITE |
-	                         NM_SETTING_PARAM_SECRET |
-	                         G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingAdsl:password-flags:
-	 *
-	 * Flags indicating how to handle the #NMSettingAdsl:password property.
-	 **/
-	obj_properties[PROP_PASSWORD_FLAGS] =
-	    g_param_spec_flags (NM_SETTING_ADSL_PASSWORD_FLAGS, "", "",
-	                        NM_TYPE_SETTING_SECRET_FLAGS,
-	                        NM_SETTING_SECRET_FLAG_NONE,
-	                        G_PARAM_READWRITE |
-	                        G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingAdsl:protocol:
-	 *
-	 * ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
-	 **/
-	obj_properties[PROP_PROTOCOL] =
-	    g_param_spec_string (NM_SETTING_ADSL_PROTOCOL, "", "",
-	                         NULL,
-	                         G_PARAM_READWRITE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingAdsl:encapsulation:
-	 *
-	 * Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
-	 **/
-	obj_properties[PROP_ENCAPSULATION] =
-	    g_param_spec_string (NM_SETTING_ADSL_ENCAPSULATION, "", "",
-	                         NULL,
-	                         G_PARAM_READWRITE |
-	                         G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingAdsl:vpi:
-	 *
-	 * VPI of ADSL connection
-	 **/
-	obj_properties[PROP_VPI] =
-	    g_param_spec_uint (NM_SETTING_ADSL_VPI, "", "",
-	                       0, 65536, 0,
-	                       G_PARAM_READWRITE |
-	                       G_PARAM_STATIC_STRINGS);
-
-	/**
-	 * NMSettingAdsl:vci:
-	 *
-	 * VCI of ADSL connection
-	 **/
-	obj_properties[PROP_VCI] =
-	    g_param_spec_uint (NM_SETTING_ADSL_VCI, "", "",
-	                       0, 65536, 0,
-	                       G_PARAM_READWRITE |
-	                       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_ADSL);
+    GObjectClass *  object_class  = G_OBJECT_CLASS(klass);
+    NMSettingClass *setting_class = NM_SETTING_CLASS(klass);
+
+    g_type_class_add_private(klass, sizeof(NMSettingAdslPrivate));
+
+    object_class->get_property = get_property;
+    object_class->set_property = set_property;
+    object_class->finalize     = finalize;
+
+    setting_class->verify         = verify;
+    setting_class->verify_secrets = verify_secrets;
+    setting_class->need_secrets   = need_secrets;
+
+    /**
+     * NMSettingAdsl:username:
+     *
+     * Username used to authenticate with the ADSL service.
+     **/
+    obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_ADSL_USERNAME,
+                                                        "",
+                                                        "",
+                                                        NULL,
+                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingAdsl:password:
+     *
+     * Password used to authenticate with the ADSL service.
+     **/
+    obj_properties[PROP_PASSWORD] =
+        g_param_spec_string(NM_SETTING_ADSL_PASSWORD,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingAdsl:password-flags:
+     *
+     * Flags indicating how to handle the #NMSettingAdsl:password property.
+     **/
+    obj_properties[PROP_PASSWORD_FLAGS] =
+        g_param_spec_flags(NM_SETTING_ADSL_PASSWORD_FLAGS,
+                           "",
+                           "",
+                           NM_TYPE_SETTING_SECRET_FLAGS,
+                           NM_SETTING_SECRET_FLAG_NONE,
+                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingAdsl:protocol:
+     *
+     * ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".
+     **/
+    obj_properties[PROP_PROTOCOL] = g_param_spec_string(NM_SETTING_ADSL_PROTOCOL,
+                                                        "",
+                                                        "",
+                                                        NULL,
+                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingAdsl:encapsulation:
+     *
+     * Encapsulation of ADSL connection.  Can be "vcmux" or "llc".
+     **/
+    obj_properties[PROP_ENCAPSULATION] =
+        g_param_spec_string(NM_SETTING_ADSL_ENCAPSULATION,
+                            "",
+                            "",
+                            NULL,
+                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingAdsl:vpi:
+     *
+     * VPI of ADSL connection
+     **/
+    obj_properties[PROP_VPI] = g_param_spec_uint(NM_SETTING_ADSL_VPI,
+                                                 "",
+                                                 "",
+                                                 0,
+                                                 65536,
+                                                 0,
+                                                 G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+    /**
+     * NMSettingAdsl:vci:
+     *
+     * VCI of ADSL connection
+     **/
+    obj_properties[PROP_VCI] = g_param_spec_uint(NM_SETTING_ADSL_VCI,
+                                                 "",
+                                                 "",
+                                                 0,
+                                                 65536,
+                                                 0,
+                                                 G_PARAM_READWRITE | 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_ADSL);
 }