diff options
Diffstat (limited to 'libnm-core')
70 files changed, 6138 insertions, 6138 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 87c444d04d..0a08244e86 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -281,9 +281,9 @@ validate_permissions_type(GVariant *variant, GError **error) gboolean valid = TRUE; /* Ensure the connection::permissions item (if present) is the correct - * type, otherwise the g_object_set() will throw a warning and ignore the - * error, leaving us with no permissions. - */ + * type, otherwise the g_object_set() will throw a warning and ignore the + * error, leaving us with no permissions. + */ s_con = g_variant_lookup_value(variant, NM_SETTING_CONNECTION_SETTING_NAME, NM_VARIANT_TYPE_SETTING); @@ -414,20 +414,20 @@ _nm_connection_replace_settings(NMConnection * connection, changed = (settings != NULL); /* Note: @settings might be empty in which case the connection - * has no NMSetting instances... which is fine, just something - * to be aware of. */ + * has no NMSetting instances... which is fine, just something + * to be aware of. */ for (s = settings; s; s = s->next) _nm_connection_add_setting(connection, s->data); g_slist_free(settings); /* If verification/normalization fails, the original connection - * is already lost. From an API point of view, it would be nicer - * not to touch the input argument if we fail at the end. - * However, that would require creating a temporary connection - * to validate it first. As none of the caller cares about the - * state of the @connection when normalization fails, just do it - * this way. */ + * is already lost. From an API point of view, it would be nicer + * not to touch the input argument if we fail at the end. + * However, that would require creating a temporary connection + * to validate it first. As none of the caller cares about the + * state of the @connection when normalization fails, just do it + * this way. */ if (NM_FLAGS_HAS(parse_flags, NM_SETTING_PARSE_FLAGS_NORMALIZE)) success = nm_connection_normalize(connection, NULL, NULL, error); else @@ -481,14 +481,14 @@ nm_connection_replace_settings_from_connection(NMConnection *connection, g_return_if_fail(NM_IS_CONNECTION(new_connection)); /* When 'connection' and 'new_connection' are the same object simply return - * in order not to destroy 'connection'. - */ + * in order not to destroy 'connection'. + */ if (connection == new_connection) return; /* No need to validate permissions like nm_connection_replace_settings() - * since we're dealing with an NMConnection which has already done that. - */ + * since we're dealing with an NMConnection which has already done that. + */ priv = NM_CONNECTION_GET_PRIVATE(connection); new_priv = NM_CONNECTION_GET_PRIVATE(new_connection); @@ -759,7 +759,7 @@ _nm_connection_detect_bluetooth_type(NMConnection *self) } /* NULL means the connection is not a bluetooth type, or it needs - * no normalization, as the type is set explicitly. */ + * no normalization, as the type is set explicitly. */ return NULL; } @@ -969,8 +969,8 @@ _normalize_ip_config(NMConnection *self, GHashTable *parameters) } /* If no IP6 setting was specified, then assume that means IP6 config is - * allowed to fail. - */ + * allowed to fail. + */ setting = nm_setting_ip6_config_new(); g_object_set(setting, @@ -1431,12 +1431,12 @@ _nm_connection_verify(NMConnection *connection, GError **error) nm_assert(NM_IS_SETTING_CONNECTION(settings[i]) == (i == 0)); /* verify all settings. We stop if we find the first non-normalizable - * @NM_SETTING_VERIFY_ERROR. If we find normalizable errors we continue - * but remember the error to return it to the user. - * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR has a higher priority then - * @NM_SETTING_VERIFY_NORMALIZABLE, so, if we encounter such an error type, - * we remember it instead (to return it as output). - **/ + * @NM_SETTING_VERIFY_ERROR. If we find normalizable errors we continue + * but remember the error to return it to the user. + * @NM_SETTING_VERIFY_NORMALIZABLE_ERROR has a higher priority then + * @NM_SETTING_VERIFY_NORMALIZABLE, so, if we encounter such an error type, + * we remember it instead (to return it as output). + **/ verify_result = _nm_setting_verify(settings[i], connection, &verify_error); if (verify_result == NM_SETTING_VERIFY_NORMALIZABLE || verify_result == NM_SETTING_VERIFY_NORMALIZABLE_ERROR) { @@ -1475,7 +1475,7 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME); /* having a master without IP config was not a verify() error, accept - * it for backward compatibility. */ + * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } } else { @@ -1500,7 +1500,7 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME); /* having a master without IP config was not a verify() error, accept - * it for backward compatibility. */ + * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } } else { @@ -1525,7 +1525,7 @@ _nm_connection_verify(NMConnection *connection, GError **error) g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_PROXY_SETTING_NAME); /* having a master without proxy config was not a verify() error, accept - * it for backward compatibility. */ + * it for backward compatibility. */ normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE; } } else { @@ -1590,15 +1590,15 @@ _connection_normalize(NMConnection *connection, #if NM_MORE_ASSERTS > 10 /* only call this _nm_connection_verify() confirms that the connection - * requires normalization and is normalizable. */ + * requires normalization and is normalizable. */ nm_assert(NM_IN_SET(_nm_connection_verify(connection, NULL), NM_SETTING_VERIFY_NORMALIZABLE, NM_SETTING_VERIFY_NORMALIZABLE_ERROR)); #endif /* Try to perform all kind of normalizations on the settings to fix it. - * We only do this, after verifying that the connection contains no un-normalizable - * errors, because in that case we rather fail without touching the settings. */ + * We only do this, after verifying that the connection contains no un-normalizable + * errors, because in that case we rather fail without touching the settings. */ was_modified = FALSE; @@ -1633,8 +1633,8 @@ _connection_normalize(NMConnection *connection, if (success != NM_SETTING_VERIFY_SUCCESS) { /* we would expect, that after normalization, the connection can be verified. - * Also treat NM_SETTING_VERIFY_NORMALIZABLE as failure, because there is something - * odd going on. */ + * Also treat NM_SETTING_VERIFY_NORMALIZABLE as failure, because there is something + * odd going on. */ if (error && !*error) { g_set_error_literal(error, NM_CONNECTION_ERROR, @@ -1755,7 +1755,7 @@ _nm_connection_ensure_normalized(NMConnection * connection, if (!allow_modify) { if (!out_connection_clone) { /* even NM_SETTING_VERIFY_NORMALIZABLE is treated as an error. We could normalize, - * but are not allowed to (and no out argument is provided for cloning). */ + * but are not allowed to (and no out argument is provided for cloning). */ g_propagate_error(error, g_steal_pointer(&local)); return FALSE; } @@ -1899,8 +1899,8 @@ nm_connection_update_secrets(NMConnection *connection, setting_dict = g_variant_lookup_value(secrets, setting_name, NM_VARIANT_TYPE_SETTING); if (!setting_dict) { /* The connection dictionary didn't contain any secrets for - * @setting_name; just return success. - */ + * @setting_name; just return success. + */ return TRUE; } } @@ -2133,18 +2133,18 @@ _nm_connection_for_each_secret(NMConnection * self, const char * setting_name; /* This function, given a dict of dicts representing new secrets of - * an NMConnection, walks through each toplevel dict (which represents a - * NMSetting), and for each setting, walks through that setting dict's - * properties. For each property that's a secret, it will check that - * secret's flags in the backing NMConnection object, and call a supplied - * callback. - * - * The one complexity is that the VPN setting's 'secrets' property is - * *also* a dict (since the key/value pairs are arbitrary and known - * only to the VPN plugin itself). That means we have three levels of - * dicts that we potentially have to traverse here. The differences - * are handled by the virtual for_each_secret() function. - */ + * an NMConnection, walks through each toplevel dict (which represents a + * NMSetting), and for each setting, walks through that setting dict's + * properties. For each property that's a secret, it will check that + * secret's flags in the backing NMConnection object, and call a supplied + * callback. + * + * The one complexity is that the VPN setting's 'secrets' property is + * *also* a dict (since the key/value pairs are arbitrary and known + * only to the VPN plugin itself). That means we have three levels of + * dicts that we potentially have to traverse here. The differences + * are handled by the virtual for_each_secret() function. + */ g_return_val_if_fail(callback, NULL); @@ -2520,13 +2520,13 @@ _nm_connection_get_multi_connect(NMConnection *connection) const NMConnectionMultiConnect DEFAULT = NM_CONNECTION_MULTI_CONNECT_SINGLE; /* connection.multi_connect property cannot be specified via regular - * connection defaults in NetworkManager.conf, because those are per-device, - * and we need to determine the multi_connect independent of a particular - * device. - * - * There is however still a default-value, so theoretically, the default - * value could be specified in NetworkManager.conf. Just not as [connection*] - * and indepdented of a device. */ + * connection defaults in NetworkManager.conf, because those are per-device, + * and we need to determine the multi_connect independent of a particular + * device. + * + * There is however still a default-value, so theoretically, the default + * value could be specified in NetworkManager.conf. Just not as [connection*] + * and indepdented of a device. */ s_con = nm_connection_get_setting_connection(connection); if (!s_con) @@ -3333,14 +3333,14 @@ static void nm_connection_default_init(NMConnectionInterface *iface) { /** - * NMConnection::secrets-updated: - * @connection: the object on which the signal is emitted - * @setting_name: the setting name of the #NMSetting for which secrets were - * updated - * - * The ::secrets-updated signal is emitted when the secrets of a setting - * have been changed. - */ + * NMConnection::secrets-updated: + * @connection: the object on which the signal is emitted + * @setting_name: the setting name of the #NMSetting for which secrets were + * updated + * + * The ::secrets-updated signal is emitted when the secrets of a setting + * have been changed. + */ signals[SECRETS_UPDATED] = g_signal_new(NM_CONNECTION_SECRETS_UPDATED, NM_TYPE_CONNECTION, G_SIGNAL_RUN_FIRST, @@ -3353,12 +3353,12 @@ nm_connection_default_init(NMConnectionInterface *iface) G_TYPE_STRING); /** - * NMConnection::secrets-cleared: - * @connection: the object on which the signal is emitted - * - * The ::secrets-cleared signal is emitted when the secrets of a connection - * are cleared. - */ + * NMConnection::secrets-cleared: + * @connection: the object on which the signal is emitted + * + * The ::secrets-cleared signal is emitted when the secrets of a connection + * are cleared. + */ signals[SECRETS_CLEARED] = g_signal_new(NM_CONNECTION_SECRETS_CLEARED, NM_TYPE_CONNECTION, G_SIGNAL_RUN_FIRST, @@ -3370,13 +3370,13 @@ nm_connection_default_init(NMConnectionInterface *iface) 0); /** - * NMConnection::changed: - * @connection: the object on which the signal is emitted - * - * The ::changed signal is emitted when any property of any property - * (including secrets) of any setting of the connection is modified, - * or when settings are added or removed. - */ + * NMConnection::changed: + * @connection: the object on which the signal is emitted + * + * The ::changed signal is emitted when any property of any property + * (including secrets) of any setting of the connection is modified, + * or when settings are added or removed. + */ signals[CHANGED] = g_signal_new(NM_CONNECTION_CHANGED, NM_TYPE_CONNECTION, G_SIGNAL_RUN_FIRST, diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index a8c1a8eabd..7f2de08969 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -248,17 +248,17 @@ GVariant *nm_connection_to_dbus_full(NMConnection * con typedef enum { /* whether the connection has any secrets. - * - * @arg may be %NULL or a pointer to a gboolean for the result. The return - * value of _nm_connection_aggregate() is likewise the boolean result. */ + * + * @arg may be %NULL or a pointer to a gboolean for the result. The return + * value of _nm_connection_aggregate() is likewise the boolean result. */ NM_CONNECTION_AGGREGATE_ANY_SECRETS, /* whether the connection has any secret with flags NM_SETTING_SECRET_FLAG_NONE. - * Note that this only cares about the flags, not whether the secret is actually - * present. - * - * @arg may be %NULL or a pointer to a gboolean for the result. The return - * value of _nm_connection_aggregate() is likewise the boolean result. */ + * Note that this only cares about the flags, not whether the secret is actually + * present. + * + * @arg may be %NULL or a pointer to a gboolean for the result. The return + * value of _nm_connection_aggregate() is likewise the boolean result. */ NM_CONNECTION_AGGREGATE_ANY_SYSTEM_SECRET_FLAGS, } NMConnectionAggregateType; @@ -724,7 +724,7 @@ typedef struct { NMSettInfoPropMissingFromDBusFcn missing_from_dbus_fcn; /* Simpler variants of @to_dbus_fcn/@from_dbus_fcn that operate solely - * on the GValue value of the GObject property. */ + * on the GValue value of the GObject property. */ NMSettInfoPropGPropToDBusFcn gprop_to_dbus_fcn; NMSettInfoPropGPropFromDBusFcn gprop_from_dbus_fcn; } NMSettInfoPropertType; @@ -745,16 +745,16 @@ typedef struct { typedef struct { /* if set, then this setting class has no own fields. Instead, its - * data is entirely based on gendata. Meaning: it tracks all data - * as native GVariants. - * It might have some GObject properties, but these are merely accessors - * to the underlying gendata. - * - * Note, that at the moment there are few hooks, to customize the behavior - * of the setting further. They are currently unneeded. This is desired, - * but could be added when there is a good reason. - * - * However, a few hooks there are... see NMSettInfoSettGendata. */ + * data is entirely based on gendata. Meaning: it tracks all data + * as native GVariants. + * It might have some GObject properties, but these are merely accessors + * to the underlying gendata. + * + * Note, that at the moment there are few hooks, to customize the behavior + * of the setting further. They are currently unneeded. This is desired, + * but could be added when there is a good reason. + * + * However, a few hooks there are... see NMSettInfoSettGendata. */ const NMSettInfoSettGendata *gendata_info; } NMSettInfoSettDetail; @@ -765,15 +765,15 @@ struct _NMSettInfoSetting { const NMSettInfoProperty *property_infos; /* the @property_infos list is sorted by property name. For some uses we need - * a different sort order. If @property_infos_sorted is set, this is the order - * instead. It is used for: - * - * - nm_setting_enumerate_values() - * - keyfile writer adding keys to the group. - * - * Note that currently only NMSettingConnection implements here a sort order - * that differs from alphabetical sort of the property names. - */ + * a different sort order. If @property_infos_sorted is set, this is the order + * instead. It is used for: + * + * - nm_setting_enumerate_values() + * - keyfile writer adding keys to the group. + * + * Note that currently only NMSettingConnection implements here a sort order + * that differs from alphabetical sort of the property names. + */ const NMSettInfoProperty *const *property_infos_sorted; guint property_infos_len; diff --git a/libnm-core/nm-crypto-gnutls.c b/libnm-core/nm-crypto-gnutls.c index a3308f4b79..545cc787e7 100644 --- a/libnm-core/nm-crypto-gnutls.c +++ b/libnm-core/nm-crypto-gnutls.c @@ -150,8 +150,8 @@ _nmtst_crypto_decrypt(NMCryptoCipherType cipher, } /* Validate tail padding; last byte is the padding size, and all pad bytes - * should contain the padding size. - */ + * should contain the padding size. + */ for (pad_i = 1; pad_i <= pad_len; ++pad_i) { if (output.bin[data_len - pad_i] != pad_len) { g_set_error(error, @@ -215,8 +215,8 @@ _nmtst_crypto_encrypt(NMCryptoCipherType cipher, } /* If data_len % ivlen == 0, then we add another complete block - * onto the end so that the decrypter knows there's padding. - */ + * onto the end so that the decrypter knows there's padding. + */ pad_len = iv_len - (data_len % iv_len); padded_buf.len = data_len + pad_len; @@ -386,11 +386,11 @@ _nm_crypto_verify_pkcs8(const guint8 *data, if (err < 0) { if (err == GNUTLS_E_UNKNOWN_CIPHER_TYPE) { /* HACK: gnutls < 3.5.4 doesn't support all the cipher types that openssl - * can use with PKCS#8, so if we encounter one, we have to assume - * the given password works. gnutls needs to unsuckify, apparently. - * Specifically, by default openssl uses pbeWithMD5AndDES-CBC - * which gnutls does not support. - */ + * can use with PKCS#8, so if we encounter one, we have to assume + * the given password works. gnutls needs to unsuckify, apparently. + * Specifically, by default openssl uses pbeWithMD5AndDES-CBC + * which gnutls does not support. + */ } else { g_set_error(error, NM_CRYPTO_ERROR, diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c index 10a7d6e2bc..6b99d548a5 100644 --- a/libnm-core/nm-crypto-nss.c +++ b/libnm-core/nm-crypto-nss.c @@ -223,8 +223,8 @@ _nmtst_crypto_decrypt(NMCryptoCipherType cipher, } /* Validate tail padding; last byte is the padding size, and all pad bytes - * should contain the padding size. - */ + * should contain the padding size. + */ for (i = pad_len; i > 0; i--) { if (output.bin[data_len - i] != pad_len) { g_set_error(error, @@ -329,8 +329,8 @@ _nmtst_crypto_encrypt(NMCryptoCipherType cipher, } /* If data->len % ivlen == 0, then we add another complete block - * onto the end so that the decrypter knows there's padding. - */ + * onto the end so that the decrypter knows there's padding. + */ pad_len = iv_len - (data_len % iv_len); padded_buf.len = data_len + pad_len; @@ -419,8 +419,8 @@ _nm_crypto_verify_pkcs12(const guint8 *data, gsize data_len, const char *passwor return FALSE; /* PKCS#12 passwords are apparently UCS2 BIG ENDIAN, and NSS doesn't do - * any conversions for us. - */ + * any conversions for us. + */ if (password && *password) { nm_auto_clear_secret_ptr NMSecretPtr ucs2_password = {0}; @@ -522,9 +522,9 @@ _nm_crypto_verify_pkcs8(const guint8 *data, return FALSE; /* NSS apparently doesn't do PKCS#8 natively, but you have to put the - * PKCS#8 key into a PKCS#12 file and import that?? So until we figure - * all that out, we can only assume the password is valid. - */ + * PKCS#8 key into a PKCS#12 file and import that?? So until we figure + * all that out, we can only assume the password is valid. + */ return TRUE; } diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c index 6ba7931737..f0282a0e56 100644 --- a/libnm-core/nm-crypto.c +++ b/libnm-core/nm-crypto.c @@ -486,7 +486,7 @@ _nmtst_convert_iv(const char *src, gsize *out_len, GError **error) c = g_malloc(num + 1); /* defensively add trailing NUL. This function returns binary data, - * do not assume it's NUL terminated. */ + * do not assume it's NUL terminated. */ c[num] = '\0'; for (i = 0; i < num; i++) { @@ -1034,11 +1034,11 @@ nmtst_crypto_rsa_key_encrypt(const guint8 *data, return NULL; /* What follows is not the most efficient way to construct the pem - * file line-by-line. At least, it makes sure, that the data will be cleared - * again and not left around in memory. - * - * If this would not be test code, we should improve the implementation - * to avoid some of the copying. */ + * file line-by-line. At least, it makes sure, that the data will be cleared + * again and not left around in memory. + * + * If this would not be test code, we should improve the implementation + * to avoid some of the copying. */ pem = g_ptr_array_new_with_free_func((GDestroyNotify) nm_free_secret); g_ptr_array_add(pem, g_strdup("-----BEGIN RSA PRIVATE KEY-----\n")); diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index d95c7f513d..a5ec13a8cf 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -173,8 +173,8 @@ _nm_dbus_typecheck_response(GVariant *response, const GVariantType *reply_type, return TRUE; /* This is the same error code that g_dbus_connection_call() returns if - * @reply_type doesn't match. - */ + * @reply_type doesn't match. + */ g_set_error(error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, diff --git a/libnm-core/nm-keyfile/nm-keyfile-utils.c b/libnm-core/nm-keyfile/nm-keyfile-utils.c index ad5ce6e807..a27af7eb31 100644 --- a/libnm-core/nm-keyfile/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile/nm-keyfile-utils.c @@ -500,23 +500,23 @@ _keyfile_key_encode(const char *name, char **out_to_free) nm_assert(out_to_free && !*out_to_free); /* See g_key_file_is_key_name(). - * - * GKeyFile allows all UTF-8 characters (even non-well formed sequences), - * except: - * - no empty keys - * - no leading/trailing ' ' - * - no '=', '[', ']' - * - * We do something more strict here. All non-ASCII characters, all non-printable - * characters, and all invalid characters are escaped with "\\XX". - * - * We don't escape \\, unless it is followed by two hex digits. - */ + * + * GKeyFile allows all UTF-8 characters (even non-well formed sequences), + * except: + * - no empty keys + * - no leading/trailing ' ' + * - no '=', '[', ']' + * + * We do something more strict here. All non-ASCII characters, all non-printable + * characters, and all invalid characters are escaped with "\\XX". + * + * We don't escape \\, unless it is followed by two hex digits. + */ if (!name[0]) { /* empty keys are backslash encoded. Note that usually - * \\00 is not a valid encode, the only exception is the empty - * word. */ + * \\00 is not a valid encode, the only exception is the empty + * word. */ return "\\00"; } @@ -646,10 +646,10 @@ nm_keyfile_key_encode(const char *name, char **out_to_free) name2 = _keyfile_key_decode(key, &to_free2); /* name2, the result of encode()+decode() is identical to name. - * That is because - * - encode() is a injective function. - * - decode() is a surjective function, however for output - * values of encode() is behaves injective too. */ + * That is because + * - encode() is a injective function. + * - decode() is a surjective function, however for output + * values of encode() is behaves injective too. */ nm_assert(nm_streq0(name2, name)); } #endif @@ -671,10 +671,10 @@ nm_keyfile_key_decode(const char *key, char **out_to_free) key2 = _keyfile_key_encode(name, &to_free2); /* key2, the result of decode+encode may not be identical - * to the original key. That is, decode() is a surjective - * function mapping different keys to the same name. - * However, decode() behaves injective for input that - * are valid output of encode(). */ + * to the original key. That is, decode() is a surjective + * function mapping different keys to the same name. + * However, decode() behaves injective for input that + * are valid output of encode(). */ nm_assert(key2); } #endif diff --git a/libnm-core/nm-keyfile/nm-keyfile.c b/libnm-core/nm-keyfile/nm-keyfile.c index 9117da1175..45059ce3ff 100644 --- a/libnm-core/nm-keyfile/nm-keyfile.c +++ b/libnm-core/nm-keyfile/nm-keyfile.c @@ -328,13 +328,13 @@ build_route(KeyfileReaderInfo *info, if (gateway_str && gateway_str[0]) { if (!nm_utils_ipaddr_is_valid(family, gateway_str)) { /* Try workaround for routes written by broken keyfile writer. - * Due to bug bgo#719851, an older version of writer would have - * written "a:b:c:d::/plen,metric" if the gateway was ::, instead - * of "a:b:c:d::/plen,,metric" or "a:b:c:d::/plen,::,metric" - * Try workaround by interpreting gateway_str as metric to accept such - * invalid routes. This broken syntax should not be not officially - * supported. - **/ + * Due to bug bgo#719851, an older version of writer would have + * written "a:b:c:d::/plen,metric" if the gateway was ::, instead + * of "a:b:c:d::/plen,,metric" or "a:b:c:d::/plen,::,metric" + * Try workaround by interpreting gateway_str as metric to accept such + * invalid routes. This broken syntax should not be not officially + * supported. + **/ if (family == AF_INET6 && !metric_str && get_one_int(NULL, NULL, NULL, gateway_str, G_MAXUINT32, &u32)) { metric = u32; @@ -448,10 +448,10 @@ openconnect_fix_secret_flags(NMSetting *setting) NMSettingSecretFlags flags; /* Huge hack. There were some openconnect changes that needed to happen - * pretty late, too late to get into distros. Migration has already - * happened for many people, and their secret flags are wrong. But we - * don't want to require re-migration, so we have to fix it up here. Ugh. - */ + * pretty late, too late to get into distros. Migration has already + * happened for many people, and their secret flags are wrong. But we + * don't want to require re-migration, so we have to fix it up here. Ugh. + */ if (!NM_IS_SETTING_VPN(setting)) return; @@ -728,9 +728,9 @@ static gboolean _build_list_data_is_shadowed(const BuildListData *build_list, gsize build_list_len, gsize idx) { /* the keyfile contains duplicate keys, which are both returned - * by g_key_file_get_keys() (WHY??). - * - * Skip the earlier one. */ + * by g_key_file_get_keys() (WHY??). + * + * Skip the earlier one. */ return idx + 1 < build_list_len && build_list[idx].key_idx == build_list[idx + 1].key_idx && build_list[idx].key_type == build_list[idx + 1].key_type && nm_streq(build_list[idx].s_key, build_list[idx + 1].s_key); @@ -758,7 +758,7 @@ _build_list_match_key_w_name_impl(const char *key, } /* if base_name is followed by a zero, then it must be - * only a zero, nothing else. */ + * only a zero, nothing else. */ if (key[0] == '0') { if (key[1] != '\0') return FALSE; @@ -1232,20 +1232,20 @@ get_bytes(KeyfileReaderInfo *info, GBytes * result; /* New format: just a string - * Old format: integer list; e.g. 11;25;38; - */ + * Old format: integer list; e.g. 11;25;38; + */ tmp_string = nm_keyfile_plugin_kf_get_string(info->keyfile, setting_name, key, NULL); if (!tmp_string) return NULL; /* if the string is empty, we return an empty GBytes array. - * Note that for NM_SETTING_802_1X_PASSWORD_RAW both %NULL and - * an empty GBytes are valid, and shall be destinguished. */ + * Note that for NM_SETTING_802_1X_PASSWORD_RAW both %NULL and + * an empty GBytes are valid, and shall be destinguished. */ if (!tmp_string[0]) { /* note that even if @zero_terminate is TRUE, we return an empty - * byte-array. The reason is that zero_terminate is there to terminate - * *valid* strings. It's not there to terminated invalid (empty) strings. - */ + * byte-array. The reason is that zero_terminate is there to terminate + * *valid* strings. It's not there to terminated invalid (empty) strings. + */ return g_bytes_new_static("", 0); } @@ -1314,20 +1314,20 @@ get_bytes(KeyfileReaderInfo *info, #undef DIGIT /* Old format; list of ints. We already did a strict validation of the - * string format before. We expect that this conversion cannot fail. */ + * string format before. We expect that this conversion cannot fail. */ if (d > 0) { /* note that @zero_terminate does not add a terminating '\0' to - * binary data as an integer list. If the bytes are expressed as - * an integer list, all potential NUL characters are supposed to - * be included there explicitly. - * - * However, in the spirit of defensive programming, we do append a - * NUL character to the buffer, although this character is hidden - * and only a mitigation for bugs. */ + * binary data as an integer list. If the bytes are expressed as + * an integer list, all potential NUL characters are supposed to + * be included there explicitly. + * + * However, in the spirit of defensive programming, we do append a + * NUL character to the buffer, although this character is hidden + * and only a mitigation for bugs. */ if (d + 10 < bin->len) { /* hm, too much unused memory. Copy the memory to a suitable - * sized buffer. */ + * sized buffer. */ return nm_secret_copy_to_gbytes(bin->bin, d); } @@ -1447,7 +1447,7 @@ nm_keyfile_detect_unqualified_path_scheme(const char * base_dir, /* If there's a trailing zero tell g_utf8_validate() to validate until the zero */ if (data[data_len - 1] == '\0') { /* setting it to -1, would mean we accept data to contain NUL characters before the - * end. Don't accept any NUL in [0 .. data_len-1[ . */ + * end. Don't accept any NUL in [0 .. data_len-1[ . */ validate_len = data_len - 1; } else validate_len = data_len; @@ -1455,14 +1455,14 @@ nm_keyfile_detect_unqualified_path_scheme(const char * base_dir, return NULL; /* Might be a bare path without the file:// prefix; in that case - * if it's an absolute path, use that, otherwise treat it as a - * relative path to the current directory. - */ + * if it's an absolute path, use that, otherwise treat it as a + * relative path to the current directory. + */ path = get_cert_path(base_dir, (const guint8 *) data, data_len); /* FIXME(keyfile-parse-in-memory): it is wrong that keyfile reader makes decisions based on - * the file systems content. The serialization/parsing should be entirely in-memory. */ + * the file systems content. The serialization/parsing should be entirely in-memory. */ if (!memchr(data, '/', data_len) && !has_cert_ext(path)) { if (!consider_exists) return NULL; @@ -1473,10 +1473,10 @@ nm_keyfile_detect_unqualified_path_scheme(const char * base_dir, exists = g_file_test(path, G_FILE_TEST_EXISTS); /* Construct the proper value as required for the PATH scheme. - * - * When returning TRUE, we must also be sure that @data_len does not look like - * the deprecated format of list of integers. With this implementation that is the - * case, as long as @consider_exists is FALSE. */ + * + * When returning TRUE, we must also be sure that @data_len does not look like + * the deprecated format of list of integers. With this implementation that is the + * case, as long as @consider_exists is FALSE. */ path_len = strlen(path); pathuri_len = (NM_STRLEN(NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) + 1) + path_len; pathuri = g_new(char, pathuri_len); @@ -1542,7 +1542,7 @@ cert_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) if (path2[0] != '/') { /* we want to read absolute paths because we use keyfile as exchange - * between different processes which might not have the same cwd. */ + * between different processes which might not have the same cwd. */ path2_free = get_cert_path(info->base_dir, (const guint8 *) path2, bin_len - NM_STRLEN(NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) - 1); @@ -1550,9 +1550,9 @@ cert_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) } /* FIXME(keyfile-parse-in-memory): keyfile reader must not access the file system and - * (in a first step) only operate in memory-only. If the presence of files should be checked, - * then by invoking a callback (and possibly keyfile settings plugin would - * collect the file names to be checked and check them later). */ + * (in a first step) only operate in memory-only. If the presence of files should be checked, + * then by invoking a callback (and possibly keyfile settings plugin would + * collect the file names to be checked and check them later). */ if (!g_file_test(path2, G_FILE_TEST_EXISTS)) { handle_warn(info, key, @@ -1590,7 +1590,7 @@ cert_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) gs_unref_bytes GBytes *val = NULL; /* Let's be strict here. We expect valid base64, no funny stuff!! - * We didn't write such invalid data ourselfes and refuse to read it as blob. */ + * We didn't write such invalid data ourselfes and refuse to read it as blob. */ if ((valid_base64 = (cdata_len % 4 == 0))) { for (i = 0; i < cdata_len; i++) { char c = cdata[i]; @@ -1624,8 +1624,8 @@ cert_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) if (nm_setting_802_1x_check_cert_scheme(bin_decoded, bin_decoded_len, NULL) != NM_SETTING_802_1X_CK_SCHEME_BLOB) { /* The blob probably starts with "file://". Setting the cert data will confuse NMSetting8021x. - * In fact this is a limitation of NMSetting8021x which does not support setting blobs that start - * with file://. Just warn and return TRUE to signal that we ~handled~ the setting. */ + * In fact this is a limitation of NMSetting8021x which does not support setting blobs that start + * with file://. Just warn and return TRUE to signal that we ~handled~ the setting. */ handle_warn(info, key, key, @@ -1664,9 +1664,9 @@ cert_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) if (nm_setting_802_1x_check_cert_scheme(bin, bin_len, NULL) != NM_SETTING_802_1X_CK_SCHEME_BLOB) { /* The blob probably starts with "file://" but contains invalid characters for a path. - * Setting the cert data will confuse NMSetting8021x. - * In fact, NMSetting8021x does not support setting such binary data, so just warn and - * continue. */ + * Setting the cert data will confuse NMSetting8021x. + * In fact, NMSetting8021x does not support setting such binary data, so just warn and + * continue. */ handle_warn(info, key, key, @@ -1693,17 +1693,17 @@ _parity_from_char(int ch) check = 1; /* In older versions, parity was G_TYPE_CHAR/gint8, and the character - * value was stored as integer. - * For example parity=69 equals parity=E, meaning NM_SETTING_SERIAL_PARITY_EVEN. - * - * That means, certain values are reserved. Assert that these numbers - * are not reused when we extend NMSettingSerialParity enum. - * Actually, since NM_SETTING_SERIAL_PARITY is g_param_spec_enum(), - * we anyway cannot extend the enum without breaking API... - * - * [1] commit "a91e60902e libnm-core: make NMSettingSerial:parity an enum" - * [2] https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=a91e60902eabae1de93d61323dae6ac894b5d40f - */ + * value was stored as integer. + * For example parity=69 equals parity=E, meaning NM_SETTING_SERIAL_PARITY_EVEN. + * + * That means, certain values are reserved. Assert that these numbers + * are not reused when we extend NMSettingSerialParity enum. + * Actually, since NM_SETTING_SERIAL_PARITY is g_param_spec_enum(), + * we anyway cannot extend the enum without breaking API... + * + * [1] commit "a91e60902e libnm-core: make NMSettingSerial:parity an enum" + * [2] https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=a91e60902eabae1de93d61323dae6ac894b5d40f + */ g_assert(G_IS_ENUM_CLASS(klass)); for (i = 0; i < klass->n_values; i++) { const GEnumValue *v = &klass->values[i]; @@ -1741,9 +1741,9 @@ parity_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) gint64 i64; /* Keyfile traditionally stored this as the ASCII value for 'E', 'o', or 'n'. - * We now accept either that or the (case-insensitive) character itself (but - * still always write it the old way, for backward compatibility). - */ + * We now accept either that or the (case-insensitive) character itself (but + * still always write it the old way, for backward compatibility). + */ tmp_str = nm_keyfile_plugin_kf_get_value(info->keyfile, setting_name, key, &err); if (err) goto out_err; @@ -1759,8 +1759,8 @@ parity_parser(KeyfileReaderInfo *info, NMSetting *setting, const char *key) if (i64 != G_MININT64 && errno == 0) { if ((parity = _parity_from_char(i64)) >= 0) { /* another oddity: the string is a valid number. However, if the numeric values - * is one of the supported ASCII codes, accept it (like 69 for 'E'). - */ + * is one of the supported ASCII codes, accept it (like 69 for 'E'). + */ goto parity_good; } @@ -2102,10 +2102,10 @@ write_ip_values(GKeyFile * file, nm_str_buf_append_printf(&output, "%s/%u", addr, plen); if (metric != -1 || gw) { /* Older versions of the plugin do not support the form - * "a.b.c.d/plen,,metric", so, we always have to write the - * gateway, even if there isn't one. - * The current version supports reading of the above form. - */ + * "a.b.c.d/plen,,metric", so, we always have to write the + * gateway, even if there isn't one. + * The current version supports reading of the above form. + */ if (!gw) { if (addr_family == AF_INET) gw = "0.0.0.0"; @@ -2370,9 +2370,9 @@ write_hash_of_string(GKeyFile *file, NMSetting *setting, const char *key, const property = keys[i]; /* Handle VPN secrets specially; they are nested in the property's hash; - * we don't want to write them if the secret is not saved, not required, - * or owned by a user's secret agent. - */ + * we don't want to write them if the secret is not saved, not required, + * or owned by a user's secret agent. + */ if (vpn_secrets) { NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -2413,8 +2413,8 @@ ssid_writer(KeyfileWriterInfo *info, NMSetting *setting, const char *key, const } /* Check whether each byte is printable. If not, we have to use an - * integer list, otherwise we can just use a string. - */ + * integer list, otherwise we can just use a string. + */ for (i = 0; i < ssid_len; i++) { const char c = ssid_data[i]; @@ -2433,7 +2433,7 @@ ssid_writer(KeyfileWriterInfo *info, NMSetting *setting, const char *key, const ssid = g_strndup((char *) ssid_data, ssid_len); else { /* Escape semicolons with backslashes to make strings - * containing ';', such as '16;17;' unambiguous */ + * containing ';', such as '16;17;' unambiguous */ gsize j = 0; ssid = g_malloc(ssid_len + semicolons + 1); @@ -2497,8 +2497,8 @@ cert_writer_default(NMConnection * connection, g_assert(path); /* If the path is relative, make it an absolute path. - * Relative paths make a keyfile not easily usable in another - * context. */ + * Relative paths make a keyfile not easily usable in another + * context. */ if (path[0] && path[0] != '/') { base_dir = g_get_current_dir(); path_free = g_strconcat(base_dir, "/", path, NULL); @@ -2507,8 +2507,8 @@ cert_writer_default(NMConnection * connection, base_dir = g_path_get_dirname(path); /* path cannot start with "file://" or "data:;base64,", because it is an absolute path. - * Still, make sure that a prefix-less path will be recognized. This can happen - * for example if the path is longer then 500 chars. */ + * Still, make sure that a prefix-less path will be recognized. This can happen + * for example if the path is longer then 500 chars. */ tmp = nm_keyfile_detect_unqualified_path_scheme(base_dir, path, -1, FALSE, NULL); if (tmp) nm_clear_g_free(&tmp); @@ -2518,7 +2518,7 @@ cert_writer_default(NMConnection * connection, } /* Path contains at least a '/', hence it cannot be recognized as the old - * binary format consisting of a list of integers. */ + * binary format consisting of a list of integers. */ nm_keyfile_plugin_kf_set_string(file, setting_name, vtable->setting_key, path); } else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) { @@ -2543,11 +2543,11 @@ cert_writer_default(NMConnection * connection, vtable->uri_func(setting)); } else { /* scheme_func() returns UNKNOWN in all other cases. The only valid case - * where a scheme is allowed to be UNKNOWN, is unsetting the value. In this - * case, we don't expect the writer to be called, because the default value - * will not be serialized. - * The only other reason for the scheme to be UNKNOWN is an invalid cert. - * But our connection verifies, so that cannot happen either. */ + * where a scheme is allowed to be UNKNOWN, is unsetting the value. In this + * case, we don't expect the writer to be called, because the default value + * will not be serialized. + * The only other reason for the scheme to be UNKNOWN is an invalid cert. + * But our connection verifies, so that cannot happen either. */ g_return_if_reached(); } } @@ -2631,8 +2631,8 @@ struct _ParseInfoProperty { bool has_parser_full : 1; /* usually, we skip to write values that have their - * default value. By setting this flag to TRUE, also - * default values are written. */ + * default value. By setting this flag to TRUE, also + * default values are written. */ bool writer_persist_default : 1; }; @@ -3021,10 +3021,10 @@ read_one_setting_value(KeyfileReaderInfo * info, == G_PARAM_WRITABLE); /* Check for the exact key in the GKeyFile if required. Most setting - * properties map 1:1 to a key in the GKeyFile, but for those properties - * like IP addresses and routes where more than one value is actually - * encoded by the setting property, this won't be true. - */ + * properties map 1:1 to a key in the GKeyFile, but for those properties + * like IP addresses and routes where more than one value is actually + * encoded by the setting property, this won't be true. + */ if ((!pip || !pip->parser_no_check_key) && !nm_keyfile_plugin_kf_has_key(keyfile, setting_info->setting_name, key, &err)) { /* Key doesn't exist or an error occurred, thus nothing to do. */ @@ -3262,17 +3262,17 @@ _read_setting(KeyfileReaderInfo *info) GVariant * variant; /* a GKeyFile can return duplicate keys, there is just no API to make sense - * of them. Skip them. */ + * of them. Skip them. */ if (k + 1 < n_keys && nm_streq(key, keys[k + 1])) continue; /* currently, the API is very simple. The setting class just returns - * the desired variant type, and keyfile reader will try to parse - * it accordingly. Note, that this does currently not allow, that - * a particular key can contain different variant types, nor is it - * very flexible in general. - * - * We add flexibility when we need it. Keep it simple for now. */ + * the desired variant type, and keyfile reader will try to parse + * it accordingly. Note, that this does currently not allow, that + * a particular key can contain different variant types, nor is it + * very flexible in general. + * + * We add flexibility when we need it. Keep it simple for now. */ variant_type = sett_info->detail.gendata_info->get_variant_type(sett_info, key, &local); if (!variant_type) { @@ -3365,7 +3365,7 @@ _read_setting_wireguard_peer(KeyfileReaderInfo *info) if (!nm_utils_base64secret_normalize(cstr, NM_WIREGUARD_PUBLIC_KEY_LEN, &str) || !nm_streq0(str, cstr)) { /* the group name must be identical to the normalized(!) key, so that it - * is uniquely identified. */ + * is uniquely identified. */ handle_warn(info, NULL, NM_SETTING_WIREGUARD_PEERS, @@ -3518,7 +3518,7 @@ _read_setting_vpn_secrets(KeyfileReaderInfo *info) s_vpn = nm_connection_get_setting_vpn(info->connection); if (!s_vpn) { /* if we don't also have a [vpn] section (which must be parsed earlier), - * we don't do anything. */ + * we don't do anything. */ nm_assert(!g_key_file_has_group(info->keyfile, "vpn")); return; } @@ -3654,8 +3654,8 @@ nm_keyfile_read(GKeyFile * keyfile, } /* Make sure that we have 'interface-name' even if it was specified in the - * "wrong" (ie, deprecated) group. - */ + * "wrong" (ie, deprecated) group. + */ if (!nm_setting_connection_get_interface_name(s_con) && nm_setting_connection_get_connection_type(s_con)) { gs_free char *interface_name = NULL; @@ -3708,13 +3708,13 @@ write_setting_value(KeyfileWriterInfo * info, if (!pip) { if (!setting_info) { /* the setting type is unknown. That is highly unexpected - * (and as this is currently only called from NetworkManager - * daemon, not possible). - * - * Still, handle it gracefully, because later keyfile writer will become - * public API of libnm, where @setting is (untrusted) user input. - * - * Gracefully here just means: ignore the setting. */ + * (and as this is currently only called from NetworkManager + * daemon, not possible). + * + * Still, handle it gracefully, because later keyfile writer will become + * public API of libnm, where @setting is (untrusted) user input. + * + * Gracefully here just means: ignore the setting. */ return; } if (!property_info->param_spec) @@ -3733,10 +3733,10 @@ write_setting_value(KeyfileWriterInfo * info, nm_assert(property_info->param_spec); /* Don't write secrets that are owned by user secret agents or aren't - * supposed to be saved. VPN secrets are handled specially though since - * the secret flags there are in a third-level hash in the 'secrets' - * property. - */ + * supposed to be saved. VPN secrets are handled specially though since + * the secret flags there are in a third-level hash in the 'secrets' + * property. + */ if ((property_info->param_spec->flags & NM_SETTING_PARAM_SECRET) && !NM_IS_SETTING_VPN(setting)) { NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -3885,9 +3885,9 @@ _write_setting_wireguard(NMSetting *setting, KeyfileWriterInfo *info) } /* usually, we don't persist the secret-flags 0 (because they are the default). - * For WireGuard peers, the default secret-flags for preshared-key are 4 (not-required). - * So, in this case behave differently: a missing preshared-key-flag setting means - * "not-required". */ + * For WireGuard peers, the default secret-flags for preshared-key are 4 (not-required). + * So, in this case behave differently: a missing preshared-key-flag setting means + * "not-required". */ if (secret_flags != NM_SETTING_SECRET_FLAG_NOT_REQUIRED) { g_key_file_set_int64(info->keyfile, group, @@ -3998,9 +3998,9 @@ nm_keyfile_write(NMConnection * connection, (guint64) g_variant_get_uint32(v)); } else { /* BUG: The variant type is not implemented. Since the connection - * verifies, this can only mean we either wrongly didn't reject - * the connection as invalid, or we didn't properly implement the - * variant type. */ + * verifies, this can only mean we either wrongly didn't reject + * the connection as invalid, or we didn't properly implement the + * variant type. */ nm_assert_not_reached(); continue; } @@ -4023,7 +4023,7 @@ nm_keyfile_write(NMConnection * connection, /* we have a section for the setting. Nothing to do. */ } else { /* ensure the group is present. There is no API for that, so add and remove - * a dummy key. */ + * a dummy key. */ g_key_file_set_value(info.keyfile, setting_alias ?: setting_name, ".X", "1"); g_key_file_remove_key(info.keyfile, setting_alias ?: setting_name, ".X", NULL); } @@ -4090,8 +4090,8 @@ nm_keyfile_utils_ignore_filename(const char *filename, gboolean require_extensio if (!base[0]) { /* this check above with strrchr() also rejects "/some/path/with/trailing/slash/", - * but that is fine, because such a path would name a directory, and we are not - * interested in directories. */ + * but that is fine, because such a path would name a directory, and we are not + * interested in directories. */ return TRUE; } @@ -4113,9 +4113,9 @@ nm_keyfile_utils_ignore_filename(const char *filename, gboolean require_extensio return TRUE; /* Ignore temporary files - * - * This check is also important to ignore .nmload files (see - * %NM_KEYFILE_PATH_SUFFIX_NMMETA). */ + * + * This check is also important to ignore .nmload files (see + * %NM_KEYFILE_PATH_SUFFIX_NMMETA). */ if (check_mkstemp_suffix(base)) return TRUE; @@ -4131,9 +4131,9 @@ char * nm_keyfile_utils_create_filename(const char *name, gboolean with_extension) { /* keyfile used to escape with '*', do not change that behavior. - * - * But for newly added escapings, use '_' instead. - * Also, @with_extension is new-style. */ + * + * But for newly added escapings, use '_' instead. + * Also, @with_extension is new-style. */ const char ESCAPE_CHAR = with_extension ? '_' : '*'; const char ESCAPE_CHAR2 = '_'; NMStrBuf str; @@ -4156,7 +4156,7 @@ nm_keyfile_utils_create_filename(const char *name, gboolean with_extension) } /* nm_keyfile_utils_create_filename() must avoid anything that ignore_filename() would reject. - * We can escape here more aggressively then what we would read back. */ + * We can escape here more aggressively then what we would read back. */ if (p[0] == '.') p[0] = ESCAPE_CHAR2; if (p[str.len - 1] == '~') @@ -4241,8 +4241,8 @@ _nm_keyfile_handler_data_warn_get_message(const NMKeyfileHandlerData *handler_da if (!handler_data->warn.message) { /* we cast the const away. @handler_data is const w.r.t. visible mutations - * from POV of the user. Internally, we construct the message in - * a lazy manner. It's like a mutable field in C++. */ + * from POV of the user. Internally, we construct the message in + * a lazy manner. It's like a mutable field in C++. */ NM_PRAGMA_WARNING_DISABLE("-Wformat-nonliteral") ((NMKeyfileHandlerData *) handler_data)->warn.message = g_strdup_vprintf(handler_data->warn.fmt, diff --git a/libnm-core/nm-libnm-core-intern/nm-auth-subject.c b/libnm-core/nm-libnm-core-intern/nm-auth-subject.c index ad77e87b81..68714a3f84 100644 --- a/libnm-core/nm-libnm-core-intern/nm-auth-subject.c +++ b/libnm-core/nm-libnm-core-intern/nm-auth-subject.c @@ -360,12 +360,12 @@ constructed(GObject *object) return; case NM_AUTH_SUBJECT_TYPE_UNIX_PROCESS: /* Ensure pid and uid to be representable as int32. - * DBUS treats them as uint32, polkit library as int. */ + * DBUS treats them as uint32, polkit library as int. */ if (priv->unix_process.pid > MIN(G_MAXINT, G_MAXINT32)) break; if (priv->unix_process.uid > MIN(G_MAXINT, G_MAXINT32)) { /* for uid==-1, libpolkit-gobject-1 detects the user based on the process id. - * Don't bother and require the user id as parameter. */ + * Don't bother and require the user id as parameter. */ break; } @@ -374,17 +374,17 @@ constructed(GObject *object) if (!priv->unix_process.start_time) { /* Is the process already gone? Then fail creation of the auth subject - * by clearing the type. */ + * by clearing the type. */ if (kill(priv->unix_process.pid, 0) != 0) _clear_private(self); /* Otherwise, although we didn't detect a start_time, the process is still around. - * That could be due to procfs mounted with hidepid. So just accept the request. - * - * Polkit on the other side, will accept 0 and try to lookup /proc/$PID/stat - * itself (and if it fails to do so, assume a start-time of 0 and proceed). - * The only combination that would fail here, is when NM is able to read the - * start-time, but polkit is not. */ + * That could be due to procfs mounted with hidepid. So just accept the request. + * + * Polkit on the other side, will accept 0 and try to lookup /proc/$PID/stat + * itself (and if it fails to do so, assume a start-time of 0 and proceed). + * The only combination that would fail here, is when NM is able to read the + * start-time, but polkit is not. */ } return; case NM_AUTH_SUBJECT_TYPE_UNIX_SESSION: diff --git a/libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c b/libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c index 4cf8b1f447..a3a908f4fc 100644 --- a/libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c +++ b/libnm-core/nm-libnm-core-intern/nm-ethtool-utils.c @@ -218,8 +218,8 @@ _ASSERT_data(void) d = nm_ethtool_data[id]; if (i > 0) { /* since we assert that all optnames are sorted strictly monotonically increasing, - * it also follows that there are no duplicates in the _by_name. - * It also follows, that all names in nm_ethtool_data are unique. */ + * it also follows that there are no duplicates in the _by_name. + * It also follows, that all names in nm_ethtool_data are unique. */ if (strcmp(nm_ethtool_data[_by_name[i - 1]]->optname, d->optname) >= 0) { g_error("nm_ethtool_data is not sorted asciibetically: %u/%s should be after %u/%s", i - 1, diff --git a/libnm-core/nm-setting-6lowpan.c b/libnm-core/nm-setting-6lowpan.c index 4c4d87ab5e..504ba084fc 100644 --- a/libnm-core/nm-setting-6lowpan.c +++ b/libnm-core/nm-setting-6lowpan.c @@ -85,8 +85,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (nm_utils_is_uuid(priv->parent)) { /* If we have an NMSettingConnection:master with slave-type="6lowpan", - * then it must be the same UUID. - */ + * then it must be the same UUID. + */ if (s_con) { const char *master = NULL, *slave_type = NULL; @@ -208,13 +208,13 @@ nm_setting_6lowpan_class_init(NMSetting6LowpanClass *klass) setting_class->verify = verify; /** - * NMSetting6Lowpan:parent: - * - * If given, specifies the parent interface name or parent connection UUID - * from which this 6LowPAN interface should be created. - * - * Since: 1.14 - **/ + * NMSetting6Lowpan:parent: + * + * If given, specifies the parent interface name or parent connection UUID + * from which this 6LowPAN interface should be created. + * + * Since: 1.14 + **/ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_6LOWPAN_PARENT, "", diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 3d3699eedb..94da6c75b1 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -238,10 +238,10 @@ nm_setting_802_1x_check_cert_scheme(gconstpointer pdata, gsize length, GError ** if (scheme != NM_SETTING_802_1X_CK_SCHEME_BLOB) { /* An actual URI must be NUL terminated, contain at least - * one non-NUL character, and contain only one trailing NUL - * character. - * And ensure it's UTF-8 valid too so we can pass it through - * D-Bus and stuff like that. */ + * one non-NUL character, and contain only one trailing NUL + * character. + * And ensure it's UTF-8 valid too so we can pass it through + * D-Bus and stuff like that. */ if (data[length - 1] != '\0') { g_set_error_literal(error, @@ -575,8 +575,8 @@ _cert_impl_set(NMSetting8021x * setting, } /* As required by NM and wpa_supplicant, set the client-cert - * property to the same PKCS#12 data. - */ + * property to the same PKCS#12 data. + */ if (cert && p_client_cert && format == NM_CRYPTO_FILE_FORMAT_PKCS12 && !nm_gbytes_equal0(cert, *p_client_cert)) { g_bytes_unref(*p_client_cert); @@ -3121,8 +3121,8 @@ need_secrets(NMSetting *setting) (*eap_methods_table[i].ns_func)(self, secrets, FALSE); /* Only break out of the outer loop if this EAP method - * needed secrets. - */ + * needed secrets. + */ if (secrets->len > 0) eap_method_found = TRUE; break; @@ -3560,22 +3560,22 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) setting_class->need_secrets = need_secrets; /** - * NMSetting8021x:eap: - * - * The allowed EAP method to be used when authenticating to the network with - * 802.1x. Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", - * and "fast". Each method requires different configuration using the - * properties of this setting; refer to wpa_supplicant documentation for the - * allowed combinations. - **/ + * NMSetting8021x:eap: + * + * The allowed EAP method to be used when authenticating to the network with + * 802.1x. Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd", + * and "fast". Each method requires different configuration using the + * properties of this setting; refer to wpa_supplicant documentation for the + * allowed combinations. + **/ /* ---ifcfg-rh--- - * property: eap - * variable: IEEE_8021X_EAP_METHODS(+) - * values: "LEAP", "PWD", "TLS", "PEAP", "TTLS", "FAST" - * description: EAP method for 802.1X authentication. - * example: IEEE_8021X_EAP_METHODS=PEAP - * ---end--- - */ + * property: eap + * variable: IEEE_8021X_EAP_METHODS(+) + * values: "LEAP", "PWD", "TLS", "PEAP", "TTLS", "FAST" + * description: EAP method for 802.1X authentication. + * example: IEEE_8021X_EAP_METHODS=PEAP + * ---end--- + */ obj_properties[PROP_EAP] = g_param_spec_boxed(NM_SETTING_802_1X_EAP, "", "", @@ -3583,18 +3583,18 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:identity: - * - * Identity string for EAP authentication methods. Often the user's user or - * login name. - **/ + * NMSetting8021x:identity: + * + * Identity string for EAP authentication methods. Often the user's user or + * login name. + **/ /* ---ifcfg-rh--- - * property: identity - * variable: IEEE_8021X_IDENTITY(+) - * description: Identity for EAP authentication methods. - * example: IEEE_8021X_IDENTITY=itsme - * ---end--- - */ + * property: identity + * variable: IEEE_8021X_IDENTITY(+) + * description: Identity for EAP authentication methods. + * example: IEEE_8021X_IDENTITY=itsme + * ---end--- + */ obj_properties[PROP_IDENTITY] = g_param_spec_string(NM_SETTING_802_1X_IDENTITY, "", "", @@ -3602,18 +3602,18 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:anonymous-identity: - * - * Anonymous identity string for EAP authentication methods. Used as the - * unencrypted identity with EAP types that support different tunneled - * identity like EAP-TTLS. - **/ + * NMSetting8021x:anonymous-identity: + * + * Anonymous identity string for EAP authentication methods. Used as the + * unencrypted identity with EAP types that support different tunneled + * identity like EAP-TTLS. + **/ /* ---ifcfg-rh--- - * property: anonymous-identity - * variable: IEEE_8021X_ANON_IDENTITY(+) - * description: Anonymous identity for EAP authentication methods. - * ---end--- - */ + * property: anonymous-identity + * variable: IEEE_8021X_ANON_IDENTITY(+) + * description: Anonymous identity for EAP authentication methods. + * ---end--- + */ obj_properties[PROP_ANONYMOUS_IDENTITY] = g_param_spec_string(NM_SETTING_802_1X_ANONYMOUS_IDENTITY, "", @@ -3622,17 +3622,17 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:pac-file: - * - * UTF-8 encoded file path containing PAC for EAP-FAST. - **/ + * NMSetting8021x:pac-file: + * + * UTF-8 encoded file path containing PAC for EAP-FAST. + **/ /* ---ifcfg-rh--- - * property: pac-file - * variable: IEEE_8021X_PAC_FILE(+) - * description: File with PAC (Protected Access Credential) for EAP-FAST. - * example: IEEE_8021X_PAC_FILE=/home/joe/my-fast.pac - * ---end--- - */ + * property: pac-file + * variable: IEEE_8021X_PAC_FILE(+) + * description: File with PAC (Protected Access Credential) for EAP-FAST. + * example: IEEE_8021X_PAC_FILE=/home/joe/my-fast.pac + * ---end--- + */ obj_properties[PROP_PAC_FILE] = g_param_spec_string(NM_SETTING_802_1X_PAC_FILE, "", "", @@ -3640,33 +3640,33 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:ca-cert: - * - * Contains the CA certificate if used by the EAP method specified in the - * #NMSetting8021x:eap property. - * - * Certificate data is specified using a "scheme"; three are currently - * supported: blob, path and pkcs#11 URL. When using the blob scheme this property - * should be set to the certificate's DER encoded data. When using the path - * scheme, this property should be set to the full UTF-8 encoded path of the - * certificate, prefixed with the string "file://" and ending with a terminating - * NUL byte. - * This property can be unset even if the EAP method supports CA certificates, - * but this allows man-in-the-middle attacks and is NOT recommended. - * - * Note that enabling NMSetting8021x:system-ca-certs will override this - * setting to use the built-in path, if the built-in path is not a directory. - * - * Setting this property directly is discouraged; use the - * nm_setting_802_1x_set_ca_cert() function instead. - **/ + * NMSetting8021x:ca-cert: + * + * Contains the CA certificate if used by the EAP method specified in the + * #NMSetting8021x:eap property. + * + * Certificate data is specified using a "scheme"; three are currently + * supported: blob, path and pkcs#11 URL. When using the blob scheme this property + * should be set to the certificate's DER encoded data. When using the path + * scheme, this property should be set to the full UTF-8 encoded path of the + * certificate, prefixed with the string "file://" and ending with a terminating + * NUL byte. + * This property can be unset even if the EAP method supports CA certificates, + * but this allows man-in-the-middle attacks and is NOT recommended. + * + * Note that enabling NMSetting8021x:system-ca-certs will override this + * setting to use the built-in path, if the built-in path is not a directory. + * + * Setting this property directly is discouraged; use the + * nm_setting_802_1x_set_ca_cert() function instead. + **/ /* ---ifcfg-rh--- - * property: ca-cert - * variable: IEEE_8021X_CA_CERT(+) - * description: CA certificate for EAP. - * example: IEEE_8021X_CA_CERT=/home/joe/cacert.crt - * ---end--- - */ + * property: ca-cert + * variable: IEEE_8021X_CA_CERT(+) + * description: CA certificate for EAP. + * example: IEEE_8021X_CA_CERT=/home/joe/cacert.crt + * ---end--- + */ obj_properties[PROP_CA_CERT] = g_param_spec_boxed(NM_SETTING_802_1X_CA_CERT, "", "", @@ -3674,17 +3674,17 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:ca-cert-password: - * - * The password used to access the CA certificate stored in - * #NMSetting8021x:ca-cert property. Only makes sense if the certificate - * is stored on a PKCS#<!-- -->11 token that requires a login. - * - * Since: 1.8 - **/ + * NMSetting8021x:ca-cert-password: + * + * The password used to access the CA certificate stored in + * #NMSetting8021x:ca-cert property. Only makes sense if the certificate + * is stored on a PKCS#<!-- -->11 token that requires a login. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_CA_CERT_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_CA_CERT_PASSWORD, "", @@ -3693,15 +3693,15 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:ca-cert-password-flags: - * - * Flags indicating how to handle the #NMSetting8021x:ca-cert-password property. - * - * Since: 1.8 - **/ + * NMSetting8021x:ca-cert-password-flags: + * + * Flags indicating how to handle the #NMSetting8021x:ca-cert-password property. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_CA_CERT_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS, "", @@ -3711,21 +3711,21 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:ca-path: - * - * UTF-8 encoded path to a directory containing PEM or DER formatted - * certificates to be added to the verification chain in addition to the - * certificate specified in the #NMSetting8021x:ca-cert property. - * - * If NMSetting8021x:system-ca-certs is enabled and the built-in CA - * path is an existing directory, then this setting is ignored. - **/ + * NMSetting8021x:ca-path: + * + * UTF-8 encoded path to a directory containing PEM or DER formatted + * certificates to be added to the verification chain in addition to the + * certificate specified in the #NMSetting8021x:ca-cert property. + * + * If NMSetting8021x:system-ca-certs is enabled and the built-in CA + * path is an existing directory, then this setting is ignored. + **/ /* ---ifcfg-rh--- - * property: ca-path - * variable: IEEE_8021X_CA_PATH(+) - * description: The search path for the certificate. - * ---end--- - */ + * property: ca-path + * variable: IEEE_8021X_CA_PATH(+) + * description: The search path for the certificate. + * ---end--- + */ obj_properties[PROP_CA_PATH] = g_param_spec_string(NM_SETTING_802_1X_CA_PATH, "", "", @@ -3733,21 +3733,21 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:subject-match: - * - * Substring to be matched against the subject of the certificate presented - * by the authentication server. When unset, no verification of the - * authentication server certificate's subject is performed. This property - * provides little security, if any, and its use is deprecated in favor of - * NMSetting8021x:domain-suffix-match. - **/ + * NMSetting8021x:subject-match: + * + * Substring to be matched against the subject of the certificate presented + * by the authentication server. When unset, no verification of the + * authentication server certificate's subject is performed. This property + * provides little security, if any, and its use is deprecated in favor of + * NMSetting8021x:domain-suffix-match. + **/ /* ---ifcfg-rh--- - * property: subject-match - * variable: IEEE_8021X_SUBJECT_MATCH(+) - * description: Substring to match subject of server certificate against. - * example: IEEE_8021X_SUBJECT_MATCH="Red Hat" - * ---end--- - */ + * property: subject-match + * variable: IEEE_8021X_SUBJECT_MATCH(+) + * description: Substring to match subject of server certificate against. + * example: IEEE_8021X_SUBJECT_MATCH="Red Hat" + * ---end--- + */ obj_properties[PROP_SUBJECT_MATCH] = g_param_spec_string(NM_SETTING_802_1X_SUBJECT_MATCH, "", @@ -3756,19 +3756,19 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:altsubject-matches: - * - * List of strings to be matched against the altSubjectName of the - * certificate presented by the authentication server. If the list is empty, - * no verification of the server certificate's altSubjectName is performed. - **/ + * NMSetting8021x:altsubject-matches: + * + * List of strings to be matched against the altSubjectName of the + * certificate presented by the authentication server. If the list is empty, + * no verification of the server certificate's altSubjectName is performed. + **/ /* ---ifcfg-rh--- - * property: altsubject-matches - * variable: IEEE_8021X_ALTSUBJECT_MATCHES(+) - * description: List of strings to be matched against the altSubjectName. - * example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc" - * ---end--- - */ + * property: altsubject-matches + * variable: IEEE_8021X_ALTSUBJECT_MATCHES(+) + * description: List of strings to be matched against the altSubjectName. + * example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc" + * ---end--- + */ obj_properties[PROP_ALTSUBJECT_MATCHES] = g_param_spec_boxed(NM_SETTING_802_1X_ALTSUBJECT_MATCHES, "", @@ -3777,24 +3777,24 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:domain-suffix-match: - * - * Constraint for server domain name. If set, this FQDN is used as a suffix - * match requirement for dNSName element(s) of the certificate presented by - * the authentication server. If a matching dNSName is found, this - * constraint is met. If no dNSName values are present, this constraint is - * matched against SubjectName CN using same suffix match comparison. - * Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited - * list. - * - * Since: 1.2 - **/ + * NMSetting8021x:domain-suffix-match: + * + * Constraint for server domain name. If set, this FQDN is used as a suffix + * match requirement for dNSName element(s) of the certificate presented by + * the authentication server. If a matching dNSName is found, this + * constraint is met. If no dNSName values are present, this constraint is + * matched against SubjectName CN using same suffix match comparison. + * Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited + * list. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: domain-suffix-match - * description: Suffix to match domain of server certificate against. - * variable: IEEE_8021X_DOMAIN_SUFFIX_MATCH(+) - * ---end--- - */ + * property: domain-suffix-match + * description: Suffix to match domain of server certificate against. + * variable: IEEE_8021X_DOMAIN_SUFFIX_MATCH(+) + * ---end--- + */ obj_properties[PROP_DOMAIN_SUFFIX_MATCH] = g_param_spec_string(NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, "", @@ -3803,23 +3803,23 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:domain-match: - * - * Constraint for server domain name. If set, this list of FQDNs is used as - * a match requirement for dNSName element(s) of the certificate presented - * by the authentication server. If a matching dNSName is found, this - * constraint is met. If no dNSName values are present, this constraint is - * matched against SubjectName CN using the same comparison. - * Multiple valid FQDNs can be passed as a ";" delimited list. - * - * Since: 1.24 - **/ + * NMSetting8021x:domain-match: + * + * Constraint for server domain name. If set, this list of FQDNs is used as + * a match requirement for dNSName element(s) of the certificate presented + * by the authentication server. If a matching dNSName is found, this + * constraint is met. If no dNSName values are present, this constraint is + * matched against SubjectName CN using the same comparison. + * Multiple valid FQDNs can be passed as a ";" delimited list. + * + * Since: 1.24 + **/ /* ---ifcfg-rh--- - * property: domain-match - * description: Value to match domain of server certificate against. - * variable: IEEE_8021X_DOMAIN_MATCH(+) - * ---end--- - */ + * property: domain-match + * description: Value to match domain of server certificate against. + * variable: IEEE_8021X_DOMAIN_MATCH(+) + * ---end--- + */ obj_properties[PROP_DOMAIN_MATCH] = g_param_spec_string(NM_SETTING_802_1X_DOMAIN_MATCH, "", @@ -3828,28 +3828,28 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:client-cert: - * - * Contains the client certificate if used by the EAP method specified in - * the #NMSetting8021x:eap property. - * - * Certificate data is specified using a "scheme"; two are currently - * supported: blob and path. When using the blob scheme (which is backwards - * compatible with NM 0.7.x) this property should be set to the - * certificate's DER encoded data. When using the path scheme, this property - * should be set to the full UTF-8 encoded path of the certificate, prefixed - * with the string "file://" and ending with a terminating NUL byte. - * - * Setting this property directly is discouraged; use the - * nm_setting_802_1x_set_client_cert() function instead. - **/ + * NMSetting8021x:client-cert: + * + * Contains the client certificate if used by the EAP method specified in + * the #NMSetting8021x:eap property. + * + * Certificate data is specified using a "scheme"; two are currently + * supported: blob and path. When using the blob scheme (which is backwards + * compatible with NM 0.7.x) this property should be set to the + * certificate's DER encoded data. When using the path scheme, this property + * should be set to the full UTF-8 encoded path of the certificate, prefixed + * with the string "file://" and ending with a terminating NUL byte. + * + * Setting this property directly is discouraged; use the + * nm_setting_802_1x_set_client_cert() function instead. + **/ /* ---ifcfg-rh--- - * property: client-cert - * variable: IEEE_8021X_CLIENT_CERT(+) - * description: Client certificate for EAP. - * example: IEEE_8021X_CLIENT_CERT=/home/joe/mycert.crt - * ---end--- - */ + * property: client-cert + * variable: IEEE_8021X_CLIENT_CERT(+) + * description: Client certificate for EAP. + * example: IEEE_8021X_CLIENT_CERT=/home/joe/mycert.crt + * ---end--- + */ obj_properties[PROP_CLIENT_CERT] = g_param_spec_boxed(NM_SETTING_802_1X_CLIENT_CERT, "", @@ -3858,17 +3858,17 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:client-cert-password: - * - * The password used to access the client certificate stored in - * #NMSetting8021x:client-cert property. Only makes sense if the certificate - * is stored on a PKCS#<!-- -->11 token that requires a login. - * - * Since: 1.8 - **/ + * NMSetting8021x:client-cert-password: + * + * The password used to access the client certificate stored in + * #NMSetting8021x:client-cert property. Only makes sense if the certificate + * is stored on a PKCS#<!-- -->11 token that requires a login. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_CLIENT_CERT_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_CLIENT_CERT_PASSWORD, "", @@ -3877,15 +3877,15 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:client-cert-password-flags: - * - * Flags indicating how to handle the #NMSetting8021x:client-cert-password property. - * - * Since: 1.8 - **/ + * NMSetting8021x:client-cert-password-flags: + * + * Flags indicating how to handle the #NMSetting8021x:client-cert-password property. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_CLIENT_CERT_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS, "", @@ -3895,22 +3895,22 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase1-peapver: - * - * Forces which PEAP version is used when PEAP is set as the EAP method in - * the #NMSetting8021x:eap property. When unset, the version reported by - * the server will be used. Sometimes when using older RADIUS servers, it - * is necessary to force the client to use a particular PEAP version. To do - * so, this property may be set to "0" or "1" to force that specific PEAP - * version. - **/ + * NMSetting8021x:phase1-peapver: + * + * Forces which PEAP version is used when PEAP is set as the EAP method in + * the #NMSetting8021x:eap property. When unset, the version reported by + * the server will be used. Sometimes when using older RADIUS servers, it + * is necessary to force the client to use a particular PEAP version. To do + * so, this property may be set to "0" or "1" to force that specific PEAP + * version. + **/ /* ---ifcfg-rh--- - * property: phase1-peapver - * variable: IEEE_8021X_PEAP_VERSION(+) - * values: 0, 1 - * description: Use to force a specific PEAP version. - * ---end--- - */ + * property: phase1-peapver + * variable: IEEE_8021X_PEAP_VERSION(+) + * values: 0, 1 + * description: Use to force a specific PEAP version. + * ---end--- + */ obj_properties[PROP_PHASE1_PEAPVER] = g_param_spec_string(NM_SETTING_802_1X_PHASE1_PEAPVER, "", @@ -3919,21 +3919,21 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase1-peaplabel: - * - * Forces use of the new PEAP label during key derivation. Some RADIUS - * servers may require forcing the new PEAP label to interoperate with - * PEAPv1. Set to "1" to force use of the new PEAP label. See the - * wpa_supplicant documentation for more details. - **/ + * NMSetting8021x:phase1-peaplabel: + * + * Forces use of the new PEAP label during key derivation. Some RADIUS + * servers may require forcing the new PEAP label to interoperate with + * PEAPv1. Set to "1" to force use of the new PEAP label. See the + * wpa_supplicant documentation for more details. + **/ /* ---ifcfg-rh--- - * property: phase1-peaplabel - * variable: IEEE_8021X_PEAP_FORCE_NEW_LABEL(+) - * values: yes, no - * default: no - * description: Use to force the new PEAP label during key derivation. - * ---end--- - */ + * property: phase1-peaplabel + * variable: IEEE_8021X_PEAP_FORCE_NEW_LABEL(+) + * values: yes, no + * default: no + * description: Use to force the new PEAP label during key derivation. + * ---end--- + */ obj_properties[PROP_PHASE1_PEAPLABEL] = g_param_spec_string(NM_SETTING_802_1X_PHASE1_PEAPLABEL, "", @@ -3942,23 +3942,23 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase1-fast-provisioning: - * - * Enables or disables in-line provisioning of EAP-FAST credentials when - * FAST is specified as the EAP method in the #NMSetting8021x:eap property. - * Recognized values are "0" (disabled), "1" (allow unauthenticated - * provisioning), "2" (allow authenticated provisioning), and "3" (allow - * both authenticated and unauthenticated provisioning). See the - * wpa_supplicant documentation for more details. - **/ + * NMSetting8021x:phase1-fast-provisioning: + * + * Enables or disables in-line provisioning of EAP-FAST credentials when + * FAST is specified as the EAP method in the #NMSetting8021x:eap property. + * Recognized values are "0" (disabled), "1" (allow unauthenticated + * provisioning), "2" (allow authenticated provisioning), and "3" (allow + * both authenticated and unauthenticated provisioning). See the + * wpa_supplicant documentation for more details. + **/ /* ---ifcfg-rh--- - * property: phase1-fast-provisioning - * variable: IEEE_8021X_FAST_PROVISIONING(+) - * values: space-separated list of these values [allow-auth, allow-unauth] - * description: Enable in-line provisioning of EAP-FAST credentials. - * example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth" - * ---end--- - */ + * property: phase1-fast-provisioning + * variable: IEEE_8021X_FAST_PROVISIONING(+) + * values: space-separated list of these values [allow-auth, allow-unauth] + * description: Enable in-line provisioning of EAP-FAST credentials. + * example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth" + * ---end--- + */ obj_properties[PROP_PHASE1_FAST_PROVISIONING] = g_param_spec_string(NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, "", @@ -3967,25 +3967,25 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase1-auth-flags: - * - * Specifies authentication flags to use in "phase 1" outer - * authentication using #NMSetting8021xAuthFlags options. - * The individual TLS versions can be explicitly disabled. If a certain - * TLS disable flag is not set, it is up to the supplicant to allow - * or forbid it. The TLS options map to tls_disable_tlsv1_x settings. - * See the wpa_supplicant documentation for more details. - * - * Since: 1.8 - */ + * NMSetting8021x:phase1-auth-flags: + * + * Specifies authentication flags to use in "phase 1" outer + * authentication using #NMSetting8021xAuthFlags options. + * The individual TLS versions can be explicitly disabled. If a certain + * TLS disable flag is not set, it is up to the supplicant to allow + * or forbid it. The TLS options map to tls_disable_tlsv1_x settings. + * See the wpa_supplicant documentation for more details. + * + * Since: 1.8 + */ /* ---ifcfg-rh--- - * property: phase1-auth-flags - * variable: IEEE_8021X_PHASE1_AUTH_FLAGS(+) - * values: space-separated list of authentication flags names - * description: Authentication flags for the supplicant - * example: IEEE_8021X_PHASE1_AUTH_FLAGS="tls-1-0-disable tls-1-1-disable" - * ---end--- - */ + * property: phase1-auth-flags + * variable: IEEE_8021X_PHASE1_AUTH_FLAGS(+) + * values: space-separated list of authentication flags names + * description: Authentication flags for the supplicant + * example: IEEE_8021X_PHASE1_AUTH_FLAGS="tls-1-0-disable tls-1-1-disable" + * ---end--- + */ obj_properties[PROP_PHASE1_AUTH_FLAGS] = g_param_spec_uint(NM_SETTING_802_1X_PHASE1_AUTH_FLAGS, "", @@ -3996,24 +3996,24 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-auth: - * - * Specifies the allowed "phase 2" inner non-EAP authentication method when - * an EAP method that uses an inner TLS tunnel is specified in the - * #NMSetting8021x:eap property. Recognized non-EAP "phase 2" methods are - * "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". - * Each "phase 2" inner method requires specific parameters for successful - * authentication; see the wpa_supplicant documentation for more details. - **/ + * NMSetting8021x:phase2-auth: + * + * Specifies the allowed "phase 2" inner non-EAP authentication method when + * an EAP method that uses an inner TLS tunnel is specified in the + * #NMSetting8021x:eap property. Recognized non-EAP "phase 2" methods are + * "pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls". + * Each "phase 2" inner method requires specific parameters for successful + * authentication; see the wpa_supplicant documentation for more details. + **/ /* ---ifcfg-rh--- - * property: phase2-auth - * variable: IEEE_8021X_INNER_AUTH_METHODS(+) - * values: "PAP", "CHAP", "MSCHAP", "MSCHAPV2", "GTC", "OTP", "MD5" and "TLS" - * description: Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS - * can contain values both for 'phase2-auth' and 'phase2-autheap' properties. - * example: IEEE_8021X_INNER_AUTH_METHODS=PAP - * ---end--- - */ + * property: phase2-auth + * variable: IEEE_8021X_INNER_AUTH_METHODS(+) + * values: "PAP", "CHAP", "MSCHAP", "MSCHAPV2", "GTC", "OTP", "MD5" and "TLS" + * description: Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS + * can contain values both for 'phase2-auth' and 'phase2-autheap' properties. + * example: IEEE_8021X_INNER_AUTH_METHODS=PAP + * ---end--- + */ obj_properties[PROP_PHASE2_AUTH] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_AUTH, "", @@ -4022,24 +4022,24 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-autheap: - * - * Specifies the allowed "phase 2" inner EAP-based authentication method - * when an EAP method that uses an inner TLS tunnel is specified in the - * #NMSetting8021x:eap property. Recognized EAP-based "phase 2" methods are - * "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method - * requires specific parameters for successful authentication; see the - * wpa_supplicant documentation for more details. - **/ + * NMSetting8021x:phase2-autheap: + * + * Specifies the allowed "phase 2" inner EAP-based authentication method + * when an EAP method that uses an inner TLS tunnel is specified in the + * #NMSetting8021x:eap property. Recognized EAP-based "phase 2" methods are + * "md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method + * requires specific parameters for successful authentication; see the + * wpa_supplicant documentation for more details. + **/ /* ---ifcfg-rh--- - * property: phase2-autheap - * variable: IEEE_8021X_INNER_AUTH_METHODS(+) - * values: "EAP-MD5", "EAP-MSCHAPV2", "EAP-GTC", "EAP-OTP" and "EAP-TLS" - * description: Inner EAP-based authentication methods. Note that - * IEEE_8021X_INNER_AUTH_METHODS is also used for 'phase2-auth' values. - * example: IEEE_8021X_INNER_AUTH_METHODS="MSCHAPV2 EAP-TLS" - * ---end--- - */ + * property: phase2-autheap + * variable: IEEE_8021X_INNER_AUTH_METHODS(+) + * values: "EAP-MD5", "EAP-MSCHAPV2", "EAP-GTC", "EAP-OTP" and "EAP-TLS" + * description: Inner EAP-based authentication methods. Note that + * IEEE_8021X_INNER_AUTH_METHODS is also used for 'phase2-auth' values. + * example: IEEE_8021X_INNER_AUTH_METHODS="MSCHAPV2 EAP-TLS" + * ---end--- + */ obj_properties[PROP_PHASE2_AUTHEAP] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_AUTHEAP, "", @@ -4048,27 +4048,27 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-ca-cert: - * - * Contains the "phase 2" CA certificate if used by the EAP method specified - * in the #NMSetting8021x:phase2-auth or #NMSetting8021x:phase2-autheap - * properties. - * - * Certificate data is specified using a "scheme"; three are currently - * supported: blob, path and pkcs#11 URL. When using the blob scheme this property - * should be set to the certificate's DER encoded data. When using the path - * scheme, this property should be set to the full UTF-8 encoded path of the - * certificate, prefixed with the string "file://" and ending with a terminating - * NUL byte. - * This property can be unset even if the EAP method supports CA certificates, - * but this allows man-in-the-middle attacks and is NOT recommended. - * - * Note that enabling NMSetting8021x:system-ca-certs will override this - * setting to use the built-in path, if the built-in path is not a directory. - * - * Setting this property directly is discouraged; use the - * nm_setting_802_1x_set_phase2_ca_cert() function instead. - **/ + * NMSetting8021x:phase2-ca-cert: + * + * Contains the "phase 2" CA certificate if used by the EAP method specified + * in the #NMSetting8021x:phase2-auth or #NMSetting8021x:phase2-autheap + * properties. + * + * Certificate data is specified using a "scheme"; three are currently + * supported: blob, path and pkcs#11 URL. When using the blob scheme this property + * should be set to the certificate's DER encoded data. When using the path + * scheme, this property should be set to the full UTF-8 encoded path of the + * certificate, prefixed with the string "file://" and ending with a terminating + * NUL byte. + * This property can be unset even if the EAP method supports CA certificates, + * but this allows man-in-the-middle attacks and is NOT recommended. + * + * Note that enabling NMSetting8021x:system-ca-certs will override this + * setting to use the built-in path, if the built-in path is not a directory. + * + * Setting this property directly is discouraged; use the + * nm_setting_802_1x_set_phase2_ca_cert() function instead. + **/ obj_properties[PROP_PHASE2_CA_CERT] = g_param_spec_boxed(NM_SETTING_802_1X_PHASE2_CA_CERT, "", @@ -4077,17 +4077,17 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-ca-cert-password: - * - * The password used to access the "phase2" CA certificate stored in - * #NMSetting8021x:phase2-ca-cert property. Only makes sense if the certificate - * is stored on a PKCS#<!-- -->11 token that requires a login. - * - * Since: 1.8 - **/ + * NMSetting8021x:phase2-ca-cert-password: + * + * The password used to access the "phase2" CA certificate stored in + * #NMSetting8021x:phase2-ca-cert property. Only makes sense if the certificate + * is stored on a PKCS#<!-- -->11 token that requires a login. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_PHASE2_CA_CERT_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD, "", @@ -4096,15 +4096,15 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-ca-cert-password-flags: - * - * Flags indicating how to handle the #NMSetting8021x:phase2-ca-cert-password property. - * - * Since: 1.8 - **/ + * NMSetting8021x:phase2-ca-cert-password-flags: + * + * Flags indicating how to handle the #NMSetting8021x:phase2-ca-cert-password property. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_PHASE2_CA_CERT_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS, "", @@ -4114,21 +4114,21 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-ca-path: - * - * UTF-8 encoded path to a directory containing PEM or DER formatted - * certificates to be added to the verification chain in addition to the - * certificate specified in the #NMSetting8021x:phase2-ca-cert property. - * - * If NMSetting8021x:system-ca-certs is enabled and the built-in CA - * path is an existing directory, then this setting is ignored. - **/ + * NMSetting8021x:phase2-ca-path: + * + * UTF-8 encoded path to a directory containing PEM or DER formatted + * certificates to be added to the verification chain in addition to the + * certificate specified in the #NMSetting8021x:phase2-ca-cert property. + * + * If NMSetting8021x:system-ca-certs is enabled and the built-in CA + * path is an existing directory, then this setting is ignored. + **/ /* ---ifcfg-rh--- - * property: phase2-ca-path - * variable: IEEE_8021X_PHASE2_CA_PATH(+) - * description: The search path for the certificate. - * ---end--- - */ + * property: phase2-ca-path + * variable: IEEE_8021X_PHASE2_CA_PATH(+) + * description: The search path for the certificate. + * ---end--- + */ obj_properties[PROP_PHASE2_CA_PATH] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_CA_PATH, "", @@ -4137,22 +4137,22 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-subject-match: - * - * Substring to be matched against the subject of the certificate presented - * by the authentication server during the inner "phase 2" - * authentication. When unset, no verification of the authentication server - * certificate's subject is performed. This property provides little security, - * if any, and its use is deprecated in favor of - * NMSetting8021x:phase2-domain-suffix-match. - **/ + * NMSetting8021x:phase2-subject-match: + * + * Substring to be matched against the subject of the certificate presented + * by the authentication server during the inner "phase 2" + * authentication. When unset, no verification of the authentication server + * certificate's subject is performed. This property provides little security, + * if any, and its use is deprecated in favor of + * NMSetting8021x:phase2-domain-suffix-match. + **/ /* ---ifcfg-rh--- - * property: phase2-subject-match - * variable: IEEE_8021X_PHASE2_SUBJECT_MATCH(+) - * description: Substring to match subject of server certificate against. - * example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat" - * ---end--- - */ + * property: phase2-subject-match + * variable: IEEE_8021X_PHASE2_SUBJECT_MATCH(+) + * description: Substring to match subject of server certificate against. + * example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat" + * ---end--- + */ obj_properties[PROP_PHASE2_SUBJECT_MATCH] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, "", @@ -4161,18 +4161,18 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-altsubject-matches: - * - * List of strings to be matched against the altSubjectName of the - * certificate presented by the authentication server during the inner - * "phase 2" authentication. If the list is empty, no verification of the - * server certificate's altSubjectName is performed. - **/ + * NMSetting8021x:phase2-altsubject-matches: + * + * List of strings to be matched against the altSubjectName of the + * certificate presented by the authentication server during the inner + * "phase 2" authentication. If the list is empty, no verification of the + * server certificate's altSubjectName is performed. + **/ /* ---ifcfg-rh--- - * property: phase2-altsubject-matches - * variable: IEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+) - * ---end--- - */ + * property: phase2-altsubject-matches + * variable: IEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+) + * ---end--- + */ obj_properties[PROP_PHASE2_ALTSUBJECT_MATCHES] = g_param_spec_boxed(NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, "", @@ -4181,25 +4181,25 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-domain-suffix-match: - * - * Constraint for server domain name. If set, this FQDN is used as a suffix - * match requirement for dNSName element(s) of the certificate presented by - * the authentication server during the inner "phase 2" authentication. If - * a matching dNSName is found, this constraint is met. If no dNSName - * values are present, this constraint is matched against SubjectName CN - * using same suffix match comparison. - * Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited - * list. - * - * Since: 1.2 - **/ + * NMSetting8021x:phase2-domain-suffix-match: + * + * Constraint for server domain name. If set, this FQDN is used as a suffix + * match requirement for dNSName element(s) of the certificate presented by + * the authentication server during the inner "phase 2" authentication. If + * a matching dNSName is found, this constraint is met. If no dNSName + * values are present, this constraint is matched against SubjectName CN + * using same suffix match comparison. + * Since version 1.24, multiple valid FQDNs can be passed as a ";" delimited + * list. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: phase2-domain-suffix-match - * description: Suffix to match domain of server certificate for phase 2 against. - * variable: IEEE_8021X_PHASE2_DOMAIN_SUFFIX_MATCH(+) - * ---end--- - */ + * property: phase2-domain-suffix-match + * description: Suffix to match domain of server certificate for phase 2 against. + * variable: IEEE_8021X_PHASE2_DOMAIN_SUFFIX_MATCH(+) + * ---end--- + */ obj_properties[PROP_PHASE2_DOMAIN_SUFFIX_MATCH] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH, "", @@ -4208,24 +4208,24 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-domain-match: - * - * Constraint for server domain name. If set, this list of FQDNs is used as - * a match requirement for dNSName element(s) of the certificate presented - * by the authentication server during the inner "phase 2" authentication. - * If a matching dNSName is found, this constraint is met. If no dNSName - * values are present, this constraint is matched against SubjectName CN - * using the same comparison. - * Multiple valid FQDNs can be passed as a ";" delimited list. - * - * Since: 1.24 - **/ + * NMSetting8021x:phase2-domain-match: + * + * Constraint for server domain name. If set, this list of FQDNs is used as + * a match requirement for dNSName element(s) of the certificate presented + * by the authentication server during the inner "phase 2" authentication. + * If a matching dNSName is found, this constraint is met. If no dNSName + * values are present, this constraint is matched against SubjectName CN + * using the same comparison. + * Multiple valid FQDNs can be passed as a ";" delimited list. + * + * Since: 1.24 + **/ /* ---ifcfg-rh--- - * property: phase2-domain-match - * description: Value to match domain of server certificate for phase 2 against. - * variable: IEEE_8021X_PHASE2_DOMAIN_MATCH(+) - * ---end--- - */ + * property: phase2-domain-match + * description: Value to match domain of server certificate for phase 2 against. + * variable: IEEE_8021X_PHASE2_DOMAIN_MATCH(+) + * ---end--- + */ obj_properties[PROP_PHASE2_DOMAIN_MATCH] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_DOMAIN_MATCH, "", @@ -4234,31 +4234,31 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-client-cert: - * - * Contains the "phase 2" client certificate if used by the EAP method - * specified in the #NMSetting8021x:phase2-auth or - * #NMSetting8021x:phase2-autheap properties. - * - * Certificate data is specified using a "scheme"; two are currently - * supported: blob and path. When using the blob scheme (which is backwards - * compatible with NM 0.7.x) this property should be set to the - * certificate's DER encoded data. When using the path scheme, this property - * should be set to the full UTF-8 encoded path of the certificate, prefixed - * with the string "file://" and ending with a terminating NUL byte. This - * property can be unset even if the EAP method supports CA certificates, - * but this allows man-in-the-middle attacks and is NOT recommended. - * - * Setting this property directly is discouraged; use the - * nm_setting_802_1x_set_phase2_client_cert() function instead. - **/ + * NMSetting8021x:phase2-client-cert: + * + * Contains the "phase 2" client certificate if used by the EAP method + * specified in the #NMSetting8021x:phase2-auth or + * #NMSetting8021x:phase2-autheap properties. + * + * Certificate data is specified using a "scheme"; two are currently + * supported: blob and path. When using the blob scheme (which is backwards + * compatible with NM 0.7.x) this property should be set to the + * certificate's DER encoded data. When using the path scheme, this property + * should be set to the full UTF-8 encoded path of the certificate, prefixed + * with the string "file://" and ending with a terminating NUL byte. This + * property can be unset even if the EAP method supports CA certificates, + * but this allows man-in-the-middle attacks and is NOT recommended. + * + * Setting this property directly is discouraged; use the + * nm_setting_802_1x_set_phase2_client_cert() function instead. + **/ /* ---ifcfg-rh--- - * property: phase2-client-cert - * variable: IEEE_8021X_INNER_CLIENT_CERT(+) - * description: Client certificate for inner EAP method. - * example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crt - * ---end--- - */ + * property: phase2-client-cert + * variable: IEEE_8021X_INNER_CLIENT_CERT(+) + * description: Client certificate for inner EAP method. + * example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crt + * ---end--- + */ obj_properties[PROP_PHASE2_CLIENT_CERT] = g_param_spec_boxed(NM_SETTING_802_1X_PHASE2_CLIENT_CERT, "", @@ -4267,17 +4267,17 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-client-cert-password: - * - * The password used to access the "phase2" client certificate stored in - * #NMSetting8021x:phase2-client-cert property. Only makes sense if the certificate - * is stored on a PKCS#<!-- -->11 token that requires a login. - * - * Since: 1.8 - **/ + * NMSetting8021x:phase2-client-cert-password: + * + * The password used to access the "phase2" client certificate stored in + * #NMSetting8021x:phase2-client-cert property. Only makes sense if the certificate + * is stored on a PKCS#<!-- -->11 token that requires a login. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_PHASE2_CLIENT_CERT_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD, "", @@ -4286,15 +4286,15 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-client-cert-password-flags: - * - * Flags indicating how to handle the #NMSetting8021x:phase2-client-cert-password property. - * - * Since: 1.8 - **/ + * NMSetting8021x:phase2-client-cert-password-flags: + * + * Flags indicating how to handle the #NMSetting8021x:phase2-client-cert-password property. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * ---end--- - */ + * ---end--- + */ obj_properties[PROP_PHASE2_CLIENT_CERT_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS, "", @@ -4304,19 +4304,19 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:password: - * - * UTF-8 encoded password used for EAP authentication methods. If both the - * #NMSetting8021x:password property and the #NMSetting8021x:password-raw - * property are specified, #NMSetting8021x:password is preferred. - **/ + * NMSetting8021x:password: + * + * UTF-8 encoded password used for EAP authentication methods. If both the + * #NMSetting8021x:password property and the #NMSetting8021x:password-raw + * property are specified, #NMSetting8021x:password is preferred. + **/ /* ---ifcfg-rh--- - * property: password - * variable: IEEE_8021X_PASSWORD(+) - * description: UTF-8 encoded password used for EAP. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ + * property: password + * variable: IEEE_8021X_PASSWORD(+) + * description: UTF-8 encoded password used for EAP. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ obj_properties[PROP_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_PASSWORD, "", @@ -4325,17 +4325,17 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:password-flags: - * - * Flags indicating how to handle the #NMSetting8021x:password property. - **/ + * NMSetting8021x:password-flags: + * + * Flags indicating how to handle the #NMSetting8021x:password property. + **/ /* ---ifcfg-rh--- - * property: password-flags - * variable: IEEE_8021X_PASSWORD_FLAGS(+) - * format: NMSettingSecretFlags - * description: Password flags for IEEE_8021X_PASSWORD password. - * ---end--- - */ + * property: password-flags + * variable: IEEE_8021X_PASSWORD_FLAGS(+) + * format: NMSettingSecretFlags + * description: Password flags for IEEE_8021X_PASSWORD password. + * ---end--- + */ obj_properties[PROP_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PASSWORD_FLAGS, "", @@ -4345,21 +4345,21 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:password-raw: - * - * Password used for EAP authentication methods, given as a byte array to - * allow passwords in other encodings than UTF-8 to be used. If both the - * #NMSetting8021x:password property and the #NMSetting8021x:password-raw - * property are specified, #NMSetting8021x:password is preferred. - **/ + * NMSetting8021x:password-raw: + * + * Password used for EAP authentication methods, given as a byte array to + * allow passwords in other encodings than UTF-8 to be used. If both the + * #NMSetting8021x:password property and the #NMSetting8021x:password-raw + * property are specified, #NMSetting8021x:password is preferred. + **/ /* ---ifcfg-rh--- - * property: password-raw - * variable: IEEE_8021X_PASSWORD_RAW(+) - * description: password used for EAP, encoded as a hexadecimal string. It - * can also go to "key-" lookaside file. - * example: IEEE_8021X_PASSWORD_RAW=041c8320083aa4bf - * ---end--- - */ + * property: password-raw + * variable: IEEE_8021X_PASSWORD_RAW(+) + * description: password used for EAP, encoded as a hexadecimal string. It + * can also go to "key-" lookaside file. + * example: IEEE_8021X_PASSWORD_RAW=041c8320083aa4bf + * ---end--- + */ obj_properties[PROP_PASSWORD_RAW] = g_param_spec_boxed(NM_SETTING_802_1X_PASSWORD_RAW, "", @@ -4368,16 +4368,16 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:password-raw-flags: - * - * Flags indicating how to handle the #NMSetting8021x:password-raw property. - **/ + * NMSetting8021x:password-raw-flags: + * + * Flags indicating how to handle the #NMSetting8021x:password-raw property. + **/ /* ---ifcfg-rh--- - * property: password-raw-flags - * variable: IEEE_8021X_PASSWORD_RAW_FLAGS(+) - * description: The secret flags for password-raw. - * ---end--- - */ + * property: password-raw-flags + * variable: IEEE_8021X_PASSWORD_RAW_FLAGS(+) + * description: The secret flags for password-raw. + * ---end--- + */ obj_properties[PROP_PASSWORD_RAW_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, "", @@ -4387,43 +4387,43 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:private-key: - * - * Contains the private key when the #NMSetting8021x:eap property is set to - * "tls". - * - * Key data is specified using a "scheme"; two are currently supported: blob - * and path. When using the blob scheme and private keys, this property - * should be set to the key's encrypted PEM encoded data. When using private - * keys with the path scheme, this property should be set to the full UTF-8 - * encoded path of the key, prefixed with the string "file://" and ending - * with a terminating NUL byte. When using PKCS#<!-- -->12 format private - * keys and the blob scheme, this property should be set to the - * PKCS#<!-- -->12 data and the #NMSetting8021x:private-key-password - * property must be set to password used to decrypt the PKCS#<!-- -->12 - * certificate and key. When using PKCS#<!-- -->12 files and the path - * scheme, this property should be set to the full UTF-8 encoded path of the - * key, prefixed with the string "file://" and ending with a terminating - * NUL byte, and as with the blob scheme the "private-key-password" property - * must be set to the password used to decode the PKCS#<!-- -->12 private - * key and certificate. - * - * Setting this property directly is discouraged; use the - * nm_setting_802_1x_set_private_key() function instead. - * - * WARNING: #NMSetting8021x:private-key is not a "secret" property, and thus - * unencrypted private key data using the BLOB scheme may be readable by - * unprivileged users. Private keys should always be encrypted with a - * private key password to prevent unauthorized access to unencrypted - * private key data. - **/ + * NMSetting8021x:private-key: + * + * Contains the private key when the #NMSetting8021x:eap property is set to + * "tls". + * + * Key data is specified using a "scheme"; two are currently supported: blob + * and path. When using the blob scheme and private keys, this property + * should be set to the key's encrypted PEM encoded data. When using private + * keys with the path scheme, this property should be set to the full UTF-8 + * encoded path of the key, prefixed with the string "file://" and ending + * with a terminating NUL byte. When using PKCS#<!-- -->12 format private + * keys and the blob scheme, this property should be set to the + * PKCS#<!-- -->12 data and the #NMSetting8021x:private-key-password + * property must be set to password used to decrypt the PKCS#<!-- -->12 + * certificate and key. When using PKCS#<!-- -->12 files and the path + * scheme, this property should be set to the full UTF-8 encoded path of the + * key, prefixed with the string "file://" and ending with a terminating + * NUL byte, and as with the blob scheme the "private-key-password" property + * must be set to the password used to decode the PKCS#<!-- -->12 private + * key and certificate. + * + * Setting this property directly is discouraged; use the + * nm_setting_802_1x_set_private_key() function instead. + * + * WARNING: #NMSetting8021x:private-key is not a "secret" property, and thus + * unencrypted private key data using the BLOB scheme may be readable by + * unprivileged users. Private keys should always be encrypted with a + * private key password to prevent unauthorized access to unencrypted + * private key data. + **/ /* ---ifcfg-rh--- - * property: private-key - * variable: IEEE_8021X_PRIVATE_KEY(+) - * description: Private key for EAP-TLS. - * example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12 - * ---end--- - */ + * property: private-key + * variable: IEEE_8021X_PRIVATE_KEY(+) + * description: Private key for EAP-TLS. + * example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12 + * ---end--- + */ obj_properties[PROP_PRIVATE_KEY] = g_param_spec_boxed(NM_SETTING_802_1X_PRIVATE_KEY, "", @@ -4432,22 +4432,22 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:private-key-password: - * - * The password used to decrypt the private key specified in the - * #NMSetting8021x:private-key property when the private key either uses the - * path scheme, or if the private key is a PKCS#<!-- -->12 format key. Setting this - * property directly is not generally necessary except when returning - * secrets to NetworkManager; it is generally set automatically when setting - * the private key by the nm_setting_802_1x_set_private_key() function. - **/ + * NMSetting8021x:private-key-password: + * + * The password used to decrypt the private key specified in the + * #NMSetting8021x:private-key property when the private key either uses the + * path scheme, or if the private key is a PKCS#<!-- -->12 format key. Setting this + * property directly is not generally necessary except when returning + * secrets to NetworkManager; it is generally set automatically when setting + * the private key by the nm_setting_802_1x_set_private_key() function. + **/ /* ---ifcfg-rh--- - * property: private-key-password - * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD(+) - * description: Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ + * property: private-key-password + * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD(+) + * description: Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ obj_properties[PROP_PRIVATE_KEY_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, "", @@ -4456,18 +4456,18 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:private-key-password-flags: - * - * Flags indicating how to handle the #NMSetting8021x:private-key-password - * property. - **/ + * NMSetting8021x:private-key-password-flags: + * + * Flags indicating how to handle the #NMSetting8021x:private-key-password + * property. + **/ /* ---ifcfg-rh--- - * property: private-key-password-flags - * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+) - * format: NMSettingSecretFlags - * description: Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. - * ---end--- - */ + * property: private-key-password-flags + * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+) + * format: NMSettingSecretFlags + * description: Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. + * ---end--- + */ obj_properties[PROP_PRIVATE_KEY_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, "", @@ -4477,37 +4477,37 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-private-key: - * - * Contains the "phase 2" inner private key when the - * #NMSetting8021x:phase2-auth or #NMSetting8021x:phase2-autheap property is - * set to "tls". - * - * Key data is specified using a "scheme"; two are currently supported: blob - * and path. When using the blob scheme and private keys, this property - * should be set to the key's encrypted PEM encoded data. When using private - * keys with the path scheme, this property should be set to the full UTF-8 - * encoded path of the key, prefixed with the string "file://" and ending - * with a terminating NUL byte. When using PKCS#<!-- -->12 format private - * keys and the blob scheme, this property should be set to the - * PKCS#<!-- -->12 data and the #NMSetting8021x:phase2-private-key-password - * property must be set to password used to decrypt the PKCS#<!-- -->12 - * certificate and key. When using PKCS#<!-- -->12 files and the path - * scheme, this property should be set to the full UTF-8 encoded path of the - * key, prefixed with the string "file://" and ending with a terminating - * NUL byte, and as with the blob scheme the - * #NMSetting8021x:phase2-private-key-password property must be set to the - * password used to decode the PKCS#<!-- -->12 private key and certificate. - * - * Setting this property directly is discouraged; use the - * nm_setting_802_1x_set_phase2_private_key() function instead. - **/ + * NMSetting8021x:phase2-private-key: + * + * Contains the "phase 2" inner private key when the + * #NMSetting8021x:phase2-auth or #NMSetting8021x:phase2-autheap property is + * set to "tls". + * + * Key data is specified using a "scheme"; two are currently supported: blob + * and path. When using the blob scheme and private keys, this property + * should be set to the key's encrypted PEM encoded data. When using private + * keys with the path scheme, this property should be set to the full UTF-8 + * encoded path of the key, prefixed with the string "file://" and ending + * with a terminating NUL byte. When using PKCS#<!-- -->12 format private + * keys and the blob scheme, this property should be set to the + * PKCS#<!-- -->12 data and the #NMSetting8021x:phase2-private-key-password + * property must be set to password used to decrypt the PKCS#<!-- -->12 + * certificate and key. When using PKCS#<!-- -->12 files and the path + * scheme, this property should be set to the full UTF-8 encoded path of the + * key, prefixed with the string "file://" and ending with a terminating + * NUL byte, and as with the blob scheme the + * #NMSetting8021x:phase2-private-key-password property must be set to the + * password used to decode the PKCS#<!-- -->12 private key and certificate. + * + * Setting this property directly is discouraged; use the + * nm_setting_802_1x_set_phase2_private_key() function instead. + **/ /* ---ifcfg-rh--- - * property: phase2-private-key - * variable: IEEE_8021X_INNER_PRIVATE_KEY(+) - * description: Private key for inner authentication method for EAP-TLS. - * ---end--- - */ + * property: phase2-private-key + * variable: IEEE_8021X_INNER_PRIVATE_KEY(+) + * description: Private key for inner authentication method for EAP-TLS. + * ---end--- + */ obj_properties[PROP_PHASE2_PRIVATE_KEY] = g_param_spec_boxed(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, "", @@ -4516,23 +4516,23 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-private-key-password: - * - * The password used to decrypt the "phase 2" private key specified in the - * #NMSetting8021x:phase2-private-key property when the private key either - * uses the path scheme, or is a PKCS#<!-- -->12 format key. Setting this - * property directly is not generally necessary except when returning - * secrets to NetworkManager; it is generally set automatically when setting - * the private key by the nm_setting_802_1x_set_phase2_private_key() - * function. - **/ + * NMSetting8021x:phase2-private-key-password: + * + * The password used to decrypt the "phase 2" private key specified in the + * #NMSetting8021x:phase2-private-key property when the private key either + * uses the path scheme, or is a PKCS#<!-- -->12 format key. Setting this + * property directly is not generally necessary except when returning + * secrets to NetworkManager; it is generally set automatically when setting + * the private key by the nm_setting_802_1x_set_phase2_private_key() + * function. + **/ /* ---ifcfg-rh--- - * property: phase2-private-key-password - * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+) - * description: Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ + * property: phase2-private-key-password + * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+) + * description: Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ obj_properties[PROP_PHASE2_PRIVATE_KEY_PASSWORD] = g_param_spec_string(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, "", @@ -4541,18 +4541,18 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:phase2-private-key-password-flags: - * - * Flags indicating how to handle the - * #NMSetting8021x:phase2-private-key-password property. - **/ + * NMSetting8021x:phase2-private-key-password-flags: + * + * Flags indicating how to handle the + * #NMSetting8021x:phase2-private-key-password property. + **/ /* ---ifcfg-rh--- - * property: phase2-private-key-password-flags - * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+) - * format: NMSettingSecretFlags - * description: Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. - * ---end--- - */ + * property: phase2-private-key-password-flags + * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+) + * format: NMSettingSecretFlags + * description: Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. + * ---end--- + */ obj_properties[PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, "", @@ -4562,16 +4562,16 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:pin: - * - * PIN used for EAP authentication methods. - **/ + * NMSetting8021x:pin: + * + * PIN used for EAP authentication methods. + **/ /* ---ifcfg-rh--- - * property: pin - * variable: IEEE_8021X_PIN(+) - * description: The pin secret used for EAP authentication methods. - * ---end--- - */ + * property: pin + * variable: IEEE_8021X_PIN(+) + * description: The pin secret used for EAP authentication methods. + * ---end--- + */ obj_properties[PROP_PIN] = g_param_spec_string(NM_SETTING_802_1X_PIN, "", @@ -4580,16 +4580,16 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:pin-flags: - * - * Flags indicating how to handle the #NMSetting8021x:pin property. - **/ + * NMSetting8021x:pin-flags: + * + * Flags indicating how to handle the #NMSetting8021x:pin property. + **/ /* ---ifcfg-rh--- - * property: pin-flags - * variable: IEEE_8021X_PIN_FLAGS(+) - * description: The secret flags for the pin property. - * ---end--- - */ + * property: pin-flags + * variable: IEEE_8021X_PIN_FLAGS(+) + * description: The secret flags for the pin property. + * ---end--- + */ obj_properties[PROP_PIN_FLAGS] = g_param_spec_flags(NM_SETTING_802_1X_PIN_FLAGS, "", "", @@ -4598,24 +4598,24 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:system-ca-certs: - * - * When %TRUE, overrides the #NMSetting8021x:ca-path and - * #NMSetting8021x:phase2-ca-path properties using the system CA directory - * specified at configure time with the --system-ca-path switch. The - * certificates in this directory are added to the verification chain in - * addition to any certificates specified by the #NMSetting8021x:ca-cert and - * #NMSetting8021x:phase2-ca-cert properties. If the path provided with - * --system-ca-path is rather a file name (bundle of trusted CA certificates), - * it overrides #NMSetting8021x:ca-cert and #NMSetting8021x:phase2-ca-cert - * properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant). - **/ + * NMSetting8021x:system-ca-certs: + * + * When %TRUE, overrides the #NMSetting8021x:ca-path and + * #NMSetting8021x:phase2-ca-path properties using the system CA directory + * specified at configure time with the --system-ca-path switch. The + * certificates in this directory are added to the verification chain in + * addition to any certificates specified by the #NMSetting8021x:ca-cert and + * #NMSetting8021x:phase2-ca-cert properties. If the path provided with + * --system-ca-path is rather a file name (bundle of trusted CA certificates), + * it overrides #NMSetting8021x:ca-cert and #NMSetting8021x:phase2-ca-cert + * properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant). + **/ /* ---ifcfg-rh--- - * property: system-ca-certs - * variable: IEEE_8021X_SYSTEM_CA_CERTS(+) - * description: a boolean value. - * ---end--- - */ + * property: system-ca-certs + * variable: IEEE_8021X_SYSTEM_CA_CERTS(+) + * description: a boolean value. + * ---end--- + */ obj_properties[PROP_SYSTEM_CA_CERTS] = g_param_spec_boolean(NM_SETTING_802_1X_SYSTEM_CA_CERTS, "", @@ -4624,20 +4624,20 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:auth-timeout: - * - * A timeout for the authentication. Zero means the global default; if the - * global default is not set, the authentication timeout is 25 seconds. - * - * Since: 1.8 - **/ + * NMSetting8021x:auth-timeout: + * + * A timeout for the authentication. Zero means the global default; if the + * global default is not set, the authentication timeout is 25 seconds. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * property: auth-timeout - * variable: IEEE_8021X_AUTH_TIMEOUT(+) - * default: 0 - * description: Timeout in seconds for the 802.1X authentication. Zero means the global default or 25. - * ---end--- - */ + * property: auth-timeout + * variable: IEEE_8021X_AUTH_TIMEOUT(+) + * default: 0 + * description: Timeout in seconds for the 802.1X authentication. Zero means the global default or 25. + * ---end--- + */ obj_properties[PROP_AUTH_TIMEOUT] = g_param_spec_int( NM_SETTING_802_1X_AUTH_TIMEOUT, "", @@ -4648,23 +4648,23 @@ nm_setting_802_1x_class_init(NMSetting8021xClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSetting8021x:optional: - * - * Whether the 802.1X authentication is optional. If %TRUE, the activation - * will continue even after a timeout or an authentication failure. Setting - * the property to %TRUE is currently allowed only for Ethernet connections. - * If set to %FALSE, the activation can continue only after a successful - * authentication. - * - * Since: 1.22 - **/ + * NMSetting8021x:optional: + * + * Whether the 802.1X authentication is optional. If %TRUE, the activation + * will continue even after a timeout or an authentication failure. Setting + * the property to %TRUE is currently allowed only for Ethernet connections. + * If set to %FALSE, the activation can continue only after a successful + * authentication. + * + * Since: 1.22 + **/ /* ---ifcfg-rh--- - * property: optional - * variable: IEEE_8021X_OPTIONAL(+) - * default=no - * description: whether the 802.1X authentication is optional - * ---end--- - */ + * property: optional + * variable: IEEE_8021X_OPTIONAL(+) + * default=no + * description: whether the 802.1X authentication is optional + * ---end--- + */ obj_properties[PROP_OPTIONAL] = g_param_spec_boolean(NM_SETTING_802_1X_OPTIONAL, "", diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c index dc853554f5..37b9d6a292 100644 --- a/libnm-core/nm-setting-adsl.c +++ b/libnm-core/nm-setting-adsl.c @@ -349,10 +349,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) setting_class->need_secrets = need_secrets; /** - * NMSettingAdsl:username: - * - * Username used to authenticate with the ADSL service. - **/ + * NMSettingAdsl:username: + * + * Username used to authenticate with the ADSL service. + **/ obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_ADSL_USERNAME, "", "", @@ -360,10 +360,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingAdsl:password: - * - * Password used to authenticate with the ADSL service. - **/ + * NMSettingAdsl:password: + * + * Password used to authenticate with the ADSL service. + **/ obj_properties[PROP_PASSWORD] = g_param_spec_string(NM_SETTING_ADSL_PASSWORD, "", @@ -372,10 +372,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingAdsl:password-flags: - * - * Flags indicating how to handle the #NMSettingAdsl:password property. - **/ + * 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, "", @@ -385,10 +385,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingAdsl:protocol: - * - * ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm". - **/ + * NMSettingAdsl:protocol: + * + * ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm". + **/ obj_properties[PROP_PROTOCOL] = g_param_spec_string(NM_SETTING_ADSL_PROTOCOL, "", "", @@ -396,10 +396,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingAdsl:encapsulation: - * - * Encapsulation of ADSL connection. Can be "vcmux" or "llc". - **/ + * NMSettingAdsl:encapsulation: + * + * Encapsulation of ADSL connection. Can be "vcmux" or "llc". + **/ obj_properties[PROP_ENCAPSULATION] = g_param_spec_string(NM_SETTING_ADSL_ENCAPSULATION, "", @@ -408,10 +408,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingAdsl:vpi: - * - * VPI of ADSL connection - **/ + * NMSettingAdsl:vpi: + * + * VPI of ADSL connection + **/ obj_properties[PROP_VPI] = g_param_spec_uint(NM_SETTING_ADSL_VPI, "", "", @@ -421,10 +421,10 @@ nm_setting_adsl_class_init(NMSettingAdslClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingAdsl:vci: - * - * VCI of ADSL connection - **/ + * NMSettingAdsl:vci: + * + * VCI of ADSL connection + **/ obj_properties[PROP_VCI] = g_param_spec_uint(NM_SETTING_ADSL_VCI, "", "", diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c index 47a354e6ad..617f3adef2 100644 --- a/libnm-core/nm-setting-bluetooth.c +++ b/libnm-core/nm-setting-bluetooth.c @@ -142,9 +142,9 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (!gsm && !cdma) { /* We can't return MISSING_SETTING here, because we don't know - * whether to prefix the message with NM_SETTING_GSM_SETTING_NAME or - * NM_SETTING_CDMA_SETTING_NAME. - */ + * whether to prefix the message with NM_SETTING_GSM_SETTING_NAME or + * NM_SETTING_CDMA_SETTING_NAME. + */ g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING, @@ -157,8 +157,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } } /* PANU doesn't need a 'type' setting since no further configuration - * is required at the interface level. - */ + * is required at the interface level. + */ /* NAP mode needs a bridge setting, and a bridge needs a name. */ if (nm_streq(type, NM_SETTING_BLUETOOTH_TYPE_NAP)) { @@ -296,10 +296,10 @@ nm_setting_bluetooth_class_init(NMSettingBluetoothClass *klass) setting_class->verify = verify; /** - * NMSettingBluetooth:bdaddr: - * - * The Bluetooth address of the device. - **/ + * NMSettingBluetooth:bdaddr: + * + * The Bluetooth address of the device. + **/ obj_properties[PROP_BDADDR] = g_param_spec_string( NM_SETTING_BLUETOOTH_BDADDR, "", @@ -311,11 +311,11 @@ nm_setting_bluetooth_class_init(NMSettingBluetoothClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingBluetooth:type: - * - * Either "dun" for Dial-Up Networking connections or "panu" for Personal - * Area Networking connections to devices supporting the NAP profile. - **/ + * NMSettingBluetooth:type: + * + * Either "dun" for Dial-Up Networking connections or "panu" for Personal + * Area Networking connections to devices supporting the NAP profile. + **/ obj_properties[PROP_TYPE] = g_param_spec_string(NM_SETTING_BLUETOOTH_TYPE, "", "", diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 6bebb4a885..f8d72458a7 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -279,7 +279,7 @@ _bond_get_option_normalized(NMSettingBond *self, const char *option, gboolean ge if (mode == NM_BOND_MODE_UNKNOWN) { /* the mode is unknown, consequently, there is no normalized/default - * value either. */ + * value either. */ return NULL; } @@ -294,7 +294,7 @@ _bond_get_option_normalized(NMSettingBond *self, const char *option, gboolean ge int miimon; /* if arp_interval is explicitly set and miimon is not, then disable miimon - * (and related updelay and downdelay) as recommended by the kernel docs */ + * (and related updelay and downdelay) as recommended by the kernel docs */ miimon = _nm_utils_ascii_str_to_int64(_bond_get_option(self, NM_SETTING_BOND_OPTION_MIIMON), 10, @@ -317,7 +317,7 @@ _bond_get_option_normalized(NMSettingBond *self, const char *option, gboolean ge value = _bond_get_option(self, NM_SETTING_BOND_OPTION_NUM_UNSOL_NA); } else if (NM_IN_STRSET(option, NM_SETTING_BOND_OPTION_ACTIVE_SLAVE)) { /* "active_slave" is deprecated, and an alias for "primary". The property - * itself always normalizes to %NULL. */ + * itself always normalizes to %NULL. */ value = NULL; } else if (NM_IN_STRSET(option, NM_SETTING_BOND_OPTION_PRIMARY)) { /* "active_slave" is deprecated, and an alias for "primary". */ @@ -798,14 +798,14 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) num_unsol_na = _atoi(_bond_get_option_or_default(self, NM_SETTING_BOND_OPTION_NUM_UNSOL_NA)); /* Option restrictions: - * - * arp_interval conflicts [ alb, tlb ] - * arp_interval needs arp_ip_target - * arp_validate does not work with [ BOND_MODE_8023AD, BOND_MODE_TLB, BOND_MODE_ALB ] - * downdelay needs miimon - * updelay needs miimon - * primary needs [ active-backup, tlb, alb ] - */ + * + * arp_interval conflicts [ alb, tlb ] + * arp_interval needs arp_ip_target + * arp_validate does not work with [ BOND_MODE_8023AD, BOND_MODE_TLB, BOND_MODE_ALB ] + * downdelay needs miimon + * updelay needs miimon + * primary needs [ active-backup, tlb, alb ] + */ /* Verify bond mode */ mode_str = _bond_get_option(self, NM_SETTING_BOND_OPTION_MODE); @@ -913,8 +913,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } /* arp_ip_target can only be used with arp_interval, and must - * contain a comma-separated list of IPv4 addresses. - */ + * contain a comma-separated list of IPv4 addresses. + */ arp_ip_target = _bond_get_option(self, NM_SETTING_BOND_OPTION_ARP_IP_TARGET); if (arp_interval > 0) { if (!arp_ip_target) { @@ -1017,10 +1017,10 @@ options_equal_asym(NMSettingBond *s_bond, NMSettingBond *s_bond2, NMSettingCompa while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &value)) { if (NM_FLAGS_HAS(flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) { /* when doing an inferrable match, the active-slave should be ignored - * as it might be differ from the setting in the connection. - * - * Also, the fail_over_mac setting can change, see for example - * https://bugzilla.redhat.com/show_bug.cgi?id=1375558#c8 */ + * as it might be differ from the setting in the connection. + * + * Also, the fail_over_mac setting can change, see for example + * https://bugzilla.redhat.com/show_bug.cgi?id=1375558#c8 */ if (NM_IN_STRSET(key, "fail_over_mac", "active_slave")) continue; } @@ -1143,19 +1143,19 @@ nm_setting_bond_class_init(NMSettingBondClass *klass) setting_class->compare_property = compare_property; /** - * NMSettingBond:options: (type GHashTable(utf8,utf8)): - * - * Dictionary of key/value pairs of bonding options. Both keys and values - * must be strings. Option names must contain only alphanumeric characters - * (ie, [a-zA-Z0-9]). - **/ + * NMSettingBond:options: (type GHashTable(utf8,utf8)): + * + * Dictionary of key/value pairs of bonding options. Both keys and values + * must be strings. Option names must contain only alphanumeric characters + * (ie, [a-zA-Z0-9]). + **/ /* ---ifcfg-rh--- - * property: options - * variable: BONDING_OPTS - * description: Bonding options. - * example: BONDING_OPTS="miimon=100 mode=broadcast" - * ---end--- - */ + * property: options + * variable: BONDING_OPTS + * description: Bonding options. + * example: BONDING_OPTS="miimon=100 mode=broadcast" + * ---end--- + */ obj_properties[PROP_OPTIONS] = g_param_spec_boxed( NM_SETTING_BOND_OPTIONS, "", diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c index 19ea76c76e..fd7499e1d8 100644 --- a/libnm-core/nm-setting-bridge-port.c +++ b/libnm-core/nm-setting-bridge-port.c @@ -482,18 +482,18 @@ nm_setting_bridge_port_class_init(NMSettingBridgePortClass *klass) setting_class->verify = verify; /** - * NMSettingBridgePort:priority: - * - * The Spanning Tree Protocol (STP) priority of this bridge port. - **/ + * NMSettingBridgePort:priority: + * + * The Spanning Tree Protocol (STP) priority of this bridge port. + **/ /* ---ifcfg-rh--- - * property: priority - * variable: BRIDGING_OPTS: priority= - * values: 0 - 63 - * default: 32 - * description: STP priority. - * ---end--- - */ + * property: priority + * variable: BRIDGING_OPTS: priority= + * values: 0 - 63 + * default: 32 + * description: STP priority. + * ---end--- + */ obj_properties[PROP_PRIORITY] = g_param_spec_uint(NM_SETTING_BRIDGE_PORT_PRIORITY, "", @@ -504,19 +504,19 @@ nm_setting_bridge_port_class_init(NMSettingBridgePortClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridgePort:path-cost: - * - * The Spanning Tree Protocol (STP) port cost for destinations via this - * port. - **/ + * NMSettingBridgePort:path-cost: + * + * The Spanning Tree Protocol (STP) port cost for destinations via this + * port. + **/ /* ---ifcfg-rh--- - * property: path-cost - * variable: BRIDGING_OPTS: path_cost= - * values: 1 - 65535 - * default: 100 - * description: STP cost. - * ---end--- - */ + * property: path-cost + * variable: BRIDGING_OPTS: path_cost= + * values: 1 - 65535 + * default: 100 + * description: STP cost. + * ---end--- + */ obj_properties[PROP_PATH_COST] = g_param_spec_uint(NM_SETTING_BRIDGE_PORT_PATH_COST, "", "", @@ -526,18 +526,18 @@ nm_setting_bridge_port_class_init(NMSettingBridgePortClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridgePort:hairpin-mode: - * - * Enables or disables "hairpin mode" for the port, which allows frames to - * be sent back out through the port the frame was received on. - **/ + * NMSettingBridgePort:hairpin-mode: + * + * Enables or disables "hairpin mode" for the port, which allows frames to + * be sent back out through the port the frame was received on. + **/ /* ---ifcfg-rh--- - * property: hairpin-mode - * variable: BRIDGING_OPTS: hairpin_mode= - * default: yes - * description: Hairpin mode of the bridge port. - * ---end--- - */ + * property: hairpin-mode + * variable: BRIDGING_OPTS: hairpin_mode= + * default: yes + * description: Hairpin mode of the bridge port. + * ---end--- + */ obj_properties[PROP_HAIRPIN_MODE] = g_param_spec_boolean( NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", @@ -546,30 +546,30 @@ nm_setting_bridge_port_class_init(NMSettingBridgePortClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridgePort:vlans: (type GPtrArray(NMBridgeVlan)) - * - * Array of bridge VLAN objects. In addition to the VLANs - * specified here, the port will also have the default-pvid - * VLAN configured on the bridge by the bridge.vlan-default-pvid - * property. - * - * In nmcli the VLAN list can be specified with the following - * syntax: - * - * $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... - * - * where $vid is either a single id between 1 and 4094 or a - * range, represented as a couple of ids separated by a dash. - * - * Since: 1.18 - **/ + * NMSettingBridgePort:vlans: (type GPtrArray(NMBridgeVlan)) + * + * Array of bridge VLAN objects. In addition to the VLANs + * specified here, the port will also have the default-pvid + * VLAN configured on the bridge by the bridge.vlan-default-pvid + * property. + * + * In nmcli the VLAN list can be specified with the following + * syntax: + * + * $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... + * + * where $vid is either a single id between 1 and 4094 or a + * range, represented as a couple of ids separated by a dash. + * + * Since: 1.18 + **/ /* ---ifcfg-rh--- - * property: vlans - * variable: BRIDGE_PORT_VLANS - * description: List of VLANs on the bridge port - * example: BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged" - * ---end--- - */ + * property: vlans + * variable: BRIDGE_PORT_VLANS + * description: List of VLANs on the bridge port + * example: BRIDGE_PORT_VLANS="1 pvid untagged,20,300-400 untagged" + * ---end--- + */ obj_properties[PROP_VLANS] = g_param_spec_boxed(NM_SETTING_BRIDGE_PORT_VLANS, "", "", diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 1a98cac67e..ffbca6a120 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -266,9 +266,9 @@ gboolean nm_bridge_vlan_get_vid_range(const NMBridgeVlan *vlan, guint16 *vid_start, guint16 *vid_end) { /* with LTO and optimization, the compiler complains that the - * output variables are not initialized. In practice, the function - * only sets the output on success. But make the compiler happy. - */ + * output variables are not initialized. In practice, the function + * only sets the output on success. But make the compiler happy. + */ NM_SET_OUT(vid_start, 0); NM_SET_OUT(vid_end, 0); @@ -431,8 +431,8 @@ nm_bridge_vlan_to_str(const NMBridgeVlan *vlan, GError **error) g_return_val_if_fail(!error || !*error, NULL); /* The function never fails at the moment, but it might in the - * future if more parameters are added to the object that could - * make it invalid. */ + * future if more parameters are added to the object that could + * make it invalid. */ nm_str_buf_init(&string, NM_UTILS_GET_NEXT_REALLOC_SIZE_32, FALSE); @@ -1610,35 +1610,35 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) setting_class->verify = verify; /** - * NMSettingBridge:mac-address: - * - * If specified, the MAC address of bridge. When creating a new bridge, this - * MAC address will be set. - * - * If this field is left unspecified, the "ethernet.cloned-mac-address" is - * referred instead to generate the initial MAC address. Note that setting - * "ethernet.cloned-mac-address" anyway overwrites the MAC address of - * the bridge later while activating the bridge. Hence, this property - * is deprecated. - * - * Deprecated: 1.12: Use the ethernet.cloned-mac-address property instead. - **/ + * NMSettingBridge:mac-address: + * + * If specified, the MAC address of bridge. When creating a new bridge, this + * MAC address will be set. + * + * If this field is left unspecified, the "ethernet.cloned-mac-address" is + * referred instead to generate the initial MAC address. Note that setting + * "ethernet.cloned-mac-address" anyway overwrites the MAC address of + * the bridge later while activating the bridge. Hence, this property + * is deprecated. + * + * Deprecated: 1.12: Use the ethernet.cloned-mac-address property instead. + **/ /* ---keyfile--- - * property: mac-address - * format: usual hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation, - * or semicolon separated list of 6 decimal bytes (obsolete) - * example: mac-address=00:22:68:12:79:A2 - * mac-address=0;34;104;18;121;162; - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: BRIDGE_MACADDR(+) - * description: MAC address of the bridge. Note that this requires a recent - * kernel support, originally introduced in 3.15 upstream kernel) - * BRIDGE_MACADDR for bridges is an NM extension. - * ---end--- - */ + * property: mac-address + * format: usual hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation, + * or semicolon separated list of 6 decimal bytes (obsolete) + * example: mac-address=00:22:68:12:79:A2 + * mac-address=0;34;104;18;121;162; + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: BRIDGE_MACADDR(+) + * description: MAC address of the bridge. Note that this requires a recent + * kernel support, originally introduced in 3.15 upstream kernel) + * BRIDGE_MACADDR for bridges is an NM extension. + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS] = g_param_spec_string( NM_SETTING_BRIDGE_MAC_ADDRESS, "", @@ -1650,17 +1650,17 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingBridge:stp: - * - * Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. - **/ + * NMSettingBridge:stp: + * + * Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. + **/ /* ---ifcfg-rh--- - * property: stp - * variable: STP - * default: no - * description: Span tree protocol participation. - * ---end--- - */ + * property: stp + * variable: STP + * default: no + * description: Span tree protocol participation. + * ---end--- + */ obj_properties[PROP_STP] = g_param_spec_boolean(NM_SETTING_BRIDGE_STP, "", "", @@ -1669,20 +1669,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:priority: - * - * Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower - * values are "better"; the lowest priority bridge will be elected the root - * bridge. - **/ + * NMSettingBridge:priority: + * + * Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower + * values are "better"; the lowest priority bridge will be elected the root + * bridge. + **/ /* ---ifcfg-rh--- - * property: priority - * variable: BRIDGING_OPTS: priority= - * values: 0 - 32768 - * default: 32768 - * description: STP priority. - * ---end--- - */ + * property: priority + * variable: BRIDGING_OPTS: priority= + * values: 0 - 32768 + * default: 32768 + * description: STP priority. + * ---end--- + */ obj_properties[PROP_PRIORITY] = g_param_spec_uint(NM_SETTING_BRIDGE_PRIORITY, "", @@ -1693,18 +1693,18 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:forward-delay: - * - * The Spanning Tree Protocol (STP) forwarding delay, in seconds. - **/ + * NMSettingBridge:forward-delay: + * + * The Spanning Tree Protocol (STP) forwarding delay, in seconds. + **/ /* ---ifcfg-rh--- - * property: forward-delay - * variable: DELAY - * values: 2 - 30 - * default: 15 - * description: STP forwarding delay. - * ---end--- - */ + * property: forward-delay + * variable: DELAY + * values: 2 - 30 + * default: 15 + * description: STP forwarding delay. + * ---end--- + */ obj_properties[PROP_FORWARD_DELAY] = g_param_spec_uint(NM_SETTING_BRIDGE_FORWARD_DELAY, "", @@ -1715,18 +1715,18 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:hello-time: - * - * The Spanning Tree Protocol (STP) hello time, in seconds. - **/ + * NMSettingBridge:hello-time: + * + * The Spanning Tree Protocol (STP) hello time, in seconds. + **/ /* ---ifcfg-rh--- - * property: hello-time - * variable: BRIDGING_OPTS: hello_time= - * values: 1 - 10 - * default: 2 - * description: STP hello time. - * ---end--- - */ + * property: hello-time + * variable: BRIDGING_OPTS: hello_time= + * values: 1 - 10 + * default: 2 + * description: STP hello time. + * ---end--- + */ obj_properties[PROP_HELLO_TIME] = g_param_spec_uint(NM_SETTING_BRIDGE_HELLO_TIME, "", @@ -1737,18 +1737,18 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:max-age: - * - * The Spanning Tree Protocol (STP) maximum message age, in seconds. - **/ + * NMSettingBridge:max-age: + * + * The Spanning Tree Protocol (STP) maximum message age, in seconds. + **/ /* ---ifcfg-rh--- - * property: max-age - * variable: BRIDGING_OPTS: max_age= - * values: 6 - 40 - * default: 20 - * description: STP maximum message age. - * ---end--- - */ + * property: max-age + * variable: BRIDGING_OPTS: max_age= + * values: 6 - 40 + * default: 20 + * description: STP maximum message age. + * ---end--- + */ obj_properties[PROP_MAX_AGE] = g_param_spec_uint(NM_SETTING_BRIDGE_MAX_AGE, "", @@ -1759,18 +1759,18 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:ageing-time: - * - * The Ethernet MAC address aging time, in seconds. - **/ + * NMSettingBridge:ageing-time: + * + * The Ethernet MAC address aging time, in seconds. + **/ /* ---ifcfg-rh--- - * property: ageing-time - * variable: BRIDGING_OPTS: ageing_time= - * values: 0 - 1000000 - * default: 300 - * description: Ethernet MAC ageing time. - * ---end--- - */ + * property: ageing-time + * variable: BRIDGING_OPTS: ageing_time= + * values: 0 - 1000000 + * default: 300 + * description: Ethernet MAC ageing time. + * ---end--- + */ obj_properties[PROP_AGEING_TIME] = g_param_spec_uint(NM_SETTING_BRIDGE_AGEING_TIME, "", @@ -1781,17 +1781,17 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:group-forward-mask: - * - * A mask of group addresses to forward. Usually, group addresses in - * the range from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not - * forwarded according to standards. This property is a mask of 16 bits, - * each corresponding to a group address in that range that must be - * forwarded. The mask can't have bits 0, 1 or 2 set because they are - * used for STP, MAC pause frames and LACP. - * - * Since: 1.10 - **/ + * NMSettingBridge:group-forward-mask: + * + * A mask of group addresses to forward. Usually, group addresses in + * the range from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not + * forwarded according to standards. This property is a mask of 16 bits, + * each corresponding to a group address in that range that must be + * forwarded. The mask can't have bits 0, 1 or 2 set because they are + * used for STP, MAC pause frames and LACP. + * + * Since: 1.10 + **/ obj_properties[PROP_GROUP_FORWARD_MASK] = g_param_spec_uint(NM_SETTING_BRIDGE_GROUP_FORWARD_MASK, "", @@ -1802,23 +1802,23 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-snooping: - * - * Controls whether IGMP snooping is enabled for this bridge. - * Note that if snooping was automatically disabled due to hash collisions, - * the system may refuse to enable the feature until the collisions are - * resolved. - * - * Since: 1.2 - **/ + * NMSettingBridge:multicast-snooping: + * + * Controls whether IGMP snooping is enabled for this bridge. + * Note that if snooping was automatically disabled due to hash collisions, + * the system may refuse to enable the feature until the collisions are + * resolved. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: multicast-snooping - * variable: BRIDGING_OPTS: multicast_snooping= - * values: 0 or 1 - * default: 1 - * description: IGMP snooping support. - * ---end--- - */ + * property: multicast-snooping + * variable: BRIDGING_OPTS: multicast_snooping= + * values: 0 or 1 + * default: 1 + * description: IGMP snooping support. + * ---end--- + */ obj_properties[PROP_MULTICAST_SNOOPING] = g_param_spec_boolean( NM_SETTING_BRIDGE_MULTICAST_SNOOPING, "", @@ -1827,20 +1827,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:vlan-filtering: - * - * Control whether VLAN filtering is enabled on the bridge. - * - * Since: 1.18 - **/ + * NMSettingBridge:vlan-filtering: + * + * Control whether VLAN filtering is enabled on the bridge. + * + * Since: 1.18 + **/ /* ---ifcfg-rh--- - * property: vlan-filtering - * variable: BRIDGING_OPTS: vlan_filtering= - * values: 0 or 1 - * default: 0 - * description: VLAN filtering support. - * ---end--- - */ + * property: vlan-filtering + * variable: BRIDGING_OPTS: vlan_filtering= + * values: 0 or 1 + * default: 0 + * description: VLAN filtering support. + * ---end--- + */ obj_properties[PROP_VLAN_FILTERING] = g_param_spec_boolean( NM_SETTING_BRIDGE_VLAN_FILTERING, "", @@ -1849,21 +1849,21 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:vlan-default-pvid: - * - * The default PVID for the ports of the bridge, that is the VLAN id - * assigned to incoming untagged frames. - * - * Since: 1.18 - **/ + * NMSettingBridge:vlan-default-pvid: + * + * The default PVID for the ports of the bridge, that is the VLAN id + * assigned to incoming untagged frames. + * + * Since: 1.18 + **/ /* ---ifcfg-rh--- - * property: vlan-default-pvid - * variable: BRIDGING_OPTS: default_pvid= - * values: 0 - 4094 - * default: 1 - * description: default VLAN PVID. - * ---end--- - */ + * property: vlan-default-pvid + * variable: BRIDGING_OPTS: default_pvid= + * values: 0 - 4094 + * default: 1 + * description: default VLAN PVID. + * ---end--- + */ obj_properties[PROP_VLAN_DEFAULT_PVID] = g_param_spec_uint(NM_SETTING_BRIDGE_VLAN_DEFAULT_PVID, "", @@ -1874,29 +1874,29 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:vlans: (type GPtrArray(NMBridgeVlan)) - * - * Array of bridge VLAN objects. In addition to the VLANs - * specified here, the bridge will also have the default-pvid - * VLAN configured by the bridge.vlan-default-pvid property. - * - * In nmcli the VLAN list can be specified with the following - * syntax: - * - * $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... - * - * where $vid is either a single id between 1 and 4094 or a - * range, represented as a couple of ids separated by a dash. - * - * Since: 1.18 - **/ + * NMSettingBridge:vlans: (type GPtrArray(NMBridgeVlan)) + * + * Array of bridge VLAN objects. In addition to the VLANs + * specified here, the bridge will also have the default-pvid + * VLAN configured by the bridge.vlan-default-pvid property. + * + * In nmcli the VLAN list can be specified with the following + * syntax: + * + * $vid [pvid] [untagged] [, $vid [pvid] [untagged]]... + * + * where $vid is either a single id between 1 and 4094 or a + * range, represented as a couple of ids separated by a dash. + * + * Since: 1.18 + **/ /* ---ifcfg-rh--- - * property: vlans - * variable: BRIDGE_VLANS - * description: List of VLANs on the bridge - * example: BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged" - * ---end--- - */ + * property: vlans + * variable: BRIDGE_VLANS + * description: List of VLANs on the bridge + * example: BRIDGE_VLANS="1 pvid untagged,20,300-400 untagged" + * ---end--- + */ obj_properties[PROP_VLANS] = g_param_spec_boxed(NM_SETTING_BRIDGE_VLANS, "", "", @@ -1908,35 +1908,35 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) &nm_sett_info_propert_type_bridge_vlans); /* ---dbus--- - * property: interface-name - * format: string - * description: Deprecated in favor of connection.interface-name, but can - * be used for backward-compatibility with older daemons, to set the - * bridge's interface name. - * ---end--- - */ + * property: interface-name + * format: string + * description: Deprecated in favor of connection.interface-name, but can + * be used for backward-compatibility with older daemons, to set the + * bridge's interface name. + * ---end--- + */ _nm_properties_override_dbus(properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name); /** - * NMSettingBridge:group-address: - * - * If specified, The MAC address of the multicast group this bridge uses for STP. - * - * The address must be a link-local address in standard Ethernet MAC address format, - * ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. - * If not specified the default value is 01:80:C2:00:00:00. - * - * Since: 1.24 - **/ + * NMSettingBridge:group-address: + * + * If specified, The MAC address of the multicast group this bridge uses for STP. + * + * The address must be a link-local address in standard Ethernet MAC address format, + * ie an address of the form 01:80:C2:00:00:0X, with X in [0, 4..F]. + * If not specified the default value is 01:80:C2:00:00:00. + * + * Since: 1.24 + **/ /* ---ifcfg-rh--- - * property: group-address - * variable: BRIDGING_OPTS: group_address= - * description: STP group address. - * example: BRIDGING_OPTS="group_address=01:80:C2:00:00:0A" - * ---end--- - */ + * property: group-address + * variable: BRIDGING_OPTS: group_address= + * description: STP group address. + * example: BRIDGING_OPTS="group_address=01:80:C2:00:00:0A" + * ---end--- + */ obj_properties[PROP_GROUP_ADDRESS] = g_param_spec_string( NM_SETTING_BRIDGE_GROUP_ADDRESS, "", @@ -1948,24 +1948,24 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingBridge:vlan-protocol: - * - * If specified, the protocol used for VLAN filtering. - * - * Supported values are: '802.1Q', '802.1ad'. - * If not specified the default value is '802.1Q'. - * - * Since: 1.24 - **/ + * NMSettingBridge:vlan-protocol: + * + * If specified, the protocol used for VLAN filtering. + * + * Supported values are: '802.1Q', '802.1ad'. + * If not specified the default value is '802.1Q'. + * + * Since: 1.24 + **/ /* ---ifcfg-rh--- - * property: vlan-protocol - * variable: BRIDGING_OPTS: vlan_protocol= - * description: VLAN filtering protocol. - * example: BRIDGING_OPTS="vlan_protocol=802.1Q" - * ---end--- - * - * Since: 1.24 - */ + * property: vlan-protocol + * variable: BRIDGING_OPTS: vlan_protocol= + * description: VLAN filtering protocol. + * example: BRIDGING_OPTS="vlan_protocol=802.1Q" + * ---end--- + * + * Since: 1.24 + */ obj_properties[PROP_VLAN_PROTOCOL] = g_param_spec_string( NM_SETTING_BRIDGE_VLAN_PROTOCOL, "", @@ -1974,19 +1974,19 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:vlan-stats-enabled: - * - * Controls whether per-VLAN stats accounting is enabled. - **/ + * NMSettingBridge:vlan-stats-enabled: + * + * Controls whether per-VLAN stats accounting is enabled. + **/ /* ---ifcfg-rh--- - * property: vlan-stats-enabled - * variable: BRIDGING_OPTS: vlan_stats_enabled= - * default: 0 - * example: BRIDGING_OPTS="vlan_stats_enabled=1" - * ---end--- - * - * Since: 1.24 - */ + * property: vlan-stats-enabled + * variable: BRIDGING_OPTS: vlan_stats_enabled= + * default: 0 + * example: BRIDGING_OPTS="vlan_stats_enabled=1" + * ---end--- + * + * Since: 1.24 + */ obj_properties[PROP_VLAN_STATS_ENABLED] = g_param_spec_boolean( NM_SETTING_BRIDGE_VLAN_STATS_ENABLED, "", @@ -1995,25 +1995,25 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-router: - * - * Sets bridge's multicast router. Multicast-snooping must be enabled - * for this option to work. - * - * Supported values are: 'auto', 'disabled', 'enabled' to which kernel - * assigns the numbers 1, 0, and 2, respectively. - * If not specified the default value is 'auto' (1). - **/ + * NMSettingBridge:multicast-router: + * + * Sets bridge's multicast router. Multicast-snooping must be enabled + * for this option to work. + * + * Supported values are: 'auto', 'disabled', 'enabled' to which kernel + * assigns the numbers 1, 0, and 2, respectively. + * If not specified the default value is 'auto' (1). + **/ /* ---ifcfg-rh--- - * property: multicast-router - * variable: BRIDGING_OPTS: multicast_router= - * values: auto, enabled, disabled - * default: auto - * example: BRIDGING_OPTS="multicast_router=enabled" - * ---end--- - * - * Since: 1.24 - */ + * property: multicast-router + * variable: BRIDGING_OPTS: multicast_router= + * values: auto, enabled, disabled + * default: auto + * example: BRIDGING_OPTS="multicast_router=enabled" + * ---end--- + * + * Since: 1.24 + */ obj_properties[PROP_MULTICAST_ROUTER] = g_param_spec_string( NM_SETTING_BRIDGE_MULTICAST_ROUTER, "", @@ -2022,21 +2022,21 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-query-use-ifaddr: - * - * If enabled the bridge's own IP address is used as - * the source address for IGMP queries otherwise - * the default of 0.0.0.0 is used. - **/ + * NMSettingBridge:multicast-query-use-ifaddr: + * + * If enabled the bridge's own IP address is used as + * the source address for IGMP queries otherwise + * the default of 0.0.0.0 is used. + **/ /* ---ifcfg-rh--- - * property: multicast-query-use-ifaddr - * variable: BRIDGING_OPTS: multicast_query_use_ifaddr= - * default: 0 - * example: BRIDGING_OPTS="multicast_query-use_ifaddr=1" - * ---end--- - * - * Since: 1.24 - */ + * property: multicast-query-use-ifaddr + * variable: BRIDGING_OPTS: multicast_query_use_ifaddr= + * default: 0 + * example: BRIDGING_OPTS="multicast_query-use_ifaddr=1" + * ---end--- + * + * Since: 1.24 + */ obj_properties[PROP_MULTICAST_QUERY_USE_IFADDR] = g_param_spec_boolean( NM_SETTING_BRIDGE_MULTICAST_QUERY_USE_IFADDR, "", @@ -2045,20 +2045,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-querier: - * - * Enable or disable sending of multicast queries by the bridge. - * If not specified the option is disabled. - **/ + * NMSettingBridge:multicast-querier: + * + * Enable or disable sending of multicast queries by the bridge. + * If not specified the option is disabled. + **/ /* ---ifcfg-rh--- - * property: multicast-querier - * variable: BRIDGING_OPTS: multicast_querier= - * default: 0 - * example: BRIDGING_OPTS="multicast_querier=1" - * ---end--- - * - * Since: 1.24 - */ + * property: multicast-querier + * variable: BRIDGING_OPTS: multicast_querier= + * default: 0 + * example: BRIDGING_OPTS="multicast_querier=1" + * ---end--- + * + * Since: 1.24 + */ obj_properties[PROP_MULTICAST_QUERIER] = g_param_spec_boolean( NM_SETTING_BRIDGE_MULTICAST_QUERIER, "", @@ -2067,19 +2067,19 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-hash-max: - * - * Set maximum size of multicast hash table (value must be a power of 2). - **/ + * NMSettingBridge:multicast-hash-max: + * + * Set maximum size of multicast hash table (value must be a power of 2). + **/ /* ---ifcfg-rh--- - * property: multicast-hash-max - * variable: BRIDGING_OPTS: multicast_hash_max= - * default: 4096 - * example: BRIDGING_OPTS="multicast_hash_max=8192" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-hash-max + * variable: BRIDGING_OPTS: multicast_hash_max= + * default: 4096 + * example: BRIDGING_OPTS="multicast_hash_max=8192" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_HASH_MAX] = g_param_spec_uint(NM_SETTING_BRIDGE_MULTICAST_HASH_MAX, "", @@ -2090,21 +2090,21 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-last-member-count: - * - * Set the number of queries the bridge will send before - * stopping forwarding a multicast group after a "leave" - * message has been received. - **/ + * NMSettingBridge:multicast-last-member-count: + * + * Set the number of queries the bridge will send before + * stopping forwarding a multicast group after a "leave" + * message has been received. + **/ /* ---ifcfg-rh--- - * property: multicast-last-member-count - * variable: BRIDGING_OPTS: multicast_last_member_count= - * default: 2 - * example: BRIDGING_OPTS="multicast_last_member_count=4" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-last-member-count + * variable: BRIDGING_OPTS: multicast_last_member_count= + * default: 2 + * example: BRIDGING_OPTS="multicast_last_member_count=4" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_LAST_MEMBER_COUNT] = g_param_spec_uint(NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_COUNT, "", @@ -2115,20 +2115,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-last-member-interval: - * - * Set interval (in deciseconds) between queries to find remaining - * members of a group, after a "leave" message is received. - **/ + * NMSettingBridge:multicast-last-member-interval: + * + * Set interval (in deciseconds) between queries to find remaining + * members of a group, after a "leave" message is received. + **/ /* ---ifcfg-rh--- - * property: multicast-last-member-interval - * variable: BRIDGING_OPTS: multicast_last_member_interval= - * default: 100 - * example: BRIDGING_OPTS="multicast_last_member_interval=200" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-last-member-interval + * variable: BRIDGING_OPTS: multicast_last_member_interval= + * default: 100 + * example: BRIDGING_OPTS="multicast_last_member_interval=200" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_LAST_MEMBER_INTERVAL] = g_param_spec_uint64( NM_SETTING_BRIDGE_MULTICAST_LAST_MEMBER_INTERVAL, "", @@ -2139,21 +2139,21 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-membership-interval: - * - * Set delay (in deciseconds) after which the bridge will - * leave a group, if no membership reports for this - * group are received. - **/ + * NMSettingBridge:multicast-membership-interval: + * + * Set delay (in deciseconds) after which the bridge will + * leave a group, if no membership reports for this + * group are received. + **/ /* ---ifcfg-rh--- - * property: multicast-membership-interval - * variable: BRIDGING_OPTS: multicast_membership_interval= - * default: 26000 - * example: BRIDGING_OPTS="multicast_membership_interval=16000" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-membership-interval + * variable: BRIDGING_OPTS: multicast_membership_interval= + * default: 26000 + * example: BRIDGING_OPTS="multicast_membership_interval=16000" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_MEMBERSHIP_INTERVAL] = g_param_spec_uint64( NM_SETTING_BRIDGE_MULTICAST_MEMBERSHIP_INTERVAL, "", @@ -2164,20 +2164,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-querier-interval: - * - * If no queries are seen after this delay (in deciseconds) has passed, - * the bridge will start to send its own queries. - **/ + * NMSettingBridge:multicast-querier-interval: + * + * If no queries are seen after this delay (in deciseconds) has passed, + * the bridge will start to send its own queries. + **/ /* ---ifcfg-rh--- - * property: multicast-querier-interval - * variable: BRIDGING_OPTS: multicast_querier_interval= - * default: 25500 - * example: BRIDGING_OPTS="multicast_querier_interval=20000" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-querier-interval + * variable: BRIDGING_OPTS: multicast_querier_interval= + * default: 25500 + * example: BRIDGING_OPTS="multicast_querier_interval=20000" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_QUERIER_INTERVAL] = g_param_spec_uint64( NM_SETTING_BRIDGE_MULTICAST_QUERIER_INTERVAL, "", @@ -2188,20 +2188,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-query-interval: - * - * Interval (in deciseconds) between queries sent - * by the bridge after the end of the startup phase. - **/ + * NMSettingBridge:multicast-query-interval: + * + * Interval (in deciseconds) between queries sent + * by the bridge after the end of the startup phase. + **/ /* ---ifcfg-rh--- - * property: multicast-query-interval - * variable: BRIDGING_OPTS: multicast_query_interval= - * default: 12500 - * example: BRIDGING_OPTS="multicast_query_interval=22500" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-query-interval + * variable: BRIDGING_OPTS: multicast_query_interval= + * default: 12500 + * example: BRIDGING_OPTS="multicast_query_interval=22500" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_QUERY_INTERVAL] = g_param_spec_uint64( NM_SETTING_BRIDGE_MULTICAST_QUERY_INTERVAL, "", @@ -2212,20 +2212,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-query-response-interval: - * - * Set the Max Response Time/Max Response Delay - * (in deciseconds) for IGMP/MLD queries sent by the bridge. - **/ + * NMSettingBridge:multicast-query-response-interval: + * + * Set the Max Response Time/Max Response Delay + * (in deciseconds) for IGMP/MLD queries sent by the bridge. + **/ /* ---ifcfg-rh--- - * property: multicast-query-response-interval - * variable: BRIDGING_OPTS: multicast_query_response_interval= - * default: 1000 - * example: BRIDGING_OPTS="multicast_query_response_interval=2000" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-query-response-interval + * variable: BRIDGING_OPTS: multicast_query_response_interval= + * default: 1000 + * example: BRIDGING_OPTS="multicast_query_response_interval=2000" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_QUERY_RESPONSE_INTERVAL] = g_param_spec_uint64( NM_SETTING_BRIDGE_MULTICAST_QUERY_RESPONSE_INTERVAL, "", @@ -2236,19 +2236,19 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-startup-query-count: - * - * Set the number of IGMP queries to send during startup phase. - **/ + * NMSettingBridge:multicast-startup-query-count: + * + * Set the number of IGMP queries to send during startup phase. + **/ /* ---ifcfg-rh--- - * property: multicast-startup-query-count - * variable: BRIDGING_OPTS: multicast_startup_query_count= - * default: 2 - * example: BRIDGING_OPTS="multicast_startup_query_count=4" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-startup-query-count + * variable: BRIDGING_OPTS: multicast_startup_query_count= + * default: 2 + * example: BRIDGING_OPTS="multicast_startup_query_count=4" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_STARTUP_QUERY_COUNT] = g_param_spec_uint(NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_COUNT, "", @@ -2259,20 +2259,20 @@ nm_setting_bridge_class_init(NMSettingBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingBridge:multicast-startup-query-interval: - * - * Sets the time (in deciseconds) between queries sent out - * at startup to determine membership information. - **/ + * NMSettingBridge:multicast-startup-query-interval: + * + * Sets the time (in deciseconds) between queries sent out + * at startup to determine membership information. + **/ /* ---ifcfg-rh--- - * property: multicast-startup-query-interval - * variable: BRIDGING_OPTS: multicast_startup_query_interval= - * default: 3125 - * example: BRIDGING_OPTS="multicast_startup_query_interval=4000" - * ---end--- - * - * Since: 1.26 - */ + * property: multicast-startup-query-interval + * variable: BRIDGING_OPTS: multicast_startup_query_interval= + * default: 3125 + * example: BRIDGING_OPTS="multicast_startup_query_interval=4000" + * ---end--- + * + * Since: 1.26 + */ obj_properties[PROP_MULTICAST_STARTUP_QUERY_INTERVAL] = g_param_spec_uint64( NM_SETTING_BRIDGE_MULTICAST_STARTUP_QUERY_INTERVAL, "", diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c index c2e932c391..3919421494 100644 --- a/libnm-core/nm-setting-cdma.c +++ b/libnm-core/nm-setting-cdma.c @@ -283,12 +283,12 @@ nm_setting_cdma_class_init(NMSettingCdmaClass *klass) setting_class->need_secrets = need_secrets; /** - * NMSettingCdma:number: - * - * The number to dial to establish the connection to the CDMA-based mobile - * broadband network, if any. If not specified, the default number (#777) - * is used when required. - **/ + * NMSettingCdma:number: + * + * The number to dial to establish the connection to the CDMA-based mobile + * broadband network, if any. If not specified, the default number (#777) + * is used when required. + **/ obj_properties[PROP_NUMBER] = g_param_spec_string(NM_SETTING_CDMA_NUMBER, "", "", @@ -296,12 +296,12 @@ nm_setting_cdma_class_init(NMSettingCdmaClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingCdma:username: - * - * The username used to authenticate with the network, if required. Many - * providers do not require a username, or accept any username. But if a - * username is required, it is specified here. - **/ + * NMSettingCdma:username: + * + * The username used to authenticate with the network, if required. Many + * providers do not require a username, or accept any username. But if a + * username is required, it is specified here. + **/ obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_CDMA_USERNAME, "", "", @@ -309,12 +309,12 @@ nm_setting_cdma_class_init(NMSettingCdmaClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingCdma:password: - * - * The password used to authenticate with the network, if required. Many - * providers do not require a password, or accept any password. But if a - * password is required, it is specified here. - **/ + * NMSettingCdma:password: + * + * The password used to authenticate with the network, if required. Many + * providers do not require a password, or accept any password. But if a + * password is required, it is specified here. + **/ obj_properties[PROP_PASSWORD] = g_param_spec_string(NM_SETTING_CDMA_PASSWORD, "", @@ -323,10 +323,10 @@ nm_setting_cdma_class_init(NMSettingCdmaClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingCdma:password-flags: - * - * Flags indicating how to handle the #NMSettingCdma:password property. - **/ + * NMSettingCdma:password-flags: + * + * Flags indicating how to handle the #NMSettingCdma:password property. + **/ obj_properties[PROP_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_CDMA_PASSWORD_FLAGS, "", @@ -336,13 +336,13 @@ nm_setting_cdma_class_init(NMSettingCdmaClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingCdma:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple frames. - * - * Since: 1.8 - **/ + * NMSettingCdma:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple frames. + * + * Since: 1.8 + **/ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_CDMA_MTU, "", "", diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 936cd27a30..9a2ab4988e 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -1084,13 +1084,13 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) NULL); if (!ovs_iface_type) { /* We cannot determine to OVS interface type. Consequently, we cannot - * fully validate the interface name. - * - * If we have a connection (and we do a full validation anyway), skip the - * check. The connection will fail validation when we validate the OVS setting. - * - * Otherwise, do the most basic validation. - */ + * fully validate the interface name. + * + * If we have a connection (and we do a full validation anyway), skip the + * check. The connection will fail validation when we validate the OVS setting. + * + * Otherwise, do the most basic validation. + */ if (connection) goto after_interface_name; iface_type = NMU_IFACE_ANY; @@ -1099,7 +1099,7 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) iface_type = NMU_IFACE_OVS; } else { /* This interface type also requires a netdev. We need to validate - * for both OVS and KERNEL. */ + * for both OVS and KERNEL. */ nm_assert(NM_IN_STRSET(ovs_iface_type, "internal", "system", "dpdk")); iface_type = NMU_IFACE_OVS_AND_KERNEL; } @@ -1752,17 +1752,17 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) setting_class->compare_property = compare_property; /** - * NMSettingConnection:id: - * - * A human readable unique identifier for the connection, like "Work Wi-Fi" - * or "T-Mobile 3G". - **/ + * NMSettingConnection:id: + * + * A human readable unique identifier for the connection, like "Work Wi-Fi" + * or "T-Mobile 3G". + **/ /* ---ifcfg-rh--- - * property: id - * variable: NAME(+) - * description: User friendly name for the connection profile. - * ---end--- - */ + * property: id + * variable: NAME(+) + * description: User friendly name for the connection profile. + * ---end--- + */ obj_properties[PROP_ID] = g_param_spec_string(NM_SETTING_CONNECTION_ID, "", "", @@ -1771,28 +1771,28 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:uuid: - * - * A universally unique identifier for the connection, for example generated - * with libuuid. It should be assigned when the connection is created, and - * never changed as long as the connection still applies to the same - * network. For example, it should not be changed when the - * #NMSettingConnection:id property or #NMSettingIP4Config changes, but - * might need to be re-created when the Wi-Fi SSID, mobile broadband network - * provider, or #NMSettingConnection:type property changes. - * - * The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" - * (ie, contains only hexadecimal characters and "-"). A suitable UUID may - * be generated by nm_utils_uuid_generate() or - * nm_utils_uuid_generate_from_string(). - **/ + * NMSettingConnection:uuid: + * + * A universally unique identifier for the connection, for example generated + * with libuuid. It should be assigned when the connection is created, and + * never changed as long as the connection still applies to the same + * network. For example, it should not be changed when the + * #NMSettingConnection:id property or #NMSettingIP4Config changes, but + * might need to be re-created when the Wi-Fi SSID, mobile broadband network + * provider, or #NMSettingConnection:type property changes. + * + * The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" + * (ie, contains only hexadecimal characters and "-"). A suitable UUID may + * be generated by nm_utils_uuid_generate() or + * nm_utils_uuid_generate_from_string(). + **/ /* ---ifcfg-rh--- - * property: uuid - * variable: UUID(+) - * description: UUID for the connection profile. When missing, NetworkManager - * creates the UUID itself (by hashing the filename). - * ---end--- - */ + * property: uuid + * variable: UUID(+) + * description: UUID for the connection profile. When missing, NetworkManager + * creates the UUID itself (by hashing the filename). + * ---end--- + */ obj_properties[PROP_UUID] = g_param_spec_string( NM_SETTING_CONNECTION_UUID, "", @@ -1801,52 +1801,52 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:stable-id: - * - * This represents the identity of the connection used for various purposes. - * It allows to configure multiple profiles to share the identity. Also, - * the stable-id can contain placeholders that are substituted dynamically and - * deterministically depending on the context. - * - * The stable-id is used for generating IPv6 stable private addresses - * with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the - * generated cloned MAC address for ethernet.cloned-mac-address=stable - * and wifi.cloned-mac-address=stable. It is also used as DHCP client - * identifier with ipv4.dhcp-client-id=stable and to derive the DHCP - * DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. - * - * Note that depending on the context where it is used, other parameters are - * also seeded into the generation algorithm. For example, a per-host key - * is commonly also included, so that different systems end up generating - * different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's - * name is included, so that different interfaces yield different addresses. - * The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret-key. - * - * The '$' character is treated special to perform dynamic substitutions - * at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", - * "${BOOT}", "${RANDOM}". - * These effectively create unique IDs per-connection, per-device, per-boot, - * or every time. Note that "${DEVICE}" corresponds to the interface name of the - * device and "${MAC}" is the permanent MAC address of the device. - * Any unrecognized patterns following '$' are treated verbatim, however - * are reserved for future use. You are thus advised to avoid '$' or - * escape it as "$$". - * For example, set it to "${CONNECTION}-${BOOT}-${DEVICE}" to create a unique id for - * this connection that changes with every reboot and differs depending on the - * interface where the profile activates. - * - * If the value is unset, a global connection default is consulted. If the - * value is still unset, the default is similar to "${CONNECTION}" and uses - * a unique, fixed ID for the connection. - * - * Since: 1.4 - **/ + * NMSettingConnection:stable-id: + * + * This represents the identity of the connection used for various purposes. + * It allows to configure multiple profiles to share the identity. Also, + * the stable-id can contain placeholders that are substituted dynamically and + * deterministically depending on the context. + * + * The stable-id is used for generating IPv6 stable private addresses + * with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the + * generated cloned MAC address for ethernet.cloned-mac-address=stable + * and wifi.cloned-mac-address=stable. It is also used as DHCP client + * identifier with ipv4.dhcp-client-id=stable and to derive the DHCP + * DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. + * + * Note that depending on the context where it is used, other parameters are + * also seeded into the generation algorithm. For example, a per-host key + * is commonly also included, so that different systems end up generating + * different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's + * name is included, so that different interfaces yield different addresses. + * The per-host key is the identity of your machine and stored in /var/lib/NetworkManager/secret-key. + * + * The '$' character is treated special to perform dynamic substitutions + * at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", + * "${BOOT}", "${RANDOM}". + * These effectively create unique IDs per-connection, per-device, per-boot, + * or every time. Note that "${DEVICE}" corresponds to the interface name of the + * device and "${MAC}" is the permanent MAC address of the device. + * Any unrecognized patterns following '$' are treated verbatim, however + * are reserved for future use. You are thus advised to avoid '$' or + * escape it as "$$". + * For example, set it to "${CONNECTION}-${BOOT}-${DEVICE}" to create a unique id for + * this connection that changes with every reboot and differs depending on the + * interface where the profile activates. + * + * If the value is unset, a global connection default is consulted. If the + * value is still unset, the default is similar to "${CONNECTION}" and uses + * a unique, fixed ID for the connection. + * + * Since: 1.4 + **/ /* ---ifcfg-rh--- - * property: stable-id - * variable: STABLE_ID(+) - * description: Token to generate stable IDs. - * ---end--- - */ + * property: stable-id + * variable: STABLE_ID(+) + * description: Token to generate stable IDs. + * ---end--- + */ obj_properties[PROP_STABLE_ID] = g_param_spec_string( NM_SETTING_CONNECTION_STABLE_ID, "", @@ -1855,28 +1855,28 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:interface-name: - * - * The name of the network interface this connection is bound to. If not - * set, then the connection can be attached to any interface of the - * appropriate type (subject to restrictions imposed by other settings). - * - * For software devices this specifies the name of the created device. - * - * For connection types where interface names cannot easily be made - * persistent (e.g. mobile broadband or USB Ethernet), this property should - * not be used. Setting this property restricts the interfaces a connection - * can be used with, and if interface names change or are reordered the - * connection may be applied to the wrong interface. - **/ + * NMSettingConnection:interface-name: + * + * The name of the network interface this connection is bound to. If not + * set, then the connection can be attached to any interface of the + * appropriate type (subject to restrictions imposed by other settings). + * + * For software devices this specifies the name of the created device. + * + * For connection types where interface names cannot easily be made + * persistent (e.g. mobile broadband or USB Ethernet), this property should + * not be used. Setting this property restricts the interfaces a connection + * can be used with, and if interface names change or are reordered the + * connection may be applied to the wrong interface. + **/ /* ---ifcfg-rh--- - * property: interface-name - * variable: DEVICE - * description: Interface name of the device this profile is bound to. The variable - * can be left out when the profile should apply for more devices. Note that DEVICE - * can be required for some connection types. - * ---end--- - */ + * property: interface-name + * variable: DEVICE + * description: Interface name of the device this profile is bound to. The variable + * can be left out when the profile should apply for more devices. Note that DEVICE + * can be required for some connection types. + * ---end--- + */ obj_properties[PROP_INTERFACE_NAME] = g_param_spec_string( NM_SETTING_CONNECTION_INTERFACE_NAME, "", @@ -1891,23 +1891,23 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) nm_setting_connection_no_interface_name, )); /** - * NMSettingConnection:type: - * - * Base type of the connection. For hardware-dependent connections, should - * contain the setting name of the hardware-type specific setting (ie, - * "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for - * non-hardware dependent connections like VPN or otherwise, should contain - * the setting name of that setting type (ie, "vpn" or "bridge", etc). - **/ + * NMSettingConnection:type: + * + * Base type of the connection. For hardware-dependent connections, should + * contain the setting name of the hardware-type specific setting (ie, + * "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for + * non-hardware dependent connections like VPN or otherwise, should contain + * the setting name of that setting type (ie, "vpn" or "bridge", etc). + **/ /* ---ifcfg-rh--- - * property: type - * variable: TYPE (DEVICETYPE, DEVICE) - * values: Ethernet, Wireless, InfiniBand, Bridge, Bond, Vlan, Team, TeamPort - * description: Base type of the connection. DEVICETYPE is used for teaming - * connections. - * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort - * ---end--- - */ + * property: type + * variable: TYPE (DEVICETYPE, DEVICE) + * values: Ethernet, Wireless, InfiniBand, Bridge, Bond, Vlan, Team, TeamPort + * description: Base type of the connection. DEVICETYPE is used for teaming + * connections. + * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort + * ---end--- + */ obj_properties[PROP_TYPE] = g_param_spec_string(NM_SETTING_CONNECTION_TYPE, "", "", @@ -1916,30 +1916,30 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:permissions: - * - * An array of strings defining what access a given user has to this - * connection. If this is %NULL or empty, all users are allowed to access - * this connection; otherwise users are allowed if and only if they are in - * this list. When this is not empty, the connection can be active only when - * one of the specified users is logged into an active session. Each entry - * is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". - * - * At this time only the "user" [type] is allowed. Any other values are - * ignored and reserved for future use. [id] is the username that this - * permission refers to, which may not contain the ":" character. Any - * [reserved] information present must be ignored and is reserved for future - * use. All of [type], [id], and [reserved] must be valid UTF-8. - */ + * NMSettingConnection:permissions: + * + * An array of strings defining what access a given user has to this + * connection. If this is %NULL or empty, all users are allowed to access + * this connection; otherwise users are allowed if and only if they are in + * this list. When this is not empty, the connection can be active only when + * one of the specified users is logged into an active session. Each entry + * is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". + * + * At this time only the "user" [type] is allowed. Any other values are + * ignored and reserved for future use. [id] is the username that this + * permission refers to, which may not contain the ":" character. Any + * [reserved] information present must be ignored and is reserved for future + * use. All of [type], [id], and [reserved] must be valid UTF-8. + */ /* ---ifcfg-rh--- - * property: permissions - * variable: USERS(+) - * description: Restrict to certain users the access to this connection, and - * allow the connection to be active only when at least one of the - * specified users is logged into an active session. - * example: USERS="joe bob" - * ---end--- - */ + * property: permissions + * variable: USERS(+) + * description: Restrict to certain users the access to this connection, and + * allow the connection to be active only when at least one of the + * specified users is logged into an active session. + * example: USERS="joe bob" + * ---end--- + */ obj_properties[PROP_PERMISSIONS] = g_param_spec_boxed(NM_SETTING_CONNECTION_PERMISSIONS, "", @@ -1948,24 +1948,24 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:autoconnect: - * - * Whether or not the connection should be automatically connected by - * NetworkManager when the resources for the connection are available. - * %TRUE to automatically activate the connection, %FALSE to require manual - * intervention to activate the connection. - * - * Note that autoconnect is not implemented for VPN profiles. See - * #NMSettingConnection:secondaries as an alternative to automatically - * connect VPN profiles. - **/ + * NMSettingConnection:autoconnect: + * + * Whether or not the connection should be automatically connected by + * NetworkManager when the resources for the connection are available. + * %TRUE to automatically activate the connection, %FALSE to require manual + * intervention to activate the connection. + * + * Note that autoconnect is not implemented for VPN profiles. See + * #NMSettingConnection:secondaries as an alternative to automatically + * connect VPN profiles. + **/ /* ---ifcfg-rh--- - * property: autoconnect - * variable: ONBOOT - * default: yes - * description: Whether the connection should be autoconnected (not only while booting). - * ---end--- - */ + * property: autoconnect + * variable: ONBOOT + * default: yes + * description: Whether the connection should be autoconnected (not only while booting). + * ---end--- + */ obj_properties[PROP_AUTOCONNECT] = g_param_spec_boolean( NM_SETTING_CONNECTION_AUTOCONNECT, "", @@ -1974,22 +1974,22 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:autoconnect-priority: - * - * The autoconnect priority. If the connection is set to autoconnect, - * connections with higher priority will be preferred. Defaults to 0. - * The higher number means higher priority. - **/ + * NMSettingConnection:autoconnect-priority: + * + * The autoconnect priority. If the connection is set to autoconnect, + * connections with higher priority will be preferred. Defaults to 0. + * The higher number means higher priority. + **/ /* ---ifcfg-rh--- - * property: autoconnect-priority - * variable: AUTOCONNECT_PRIORITY(+) - * values: -999 to 999 - * default: 0 - * description: Connection priority for automatic activation. Connections with - * higher numbers are preferred when selecting profiles for automatic activation. - * example: AUTOCONNECT_PRIORITY=20 - * ---end--- - */ + * property: autoconnect-priority + * variable: AUTOCONNECT_PRIORITY(+) + * values: -999 to 999 + * default: 0 + * description: Connection priority for automatic activation. Connections with + * higher numbers are preferred when selecting profiles for automatic activation. + * example: AUTOCONNECT_PRIORITY=20 + * ---end--- + */ obj_properties[PROP_AUTOCONNECT_PRIORITY] = g_param_spec_int( NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, "", @@ -2000,23 +2000,23 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:autoconnect-retries: - * - * The number of times a connection should be tried when autoactivating before - * giving up. Zero means forever, -1 means the global default (4 times if not - * overridden). Setting this to 1 means to try activation only once before - * blocking autoconnect. Note that after a timeout, NetworkManager will try - * to autoconnect again. - */ + * NMSettingConnection:autoconnect-retries: + * + * The number of times a connection should be tried when autoactivating before + * giving up. Zero means forever, -1 means the global default (4 times if not + * overridden). Setting this to 1 means to try activation only once before + * blocking autoconnect. Note that after a timeout, NetworkManager will try + * to autoconnect again. + */ /* ---ifcfg-rh--- - * property: autoconnect-retries - * variable: AUTOCONNECT_RETRIES(+) - * description: The number of times a connection should be autoactivated - * before giving up and switching to the next one. - * values: -1 (use global default), 0 (forever) or a positive value - * example: AUTOCONNECT_RETRIES=1 - * ---end--- - */ + * property: autoconnect-retries + * variable: AUTOCONNECT_RETRIES(+) + * description: The number of times a connection should be autoactivated + * before giving up and switching to the next one. + * values: -1 (use global default), 0 (forever) or a positive value + * example: AUTOCONNECT_RETRIES=1 + * ---end--- + */ obj_properties[PROP_AUTOCONNECT_RETRIES] = g_param_spec_int( NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES, "", @@ -2027,21 +2027,21 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:multi-connect: - * - * Specifies whether the profile can be active multiple times at a particular - * moment. The value is of type #NMConnectionMultiConnect. - * - * Since: 1.14 - */ + * NMSettingConnection:multi-connect: + * + * Specifies whether the profile can be active multiple times at a particular + * moment. The value is of type #NMConnectionMultiConnect. + * + * Since: 1.14 + */ /* ---ifcfg-rh--- - * property: multi-connect - * variable: MULTI_CONNECT(+) - * description: whether the profile can be active on multiple devices at a given - * moment. The values are numbers corresponding to #NMConnectionMultiConnect enum. - * example: MULTI_CONNECT=3 - * ---end--- - */ + * property: multi-connect + * variable: MULTI_CONNECT(+) + * description: whether the profile can be active on multiple devices at a given + * moment. The values are numbers corresponding to #NMConnectionMultiConnect enum. + * example: MULTI_CONNECT=3 + * ---end--- + */ obj_properties[PROP_MULTI_CONNECT] = g_param_spec_int( NM_SETTING_CONNECTION_MULTI_CONNECT, "", @@ -2052,16 +2052,16 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:timestamp: - * - * The time, in seconds since the Unix Epoch, that the connection was last - * _successfully_ fully activated. - * - * NetworkManager updates the connection timestamp periodically when the - * connection is active to ensure that an active connection has the latest - * timestamp. The property is only meant for reading (changes to this - * property will not be preserved). - **/ + * NMSettingConnection:timestamp: + * + * The time, in seconds since the Unix Epoch, that the connection was last + * _successfully_ fully activated. + * + * NetworkManager updates the connection timestamp periodically when the + * connection is active to ensure that an active connection has the latest + * timestamp. The property is only meant for reading (changes to this + * property will not be preserved). + **/ obj_properties[PROP_TIMESTAMP] = g_param_spec_uint64( NM_SETTING_CONNECTION_TIMESTAMP, "", @@ -2077,12 +2077,12 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) .to_dbus_fcn = _to_dbus_fcn_timestamp, )); /** - * NMSettingConnection:read-only: - * - * %FALSE if the connection can be modified using the provided settings - * service's D-Bus interface with the right privileges, or %TRUE if the - * connection is read-only and cannot be modified. - **/ + * NMSettingConnection:read-only: + * + * %FALSE if the connection can be modified using the provided settings + * service's D-Bus interface with the right privileges, or %TRUE if the + * connection is read-only and cannot be modified. + **/ obj_properties[PROP_READ_ONLY] = g_param_spec_boolean( NM_SETTING_CONNECTION_READ_ONLY, "", @@ -2091,24 +2091,24 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:zone: - * - * The trust level of a the connection. Free form case-insensitive string - * (for example "Home", "Work", "Public"). %NULL or unspecified zone means - * the connection will be placed in the default zone as defined by the - * firewall. - * - * When updating this property on a currently activated connection, - * the change takes effect immediately. - **/ + * NMSettingConnection:zone: + * + * The trust level of a the connection. Free form case-insensitive string + * (for example "Home", "Work", "Public"). %NULL or unspecified zone means + * the connection will be placed in the default zone as defined by the + * firewall. + * + * When updating this property on a currently activated connection, + * the change takes effect immediately. + **/ /* ---ifcfg-rh--- - * property: zone - * variable: ZONE(+) - * description: Trust level of this connection. The string is usually used - * for a firewall. - * example: ZONE=Work - * ---end--- - */ + * property: zone + * variable: ZONE(+) + * description: Trust level of this connection. The string is usually used + * for a firewall. + * example: ZONE=Work + * ---end--- + */ obj_properties[PROP_ZONE] = g_param_spec_string(NM_SETTING_CONNECTION_ZONE, "", @@ -2118,19 +2118,19 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:master: - * - * Interface name of the master device or UUID of the master connection. - **/ + * NMSettingConnection:master: + * + * Interface name of the master device or UUID of the master connection. + **/ /* ---ifcfg-rh--- - * property: master - * variable: MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID - * description: Reference to master connection. The variable used depends on - * the connection type and the value. In general, if the *_UUID variant is present, - * the variant without *_UUID is ignored. NetworkManager attempts to write both - * for compatibility with legacy tooling. - * ---end--- - */ + * property: master + * variable: MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID + * description: Reference to master connection. The variable used depends on + * the connection type and the value. In general, if the *_UUID variant is present, + * the variant without *_UUID is ignored. NetworkManager attempts to write both + * for compatibility with legacy tooling. + * ---end--- + */ obj_properties[PROP_MASTER] = g_param_spec_string(NM_SETTING_CONNECTION_MASTER, "", @@ -2140,22 +2140,22 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:slave-type: - * - * Setting name of the device type of this slave's master connection (eg, - * %NM_SETTING_BOND_SETTING_NAME), or %NULL if this connection is not a - * slave. - **/ + * NMSettingConnection:slave-type: + * + * Setting name of the device type of this slave's master connection (eg, + * %NM_SETTING_BOND_SETTING_NAME), or %NULL if this connection is not a + * slave. + **/ /* ---ifcfg-rh--- - * property: slave-type - * variable: MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, DEVICETYPE, - * BRIDGE, BRIDGE_UUID - * description: Slave type doesn't map directly to a variable, but it is - * recognized using different variables. MASTER and MASTER_UUID for bonding, - * TEAM_MASTER, TEAM_MASTER_UUID and DEVICETYPE for teaming, BRIDGE - * and BRIDGE_UUID for bridging. - * ---end--- - */ + * property: slave-type + * variable: MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, DEVICETYPE, + * BRIDGE, BRIDGE_UUID + * description: Slave type doesn't map directly to a variable, but it is + * recognized using different variables. MASTER and MASTER_UUID for bonding, + * TEAM_MASTER, TEAM_MASTER_UUID and DEVICETYPE for teaming, BRIDGE + * and BRIDGE_UUID for bridging. + * ---end--- + */ obj_properties[PROP_SLAVE_TYPE] = g_param_spec_string(NM_SETTING_CONNECTION_SLAVE_TYPE, "", @@ -2165,28 +2165,28 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:autoconnect-slaves: - * - * Whether or not slaves of this connection should be automatically brought up - * when NetworkManager activates this connection. This only has a real effect - * for master connections. The properties #NMSettingConnection:autoconnect, - * #NMSettingConnection:autoconnect-priority and #NMSettingConnection:autoconnect-retries - * are unrelated to this setting. - * The permitted values are: 0: leave slave connections untouched, - * 1: activate all the slave connections with this connection, -1: default. - * If -1 (default) is set, global connection.autoconnect-slaves is read to - * determine the real value. If it is default as well, this fallbacks to 0. - * - * Since: 1.2 - **/ + * NMSettingConnection:autoconnect-slaves: + * + * Whether or not slaves of this connection should be automatically brought up + * when NetworkManager activates this connection. This only has a real effect + * for master connections. The properties #NMSettingConnection:autoconnect, + * #NMSettingConnection:autoconnect-priority and #NMSettingConnection:autoconnect-retries + * are unrelated to this setting. + * The permitted values are: 0: leave slave connections untouched, + * 1: activate all the slave connections with this connection, -1: default. + * If -1 (default) is set, global connection.autoconnect-slaves is read to + * determine the real value. If it is default as well, this fallbacks to 0. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: autoconnect-slaves - * variable: AUTOCONNECT_SLAVES(+) - * default: missing variable means global default - * description: Whether slaves of this connection should be auto-connected - * when this connection is activated. - * ---end--- - */ + * property: autoconnect-slaves + * variable: AUTOCONNECT_SLAVES(+) + * default: missing variable means global default + * description: Whether slaves of this connection should be auto-connected + * when this connection is activated. + * ---end--- + */ obj_properties[PROP_AUTOCONNECT_SLAVES] = g_param_spec_enum( NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, "", @@ -2196,19 +2196,19 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:secondaries: - * - * List of connection UUIDs that should be activated when the base - * connection itself is activated. Currently, only VPN connections are - * supported. - **/ + * NMSettingConnection:secondaries: + * + * List of connection UUIDs that should be activated when the base + * connection itself is activated. Currently, only VPN connections are + * supported. + **/ /* ---ifcfg-rh--- - * property: secondaries - * variable: SECONDARY_UUIDS(+) - * description: UUID of VPN connections that should be activated - * together with this connection. - * ---end--- - */ + * property: secondaries + * variable: SECONDARY_UUIDS(+) + * description: UUID of VPN connections that should be activated + * together with this connection. + * ---end--- + */ obj_properties[PROP_SECONDARIES] = g_param_spec_boxed( NM_SETTING_CONNECTION_SECONDARIES, "", @@ -2217,20 +2217,20 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:gateway-ping-timeout: - * - * If greater than zero, delay success of IP addressing until either the - * timeout is reached, or an IP gateway replies to a ping. - **/ + * NMSettingConnection:gateway-ping-timeout: + * + * If greater than zero, delay success of IP addressing until either the + * timeout is reached, or an IP gateway replies to a ping. + **/ /* ---ifcfg-rh--- - * property: gateway-ping-timeout - * variable: GATEWAY_PING_TIMEOUT(+) - * default: 0 - * description: If greater than zero, the IP connectivity will be checked by - * pinging the gateway and waiting for the specified timeout (in seconds). - * example: GATEWAY_PING_TIMEOUT=5 - * ---end--- - */ + * property: gateway-ping-timeout + * variable: GATEWAY_PING_TIMEOUT(+) + * default: 0 + * description: If greater than zero, the IP connectivity will be checked by + * pinging the gateway and waiting for the specified timeout (in seconds). + * example: GATEWAY_PING_TIMEOUT=5 + * ---end--- + */ obj_properties[PROP_GATEWAY_PING_TIMEOUT] = g_param_spec_uint(NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", @@ -2241,23 +2241,23 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:metered: - * - * Whether the connection is metered. - * - * When updating this property on a currently activated connection, - * the change takes effect immediately. - * - * Since: 1.2 - **/ + * NMSettingConnection:metered: + * + * Whether the connection is metered. + * + * When updating this property on a currently activated connection, + * the change takes effect immediately. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: metered - * variable: CONNECTION_METERED(+) - * values: yes,no,unknown - * description: Whether the device is metered - * example: CONNECTION_METERED=yes - * ---end--- - */ + * property: metered + * variable: CONNECTION_METERED(+) + * values: yes,no,unknown + * description: Whether the device is metered + * example: CONNECTION_METERED=yes + * ---end--- + */ obj_properties[PROP_METERED] = g_param_spec_enum( NM_SETTING_CONNECTION_METERED, "", @@ -2267,21 +2267,21 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_REAPPLY_IMMEDIATELY | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:lldp: - * - * Whether LLDP is enabled for the connection. - * - * Since: 1.2 - **/ + * NMSettingConnection:lldp: + * + * Whether LLDP is enabled for the connection. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: lldp - * variable: LLDP(+) - * values: boolean value or 'rx' - * default: missing variable means global default - * description: whether LLDP is enabled for the connection - * example: LLDP=no - * ---end--- - */ + * property: lldp + * variable: LLDP(+) + * values: boolean value or 'rx' + * default: missing variable means global default + * description: whether LLDP is enabled for the connection + * example: LLDP=no + * ---end--- + */ obj_properties[PROP_LLDP] = g_param_spec_int(NM_SETTING_CONNECTION_LLDP, "", "", @@ -2292,23 +2292,23 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:auth-retries: - * - * The number of retries for the authentication. Zero means to try indefinitely; -1 means - * to use a global default. If the global default is not set, the authentication - * retries for 3 times before failing the connection. - * - * Currently, this only applies to 802-1x authentication. - * - * Since: 1.10 - **/ + * NMSettingConnection:auth-retries: + * + * The number of retries for the authentication. Zero means to try indefinitely; -1 means + * to use a global default. If the global default is not set, the authentication + * retries for 3 times before failing the connection. + * + * Currently, this only applies to 802-1x authentication. + * + * Since: 1.10 + **/ /* ---ifcfg-rh--- - * property: auth-retries - * variable: AUTH_RETRIES(+) - * default: 0 - * description: Number of retries for authentication. - * ---end--- - */ + * property: auth-retries + * variable: AUTH_RETRIES(+) + * default: 0 + * description: Number of retries for authentication. + * ---end--- + */ obj_properties[PROP_AUTH_RETRIES] = g_param_spec_int( NM_SETTING_CONNECTION_AUTH_RETRIES, "", @@ -2319,31 +2319,31 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:mdns: - * - * Whether mDNS is enabled for the connection. - * - * The permitted values are: "yes" (2) register hostname and resolving - * for the connection, "no" (0) disable mDNS for the interface, "resolve" - * (1) do not register hostname but allow resolving of mDNS host names - * and "default" (-1) to allow lookup of a global default in NetworkManager.conf. - * If unspecified, "default" ultimately depends on the DNS plugin (which - * for systemd-resolved currently means "no"). - * - * This feature requires a plugin which supports mDNS. Otherwise, the - * setting has no effect. One such plugin is dns-systemd-resolved. + * NMSettingConnection:mdns: + * + * Whether mDNS is enabled for the connection. + * + * The permitted values are: "yes" (2) register hostname and resolving + * for the connection, "no" (0) disable mDNS for the interface, "resolve" + * (1) do not register hostname but allow resolving of mDNS host names + * and "default" (-1) to allow lookup of a global default in NetworkManager.conf. + * If unspecified, "default" ultimately depends on the DNS plugin (which + * for systemd-resolved currently means "no"). + * + * This feature requires a plugin which supports mDNS. Otherwise, the + * setting has no effect. One such plugin is dns-systemd-resolved. * - * Since: 1.12 - **/ + * Since: 1.12 + **/ /* ---ifcfg-rh--- - * property: mdns - * variable: MDNS(+) - * values: yes,no,resolve - * default: missing variable means global default - * description: Whether or not mDNS is enabled for the connection - * example: MDNS=yes - * ---end--- - */ + * property: mdns + * variable: MDNS(+) + * values: yes,no,resolve + * default: missing variable means global default + * description: Whether or not mDNS is enabled for the connection + * example: MDNS=yes + * ---end--- + */ obj_properties[PROP_MDNS] = g_param_spec_int(NM_SETTING_CONNECTION_MDNS, "", "", @@ -2353,33 +2353,33 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:llmnr: - * - * Whether Link-Local Multicast Name Resolution (LLMNR) is enabled - * for the connection. LLMNR is a protocol based on the Domain Name - * System (DNS) packet format that allows both IPv4 and IPv6 hosts - * to perform name resolution for hosts on the same local link. - * - * The permitted values are: "yes" (2) register hostname and resolving - * for the connection, "no" (0) disable LLMNR for the interface, "resolve" - * (1) do not register hostname but allow resolving of LLMNR host names - * If unspecified, "default" ultimately depends on the DNS plugin (which - * for systemd-resolved currently means "yes"). - * - * This feature requires a plugin which supports LLMNR. Otherwise, the - * setting has no effect. One such plugin is dns-systemd-resolved. - * - * Since: 1.14 - **/ + * NMSettingConnection:llmnr: + * + * Whether Link-Local Multicast Name Resolution (LLMNR) is enabled + * for the connection. LLMNR is a protocol based on the Domain Name + * System (DNS) packet format that allows both IPv4 and IPv6 hosts + * to perform name resolution for hosts on the same local link. + * + * The permitted values are: "yes" (2) register hostname and resolving + * for the connection, "no" (0) disable LLMNR for the interface, "resolve" + * (1) do not register hostname but allow resolving of LLMNR host names + * If unspecified, "default" ultimately depends on the DNS plugin (which + * for systemd-resolved currently means "yes"). + * + * This feature requires a plugin which supports LLMNR. Otherwise, the + * setting has no effect. One such plugin is dns-systemd-resolved. + * + * Since: 1.14 + **/ /* ---ifcfg-rh--- - * property: llmnr - * variable: LLMNR(+) - * values: yes,no,resolve - * default: missing variable means global default - * description: Whether or not LLMNR is enabled for the connection - * example: LLMNR=yes - * ---end--- - */ + * property: llmnr + * variable: LLMNR(+) + * values: yes,no,resolve + * default: missing variable means global default + * description: Whether or not LLMNR is enabled for the connection + * example: LLMNR=yes + * ---end--- + */ obj_properties[PROP_LLMNR] = g_param_spec_int(NM_SETTING_CONNECTION_LLMNR, "", "", @@ -2389,30 +2389,30 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:wait-device-timeout: - * - * Timeout in milliseconds to wait for device at startup. - * During boot, devices may take a while to be detected by the driver. - * This property will cause to delay NetworkManager-wait-online.service - * and nm-online to give the device a chance to appear. This works by - * waiting for the given timeout until a compatible device for the - * profile is available and managed. - * - * The value 0 means no wait time. The default value is -1, which - * currently has the same meaning as no wait time. - * - * Since: 1.20 - **/ + * NMSettingConnection:wait-device-timeout: + * + * Timeout in milliseconds to wait for device at startup. + * During boot, devices may take a while to be detected by the driver. + * This property will cause to delay NetworkManager-wait-online.service + * and nm-online to give the device a chance to appear. This works by + * waiting for the given timeout until a compatible device for the + * profile is available and managed. + * + * The value 0 means no wait time. The default value is -1, which + * currently has the same meaning as no wait time. + * + * Since: 1.20 + **/ /* ---ifcfg-rh--- - * property: wait-device-timeout - * variable: DEVTIMEOUT(+) - * values: timeout in seconds. - * description: for initscripts compatibility, this variable must be - * a whole integer. If necessary, NetworkManager stores also a fractional - * component for the milliseconds. - * example: DEVTIMEOUT=5 - * ---end--- - */ + * property: wait-device-timeout + * variable: DEVTIMEOUT(+) + * values: timeout in seconds. + * description: for initscripts compatibility, this variable must be + * a whole integer. If necessary, NetworkManager stores also a fractional + * component for the milliseconds. + * example: DEVTIMEOUT=5 + * ---end--- + */ obj_properties[PROP_WAIT_DEVICE_TIMEOUT] = g_param_spec_int(NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, "", @@ -2423,27 +2423,27 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingConnection:mud-url: - * - * If configured, set to a Manufacturer Usage Description (MUD) URL that points - * to manufacturer-recommended network policies for IoT devices. It is transmitted - * as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://". - * - * The special value "none" is allowed to indicate that no MUD URL is used. - * - * If the per-profile value is unspecified (the default), a global connection default gets - * consulted. If still unspecified, the ultimate default is "none". - * - * Since: 1.26 - **/ + * NMSettingConnection:mud-url: + * + * If configured, set to a Manufacturer Usage Description (MUD) URL that points + * to manufacturer-recommended network policies for IoT devices. It is transmitted + * as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with "https://". + * + * The special value "none" is allowed to indicate that no MUD URL is used. + * + * If the per-profile value is unspecified (the default), a global connection default gets + * consulted. If still unspecified, the ultimate default is "none". + * + * Since: 1.26 + **/ /* ---ifcfg-rh--- - * property: mud-url - * variable: MUD_URL - * values: a valid URL that points to recommended policy for this device - * description: MUD_URL to be sent by device (See RFC 8520). - * example: https://yourdevice.example.com/model.json - * ---end--- - */ + * property: mud-url + * variable: MUD_URL + * values: a valid URL that points to recommended policy for this device + * description: MUD_URL to be sent by device (See RFC 8520). + * example: https://yourdevice.example.com/model.json + * ---end--- + */ obj_properties[PROP_MUD_URL] = g_param_spec_string(NM_SETTING_CONNECTION_MUD_URL, "", "", diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index e4546837f8..ee62795a8d 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -545,8 +545,8 @@ check_uint_array(const guint * array, } } else { /* If the feature is disabled, sum must equal 0%, which was checked - * by the for() loop above. - */ + * by the for() loop above. + */ g_assert_cmpint(sum, ==, 0); } } @@ -922,20 +922,20 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) setting_class->verify = verify; /** - * NMSettingDcb:app-fcoe-flags: - * - * Specifies the #NMSettingDcbFlags for the DCB FCoE application. Flags may - * be any combination of %NM_SETTING_DCB_FLAG_ENABLE, - * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. - **/ + * NMSettingDcb:app-fcoe-flags: + * + * Specifies the #NMSettingDcbFlags for the DCB FCoE application. Flags may + * be any combination of %NM_SETTING_DCB_FLAG_ENABLE, + * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. + **/ /* ---ifcfg-rh--- - * property: app-fcoe-flags - * variable: DCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLING - * description: FCOE flags. - * default: no - * example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes - * ---end--- - */ + * property: app-fcoe-flags + * variable: DCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLING + * description: FCOE flags. + * default: no + * example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes + * ---end--- + */ obj_properties[PROP_APP_FCOE_FLAGS] = g_param_spec_flags(NM_SETTING_DCB_APP_FCOE_FLAGS, "", @@ -945,19 +945,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:app-fcoe-priority: - * - * The highest User Priority (0 - 7) which FCoE frames should use, or -1 for - * default priority. Only used when the #NMSettingDcb:app-fcoe-flags - * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. - **/ + * NMSettingDcb:app-fcoe-priority: + * + * The highest User Priority (0 - 7) which FCoE frames should use, or -1 for + * default priority. Only used when the #NMSettingDcb:app-fcoe-flags + * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. + **/ /* ---ifcfg-rh--- - * property: app-fcoe-priority - * variable: DCB_APP_FCOE_PRIORITY - * values: 0 - 7 - * description: Priority of FCoE frames. - * ---end--- - */ + * property: app-fcoe-priority + * variable: DCB_APP_FCOE_PRIORITY + * values: 0 - 7 + * description: Priority of FCoE frames. + * ---end--- + */ obj_properties[PROP_APP_FCOE_PRIORITY] = g_param_spec_int(NM_SETTING_DCB_APP_FCOE_PRIORITY, "", @@ -968,19 +968,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:app-fcoe-mode: - * - * The FCoE controller mode; either %NM_SETTING_DCB_FCOE_MODE_FABRIC - * (default) or %NM_SETTING_DCB_FCOE_MODE_VN2VN. - **/ + * NMSettingDcb:app-fcoe-mode: + * + * The FCoE controller mode; either %NM_SETTING_DCB_FCOE_MODE_FABRIC + * (default) or %NM_SETTING_DCB_FCOE_MODE_VN2VN. + **/ /* ---ifcfg-rh--- - * property: app-fcoe-mode - * variable: DCB_APP_FCOE_MODE - * values: fabric, vn2vn - * default: fabric - * description: FCoE controller mode. - * ---end--- - */ + * property: app-fcoe-mode + * variable: DCB_APP_FCOE_MODE + * values: fabric, vn2vn + * default: fabric + * description: FCoE controller mode. + * ---end--- + */ obj_properties[PROP_APP_FCOE_MODE] = g_param_spec_string(NM_SETTING_DCB_APP_FCOE_MODE, "", @@ -989,19 +989,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:app-iscsi-flags: - * - * Specifies the #NMSettingDcbFlags for the DCB iSCSI application. Flags - * may be any combination of %NM_SETTING_DCB_FLAG_ENABLE, - * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. - **/ + * NMSettingDcb:app-iscsi-flags: + * + * Specifies the #NMSettingDcbFlags for the DCB iSCSI application. Flags + * may be any combination of %NM_SETTING_DCB_FLAG_ENABLE, + * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. + **/ /* ---ifcfg-rh--- - * property: app-iscsi-flags - * variable: DCB_APP_ISCSI_ENABLE, DCB_APP_ISCSI_ADVERTISE, DCB_APP_ISCSI_WILLING - * default: no - * description: iSCSI flags. - * ---end--- - */ + * property: app-iscsi-flags + * variable: DCB_APP_ISCSI_ENABLE, DCB_APP_ISCSI_ADVERTISE, DCB_APP_ISCSI_WILLING + * default: no + * description: iSCSI flags. + * ---end--- + */ obj_properties[PROP_APP_ISCSI_FLAGS] = g_param_spec_flags(NM_SETTING_DCB_APP_ISCSI_FLAGS, "", @@ -1011,19 +1011,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:app-iscsi-priority: - * - * The highest User Priority (0 - 7) which iSCSI frames should use, or -1 - * for default priority. Only used when the #NMSettingDcb:app-iscsi-flags - * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. - **/ + * NMSettingDcb:app-iscsi-priority: + * + * The highest User Priority (0 - 7) which iSCSI frames should use, or -1 + * for default priority. Only used when the #NMSettingDcb:app-iscsi-flags + * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. + **/ /* ---ifcfg-rh--- - * property: app-iscsi-priority - * variable: DCB_APP_ISCSI_PRIORITY - * values: 0 - 7 - * description: Priority of iSCSI frames. - * ---end--- - */ + * property: app-iscsi-priority + * variable: DCB_APP_ISCSI_PRIORITY + * values: 0 - 7 + * description: Priority of iSCSI frames. + * ---end--- + */ obj_properties[PROP_APP_ISCSI_PRIORITY] = g_param_spec_int(NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", @@ -1034,19 +1034,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:app-fip-flags: - * - * Specifies the #NMSettingDcbFlags for the DCB FIP application. Flags may - * be any combination of %NM_SETTING_DCB_FLAG_ENABLE, - * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. - **/ + * NMSettingDcb:app-fip-flags: + * + * Specifies the #NMSettingDcbFlags for the DCB FIP application. Flags may + * be any combination of %NM_SETTING_DCB_FLAG_ENABLE, + * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. + **/ /* ---ifcfg-rh--- - * property: app-fip-flags - * variable: DCB_APP_FIP_ENABLE, DCB_APP_FIP_ADVERTISE, DCB_APP_FIP_WILLING - * default: no - * description: FIP flags. - * ---end--- - */ + * property: app-fip-flags + * variable: DCB_APP_FIP_ENABLE, DCB_APP_FIP_ADVERTISE, DCB_APP_FIP_WILLING + * default: no + * description: FIP flags. + * ---end--- + */ obj_properties[PROP_APP_FIP_FLAGS] = g_param_spec_flags(NM_SETTING_DCB_APP_FIP_FLAGS, "", @@ -1056,19 +1056,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:app-fip-priority: - * - * The highest User Priority (0 - 7) which FIP frames should use, or -1 for - * default priority. Only used when the #NMSettingDcb:app-fip-flags - * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. - **/ + * NMSettingDcb:app-fip-priority: + * + * The highest User Priority (0 - 7) which FIP frames should use, or -1 for + * default priority. Only used when the #NMSettingDcb:app-fip-flags + * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. + **/ /* ---ifcfg-rh--- - * property: app-fip-priority - * variable: DCB_APP_FIP_PRIORITY - * values: 0 - 7 - * description: Priority of FIP frames. - * ---end--- - */ + * property: app-fip-priority + * variable: DCB_APP_FIP_PRIORITY + * values: 0 - 7 + * description: Priority of FIP frames. + * ---end--- + */ obj_properties[PROP_APP_FIP_PRIORITY] = g_param_spec_int(NM_SETTING_DCB_APP_FIP_PRIORITY, "", @@ -1079,19 +1079,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:priority-flow-control-flags: - * - * Specifies the #NMSettingDcbFlags for DCB Priority Flow Control (PFC). - * Flags may be any combination of %NM_SETTING_DCB_FLAG_ENABLE, - * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. - **/ + * NMSettingDcb:priority-flow-control-flags: + * + * Specifies the #NMSettingDcbFlags for DCB Priority Flow Control (PFC). + * Flags may be any combination of %NM_SETTING_DCB_FLAG_ENABLE, + * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. + **/ /* ---ifcfg-rh--- - * property: priority-flow-control-flags - * variable: DCB_PFC_ENABLE, DCB_PFC_ADVERTISE, DCB_PFC_WILLING - * default: no - * description: Priority flow control flags. - * ---end--- - */ + * property: priority-flow-control-flags + * variable: DCB_PFC_ENABLE, DCB_PFC_ADVERTISE, DCB_PFC_WILLING + * default: no + * description: Priority flow control flags. + * ---end--- + */ obj_properties[PROP_PFC_FLAGS] = g_param_spec_flags(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "", @@ -1100,20 +1100,20 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:priority-flow-control: (type GArray(gboolean)) - * - * An array of 8 boolean values, where the array index corresponds to the User - * Priority (0 - 7) and the value indicates whether or not the corresponding - * priority should transmit priority pause. - **/ + * NMSettingDcb:priority-flow-control: (type GArray(gboolean)) + * + * An array of 8 boolean values, where the array index corresponds to the User + * Priority (0 - 7) and the value indicates whether or not the corresponding + * priority should transmit priority pause. + **/ /* ---ifcfg-rh--- - * property: priority-flow-control - * variable: DCB_PFC_UP - * description: Priority flow control values. String of 8 "0" and "1", where "0". - * means "do not transmit priority pause", "1" means "transmit pause". - * example: DCB_PFC_UP=01101110 - * ---end--- - */ + * property: priority-flow-control + * variable: DCB_PFC_UP + * description: Priority flow control values. String of 8 "0" and "1", where "0". + * means "do not transmit priority pause", "1" means "transmit pause". + * example: DCB_PFC_UP=01101110 + * ---end--- + */ obj_properties[PROP_PRIORITY_FLOW_CONTROL] = g_param_spec_boxed(NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", @@ -1125,19 +1125,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) &nm_sett_info_propert_type_dcb_au); /** - * NMSettingDcb:priority-group-flags: - * - * Specifies the #NMSettingDcbFlags for DCB Priority Groups. Flags may be - * any combination of %NM_SETTING_DCB_FLAG_ENABLE, - * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. - **/ + * NMSettingDcb:priority-group-flags: + * + * Specifies the #NMSettingDcbFlags for DCB Priority Groups. Flags may be + * any combination of %NM_SETTING_DCB_FLAG_ENABLE, + * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. + **/ /* ---ifcfg-rh--- - * property: priority-group-flags - * variable: DCB_PG_ENABLE, DCB_PG_ADVERTISE, DCB_PG_WILLING - * default: no - * description: Priority groups flags. - * ---end--- - */ + * property: priority-group-flags + * variable: DCB_PG_ENABLE, DCB_PG_ADVERTISE, DCB_PG_WILLING + * default: no + * description: Priority groups flags. + * ---end--- + */ obj_properties[PROP_PRIORITY_GROUP_FLAGS] = g_param_spec_flags(NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", @@ -1147,20 +1147,20 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingDcb:priority-group-id: (type GArray(guint)) - * - * An array of 8 uint values, where the array index corresponds to the User - * Priority (0 - 7) and the value indicates the Priority Group ID. Allowed - * Priority Group ID values are 0 - 7 or 15 for the unrestricted group. - **/ + * NMSettingDcb:priority-group-id: (type GArray(guint)) + * + * An array of 8 uint values, where the array index corresponds to the User + * Priority (0 - 7) and the value indicates the Priority Group ID. Allowed + * Priority Group ID values are 0 - 7 or 15 for the unrestricted group. + **/ /* ---ifcfg-rh--- - * property: priority-group-id - * variable: DCB_PG_ID - * description: Priority groups values. String of eight priorities (0 - 7) or "f" - * (unrestricted). - * example: DCB_PG_ID=1205f173 - * ---end--- - */ + * property: priority-group-id + * variable: DCB_PG_ID + * description: Priority groups values. String of eight priorities (0 - 7) or "f" + * (unrestricted). + * example: DCB_PG_ID=1205f173 + * ---end--- + */ obj_properties[PROP_PRIORITY_GROUP_ID] = g_param_spec_boxed(NM_SETTING_DCB_PRIORITY_GROUP_ID, "", @@ -1172,20 +1172,20 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) &nm_sett_info_propert_type_dcb_au); /** - * NMSettingDcb:priority-group-bandwidth: (type GArray(guint)) - * - * An array of 8 uint values, where the array index corresponds to the - * Priority Group ID (0 - 7) and the value indicates the percentage of link - * bandwidth allocated to that group. Allowed values are 0 - 100, and the - * sum of all values must total 100 percents. - **/ + * NMSettingDcb:priority-group-bandwidth: (type GArray(guint)) + * + * An array of 8 uint values, where the array index corresponds to the + * Priority Group ID (0 - 7) and the value indicates the percentage of link + * bandwidth allocated to that group. Allowed values are 0 - 100, and the + * sum of all values must total 100 percents. + **/ /* ---ifcfg-rh--- - * property: priority-group-bandwidth - * variable: DCB_PG_PCT - * description: Priority groups values. Eight bandwidths (in percent), separated with commas. - * example: DCB_PG_PCT=10,5,10,15,10,10,10,30 - * ---end--- - */ + * property: priority-group-bandwidth + * variable: DCB_PG_PCT + * description: Priority groups values. Eight bandwidths (in percent), separated with commas. + * example: DCB_PG_PCT=10,5,10,15,10,10,10,30 + * ---end--- + */ obj_properties[PROP_PRIORITY_GROUP_BANDWIDTH] = g_param_spec_boxed(NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", @@ -1197,22 +1197,22 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) &nm_sett_info_propert_type_dcb_au); /** - * NMSettingDcb:priority-bandwidth: (type GArray(guint)) - * - * An array of 8 uint values, where the array index corresponds to the User - * Priority (0 - 7) and the value indicates the percentage of bandwidth of - * the priority's assigned group that the priority may use. The sum of all - * percentages for priorities which belong to the same group must total 100 - * percents. - **/ + * NMSettingDcb:priority-bandwidth: (type GArray(guint)) + * + * An array of 8 uint values, where the array index corresponds to the User + * Priority (0 - 7) and the value indicates the percentage of bandwidth of + * the priority's assigned group that the priority may use. The sum of all + * percentages for priorities which belong to the same group must total 100 + * percents. + **/ /* ---ifcfg-rh--- - * property: priority-bandwidth - * variable: DCB_PG_UPPCT - * description: Priority values. Eight bandwidths (in percent), separated with commas. - * The sum of the numbers must be 100. - * example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20 - * ---end--- - */ + * property: priority-bandwidth + * variable: DCB_PG_UPPCT + * description: Priority values. Eight bandwidths (in percent), separated with commas. + * The sum of the numbers must be 100. + * example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20 + * ---end--- + */ obj_properties[PROP_PRIORITY_BANDWIDTH] = g_param_spec_boxed(NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", @@ -1224,20 +1224,20 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) &nm_sett_info_propert_type_dcb_au); /** - * NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean)) - * - * An array of 8 boolean values, where the array index corresponds to the User - * Priority (0 - 7) and the value indicates whether or not the priority may - * use all of the bandwidth allocated to its assigned group. - **/ + * NMSettingDcb:priority-strict-bandwidth: (type GArray(gboolean)) + * + * An array of 8 boolean values, where the array index corresponds to the User + * Priority (0 - 7) and the value indicates whether or not the priority may + * use all of the bandwidth allocated to its assigned group. + **/ /* ---ifcfg-rh--- - * property: priority-strict-bandwidth - * variable: DCB_PG_STRICT - * description: Priority values. String of eight "0" or "1", where "0" means - * "may not utilize all bandwidth", "1" means "may utilize all bandwidth". - * example: DCB_PG_STRICT=01101110 - * ---end--- - */ + * property: priority-strict-bandwidth + * variable: DCB_PG_STRICT + * description: Priority values. String of eight "0" or "1", where "0" means + * "may not utilize all bandwidth", "1" means "may utilize all bandwidth". + * example: DCB_PG_STRICT=01101110 + * ---end--- + */ obj_properties[PROP_PRIORITY_STRICT_BANDWIDTH] = g_param_spec_boxed(NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", @@ -1249,19 +1249,19 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass) &nm_sett_info_propert_type_dcb_au); /** - * NMSettingDcb:priority-traffic-class: (type GArray(guint)) - * - * An array of 8 uint values, where the array index corresponds to the User - * Priority (0 - 7) and the value indicates the traffic class (0 - 7) to - * which the priority is mapped. - **/ + * NMSettingDcb:priority-traffic-class: (type GArray(guint)) + * + * An array of 8 uint values, where the array index corresponds to the User + * Priority (0 - 7) and the value indicates the traffic class (0 - 7) to + * which the priority is mapped. + **/ /* ---ifcfg-rh--- - * property: priority-traffic-class - * variable: DCB_PG_UP2TC - * description: Priority values. String of eight traffic class values (0 - 7). - * example: DCB_PG_UP2TC=01623701 - * ---end--- - */ + * property: priority-traffic-class + * variable: DCB_PG_UP2TC + * description: Priority values. String of eight traffic class values (0 - 7). + * example: DCB_PG_UP2TC=01623701 + * ---end--- + */ obj_properties[PROP_PRIORITY_TRAFFIC_CLASS] = g_param_spec_boxed(NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c index 15aeb01cfb..e16d8ac5ab 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/libnm-core/nm-setting-gsm.c @@ -299,23 +299,23 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } /* APNs roughly follow the same rules as DNS domain names. Allowed - * characters are a-z, 0-9, . and -. GSM 03.03 Section 9.1 states: - * - * The syntax of the APN shall follow the Name Syntax defined in - * RFC 2181 [14] and RFC 1035 [15]. The APN consists of one or - * more labels. Each label is coded as one octet length field - * followed by that number of octets coded as 8 bit ASCII characters. - * Following RFC 1035 [15] the labels should consist only of the - * alphabetic characters (A-Z and a-z), digits (0-9) and the - * dash (-). The case of alphabetic characters is not significant. - * - * A dot (.) is commonly used to separate parts of the APN, and - * apparently the underscore (_) is used as well. RFC 2181 indicates - * that no restrictions of any kind are placed on DNS labels, and thus - * it would appear that none are placed on APNs either, but many modems - * and networks will fail to accept APNs that include odd characters - * like space ( ) and such. - */ + * characters are a-z, 0-9, . and -. GSM 03.03 Section 9.1 states: + * + * The syntax of the APN shall follow the Name Syntax defined in + * RFC 2181 [14] and RFC 1035 [15]. The APN consists of one or + * more labels. Each label is coded as one octet length field + * followed by that number of octets coded as 8 bit ASCII characters. + * Following RFC 1035 [15] the labels should consist only of the + * alphabetic characters (A-Z and a-z), digits (0-9) and the + * dash (-). The case of alphabetic characters is not significant. + * + * A dot (.) is commonly used to separate parts of the APN, and + * apparently the underscore (_) is used as well. RFC 2181 indicates + * that no restrictions of any kind are placed on DNS labels, and thus + * it would appear that none are placed on APNs either, but many modems + * and networks will fail to accept APNs that include odd characters + * like space ( ) and such. + */ for (i = 0; i < apn_len; i++) { if (!g_ascii_isalnum(priv->apn[i]) && (priv->apn[i] != '.') && (priv->apn[i] != '_') && (priv->apn[i] != '-')) { @@ -643,14 +643,14 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) setting_class->need_secrets = need_secrets; /** - * NMSettingGsm:auto-config: - * - * When %TRUE, the settings such as APN, username, or password will - * default to values that match the network the modem will register - * to in the Mobile Broadband Provider database. - * - * Since: 1.22 - **/ + * NMSettingGsm:auto-config: + * + * When %TRUE, the settings such as APN, username, or password will + * default to values that match the network the modem will register + * to in the Mobile Broadband Provider database. + * + * Since: 1.22 + **/ obj_properties[PROP_AUTO_CONFIG] = g_param_spec_boolean(NM_SETTING_GSM_AUTO_CONFIG, "", @@ -659,13 +659,13 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:number: - * - * Legacy setting that used to help establishing PPP data sessions for - * GSM-based modems. - * - * Deprecated: 1.16: User-provided values for this setting are no longer used. - **/ + * NMSettingGsm:number: + * + * Legacy setting that used to help establishing PPP data sessions for + * GSM-based modems. + * + * Deprecated: 1.16: User-provided values for this setting are no longer used. + **/ obj_properties[PROP_NUMBER] = g_param_spec_string(NM_SETTING_GSM_NUMBER, "", "", @@ -673,12 +673,12 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:username: - * - * The username used to authenticate with the network, if required. Many - * providers do not require a username, or accept any username. But if a - * username is required, it is specified here. - **/ + * NMSettingGsm:username: + * + * The username used to authenticate with the network, if required. Many + * providers do not require a username, or accept any username. But if a + * username is required, it is specified here. + **/ obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_GSM_USERNAME, "", "", @@ -686,12 +686,12 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:password: - * - * The password used to authenticate with the network, if required. Many - * providers do not require a password, or accept any password. But if a - * password is required, it is specified here. - **/ + * NMSettingGsm:password: + * + * The password used to authenticate with the network, if required. Many + * providers do not require a password, or accept any password. But if a + * password is required, it is specified here. + **/ obj_properties[PROP_PASSWORD] = g_param_spec_string(NM_SETTING_GSM_PASSWORD, "", @@ -700,10 +700,10 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:password-flags: - * - * Flags indicating how to handle the #NMSettingGsm:password property. - **/ + * NMSettingGsm:password-flags: + * + * Flags indicating how to handle the #NMSettingGsm:password property. + **/ obj_properties[PROP_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_GSM_PASSWORD_FLAGS, "", @@ -713,16 +713,16 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:apn: - * - * The GPRS Access Point Name specifying the APN used when establishing a - * data session with the GSM-based network. The APN often determines how - * the user will be billed for their network usage and whether the user has - * access to the Internet or just a provider-specific walled-garden, so it - * is important to use the correct APN for the user's mobile broadband plan. - * The APN may only be composed of the characters a-z, 0-9, ., and - per GSM - * 03.60 Section 14.9. - **/ + * NMSettingGsm:apn: + * + * The GPRS Access Point Name specifying the APN used when establishing a + * data session with the GSM-based network. The APN often determines how + * the user will be billed for their network usage and whether the user has + * access to the Internet or just a provider-specific walled-garden, so it + * is important to use the correct APN for the user's mobile broadband plan. + * The APN may only be composed of the characters a-z, 0-9, ., and - per GSM + * 03.60 Section 14.9. + **/ obj_properties[PROP_APN] = g_param_spec_string(NM_SETTING_GSM_APN, "", "", @@ -730,14 +730,14 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:network-id: - * - * The Network ID (GSM LAI format, ie MCC-MNC) to force specific network - * registration. If the Network ID is specified, NetworkManager will - * attempt to force the device to register only on the specified network. - * This can be used to ensure that the device does not roam when direct - * roaming control of the device is not otherwise possible. - **/ + * NMSettingGsm:network-id: + * + * The Network ID (GSM LAI format, ie MCC-MNC) to force specific network + * registration. If the Network ID is specified, NetworkManager will + * attempt to force the device to register only on the specified network. + * This can be used to ensure that the device does not roam when direct + * roaming control of the device is not otherwise possible. + **/ obj_properties[PROP_NETWORK_ID] = g_param_spec_string(NM_SETTING_GSM_NETWORK_ID, "", @@ -746,12 +746,12 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:pin: - * - * If the SIM is locked with a PIN it must be unlocked before any other - * operations are requested. Specify the PIN here to allow operation of the - * device. - **/ + * NMSettingGsm:pin: + * + * If the SIM is locked with a PIN it must be unlocked before any other + * operations are requested. Specify the PIN here to allow operation of the + * device. + **/ obj_properties[PROP_PIN] = g_param_spec_string(NM_SETTING_GSM_PIN, "", @@ -760,10 +760,10 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:pin-flags: - * - * Flags indicating how to handle the #NMSettingGsm:pin property. - **/ + * NMSettingGsm:pin-flags: + * + * Flags indicating how to handle the #NMSettingGsm:pin property. + **/ obj_properties[PROP_PIN_FLAGS] = g_param_spec_flags(NM_SETTING_GSM_PIN_FLAGS, "", "", @@ -772,11 +772,11 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:home-only: - * - * When %TRUE, only connections to the home network will be allowed. - * Connections to roaming networks will not be made. - **/ + * NMSettingGsm:home-only: + * + * When %TRUE, only connections to the home network will be allowed. + * Connections to roaming networks will not be made. + **/ obj_properties[PROP_HOME_ONLY] = g_param_spec_boolean(NM_SETTING_GSM_HOME_ONLY, "", @@ -785,14 +785,14 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:device-id: - * - * The device unique identifier (as given by the WWAN management service) - * which this connection applies to. If given, the connection will only - * apply to the specified device. - * - * Since: 1.2 - **/ + * NMSettingGsm:device-id: + * + * The device unique identifier (as given by the WWAN management service) + * which this connection applies to. If given, the connection will only + * apply to the specified device. + * + * Since: 1.2 + **/ obj_properties[PROP_DEVICE_ID] = g_param_spec_string(NM_SETTING_GSM_DEVICE_ID, "", @@ -801,15 +801,15 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:sim-id: - * - * The SIM card unique identifier (as given by the WWAN management service) - * which this connection applies to. If given, the connection will apply - * to any device also allowed by #NMSettingGsm:device-id which contains a - * SIM card matching the given identifier. - * - * Since: 1.2 - **/ + * NMSettingGsm:sim-id: + * + * The SIM card unique identifier (as given by the WWAN management service) + * which this connection applies to. If given, the connection will apply + * to any device also allowed by #NMSettingGsm:device-id which contains a + * SIM card matching the given identifier. + * + * Since: 1.2 + **/ obj_properties[PROP_SIM_ID] = g_param_spec_string(NM_SETTING_GSM_SIM_ID, "", "", @@ -817,16 +817,16 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:sim-operator-id: - * - * A MCC/MNC string like "310260" or "21601" identifying the specific - * mobile network operator which this connection applies to. If given, - * the connection will apply to any device also allowed by - * #NMSettingGsm:device-id and #NMSettingGsm:sim-id which contains a SIM - * card provisioned by the given operator. - * - * Since: 1.2 - **/ + * NMSettingGsm:sim-operator-id: + * + * A MCC/MNC string like "310260" or "21601" identifying the specific + * mobile network operator which this connection applies to. If given, + * the connection will apply to any device also allowed by + * #NMSettingGsm:device-id and #NMSettingGsm:sim-id which contains a SIM + * card provisioned by the given operator. + * + * Since: 1.2 + **/ obj_properties[PROP_SIM_OPERATOR_ID] = g_param_spec_string(NM_SETTING_GSM_SIM_OPERATOR_ID, "", @@ -835,13 +835,13 @@ nm_setting_gsm_class_init(NMSettingGsmClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingGsm:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple frames. - * - * Since: 1.8 - **/ + * NMSettingGsm:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple frames. + * + * Since: 1.8 + **/ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_GSM_MTU, "", "", diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index 67fe7a7b1d..63debcec7e 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -225,8 +225,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (strcmp(interface_name, priv->virtual_iface_name) != 0) { /* We don't support renaming software infiniband devices. Later we might, but - * for now just reject such connections. - **/ + * for now just reject such connections. + **/ g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -247,14 +247,14 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (priv->mtu > NM_INFINIBAND_MAX_MTU) { /* Traditionally, MTU for "datagram" mode was limited to 2044 - * and for "connected" mode it was 65520. - * - * This is no longer the case, and both transport modes use the same - * maximum of 65520 (NM_INFINIBAND_MAX_MTU). - * - * Note that this is the MTU in the connection profile. Whether - * we will be able to configure large MTUs later (during activation) - * is unknown at this point. */ + * and for "connected" mode it was 65520. + * + * This is no longer the case, and both transport modes use the same + * maximum of 65520 (NM_INFINIBAND_MAX_MTU). + * + * Note that this is the MTU in the connection profile. Whether + * we will be able to configure large MTUs later (during activation) + * is unknown at this point. */ g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -385,30 +385,30 @@ nm_setting_infiniband_class_init(NMSettingInfinibandClass *klass) setting_class->verify = verify; /** - * 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). - **/ + * 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). + **/ /* ---keyfile--- - * property: mac-address - * format: usual hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation, or - * or semicolon separated list of 20 decimal bytes (obsolete) - * example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01 - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: HWADDR - * description: IBoIP 20-byte hardware address of the device (in traditional - * hex-digits-and-colons notation). - * Note that for initscripts this is the current MAC address of the device as found - * during ifup. For NetworkManager this is the permanent MAC address. Or in case no - * permanent MAC address exists, the MAC address initially configured on the device. - * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11 - * ---end--- - */ + * property: mac-address + * format: usual hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation, or + * or semicolon separated list of 20 decimal bytes (obsolete) + * example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01 + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: HWADDR + * description: IBoIP 20-byte hardware address of the device (in traditional + * hex-digits-and-colons notation). + * Note that for initscripts this is the current MAC address of the device as found + * during ifup. For NetworkManager this is the permanent MAC address. Or in case no + * permanent MAC address exists, the MAC address initially configured on the device. + * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11 + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS] = g_param_spec_string( NM_SETTING_INFINIBAND_MAC_ADDRESS, "", @@ -420,17 +420,17 @@ nm_setting_infiniband_class_init(NMSettingInfinibandClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingInfiniband:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple frames. - **/ + * NMSettingInfiniband:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple frames. + **/ /* ---ifcfg-rh--- - * property: mtu - * variable: MTU - * description: MTU of the interface. - * ---end--- - */ + * property: mtu + * variable: MTU + * description: MTU of the interface. + * ---end--- + */ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_INFINIBAND_MTU, "", "", @@ -441,19 +441,19 @@ nm_setting_infiniband_class_init(NMSettingInfinibandClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingInfiniband:transport-mode: - * - * The IP-over-InfiniBand transport mode. Either "datagram" or - * "connected". - **/ + * NMSettingInfiniband:transport-mode: + * + * The IP-over-InfiniBand transport mode. Either "datagram" or + * "connected". + **/ /* ---ifcfg-rh--- - * property: transport-mode - * variable: CONNECTED_MODE - * default: CONNECTED_MODE=no - * description: CONNECTED_MODE=yes for "connected" mode, CONNECTED_MODE=no for - * "datagram" mode - * ---end--- - */ + * property: transport-mode + * variable: CONNECTED_MODE + * default: CONNECTED_MODE=no + * description: CONNECTED_MODE=yes for "connected" mode, CONNECTED_MODE=no for + * "datagram" mode + * ---end--- + */ obj_properties[PROP_TRANSPORT_MODE] = g_param_spec_string( NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", @@ -462,23 +462,23 @@ nm_setting_infiniband_class_init(NMSettingInfinibandClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingInfiniband:p-key: - * - * The InfiniBand P_Key to use for this device. A value of -1 means to use - * the default P_Key (aka "the P_Key at index 0"). Otherwise, it is a 16-bit - * unsigned integer, whose high bit is set if it is a "full membership" - * P_Key. - **/ + * NMSettingInfiniband:p-key: + * + * The InfiniBand P_Key to use for this device. A value of -1 means to use + * the default P_Key (aka "the P_Key at index 0"). Otherwise, it is a 16-bit + * unsigned integer, whose high bit is set if it is a "full membership" + * P_Key. + **/ /* ---ifcfg-rh--- - * property: p-key - * variable: PKEY_ID (and PKEY=yes) - * default: PKEY=no - * description: InfiniBand P_Key. The value can be a hex number prefixed with "0x" - * or a decimal number. - * When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified. - * example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002 - * ---end--- - */ + * property: p-key + * variable: PKEY_ID (and PKEY=yes) + * default: PKEY=no + * description: InfiniBand P_Key. The value can be a hex number prefixed with "0x" + * or a decimal number. + * When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified. + * example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002 + * ---end--- + */ obj_properties[PROP_P_KEY] = g_param_spec_int(NM_SETTING_INFINIBAND_P_KEY, "", @@ -489,21 +489,21 @@ nm_setting_infiniband_class_init(NMSettingInfinibandClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingInfiniband:parent: - * - * The interface name of the parent device of this device. Normally %NULL, - * but if the #NMSettingInfiniband:p_key property is set, then you must - * specify the base device by setting either this property or - * #NMSettingInfiniband:mac-address. - **/ + * NMSettingInfiniband:parent: + * + * The interface name of the parent device of this device. Normally %NULL, + * but if the #NMSettingInfiniband:p_key property is set, then you must + * specify the base device by setting either this property or + * #NMSettingInfiniband:mac-address. + **/ /* ---ifcfg-rh--- - * property: parent - * variable: PHYSDEV (PKEY=yes) - * default: PKEY=no - * description: InfiniBand parent device. - * example: PHYSDEV=ib0 - * ---end--- - */ + * property: parent + * variable: PHYSDEV (PKEY=yes) + * default: PKEY=no + * description: InfiniBand parent device. + * example: PHYSDEV=ib0 + * ---end--- + */ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_INFINIBAND_PARENT, "", diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 64b91c0241..6fff903451 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -322,13 +322,13 @@ nm_ip_address_cmp_full(const NMIPAddress *a, const NMIPAddress *b, NMIPAddressCm while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &value)) { value2 = g_hash_table_lookup(b->attributes, key); /* We cannot really compare GVariants, because g_variant_compare() does - * not work in general. So, don't bother. NM_IP_ADDRESS_CMP_FLAGS_WITH_ATTRS is - * documented to not provide a total order for the attribute contents. - * - * Theoretically, we can implement also a total order. However we should - * not do that by default because it would require us to sort the keys - * first. Most callers don't care about total order, so they shouldn't - * pay the overhead. */ + * not work in general. So, don't bother. NM_IP_ADDRESS_CMP_FLAGS_WITH_ATTRS is + * documented to not provide a total order for the attribute contents. + * + * Theoretically, we can implement also a total order. However we should + * not do that by default because it would require us to sort the keys + * first. Most callers don't care about total order, so they shouldn't + * pay the overhead. */ if (!value2) return -2; if (!g_variant_equal(value, value2)) @@ -2452,9 +2452,9 @@ nm_ip_routing_rule_cmp(const NMIPRoutingRule *rule, const NMIPRoutingRule *other NM_CMP_FIELD(rule, other, ipproto); /* We compare the plain strings, not the binary values after utf8safe unescaping. - * - * The reason is, that the rules differ already when the direct strings differ, not - * only when the unescaped names differ. */ + * + * The reason is, that the rules differ already when the direct strings differ, not + * only when the unescaped names differ. */ NM_CMP_FIELD_STR0(rule, other, iifname); NM_CMP_FIELD_STR0(rule, other, oifname); @@ -2539,19 +2539,19 @@ nm_ip_routing_rule_validate(const NMIPRoutingRule *self, GError **error) g_return_val_if_fail(!error || !*error, FALSE); /* Kernel may be more flexible about validating. We do a strict validation - * here and reject certain settings eagerly. We can always relax it later. */ + * here and reject certain settings eagerly. We can always relax it later. */ if (!self->priority_has) { /* iproute2 accepts not specifying the priority, in which case kernel will select - * an unused priority. We don't allow for that, and will always require the user to - * select a priority. - * - * Note that if the user selects priority 0 or a non-unique priority, this is problematic - * due to kernel bugs rh#1685816 and rh#1685816. It may result in NetworkManager wrongly being - * unable to add a rule or deleting the wrong rule. - * This problem is not at all specific to the priority, it affects all rules that - * have default values which confuse kernel. But setting a unique priority avoids - * this problem nicely. */ + * an unused priority. We don't allow for that, and will always require the user to + * select a priority. + * + * Note that if the user selects priority 0 or a non-unique priority, this is problematic + * due to kernel bugs rh#1685816 and rh#1685816. It may result in NetworkManager wrongly being + * unable to add a rule or deleting the wrong rule. + * This problem is not at all specific to the priority, it affects all rules that + * have default values which confuse kernel. But setting a unique priority avoids + * this problem nicely. */ g_set_error_literal(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -2562,9 +2562,9 @@ nm_ip_routing_rule_validate(const NMIPRoutingRule *self, GError **error) if (NM_IN_SET(self->action, FR_ACT_TO_TBL)) { if (self->table == 0) { /* with IPv4, kernel allows a table (in RTM_NEWRULE) of zero to automatically select - * an unused table. We don't. The user needs to specify the table. - * - * For IPv6, kernel doesn't allow a table of zero, so we are consistent here. */ + * an unused table. We don't. The user needs to specify the table. + * + * For IPv6, kernel doesn't allow a table of zero, so we are consistent here. */ g_set_error_literal(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -3146,38 +3146,38 @@ nm_ip_routing_rule_from_string(const char * str, return NULL; /* NM_IP_ROUTING_RULE_TO_STRING_TYPE_IPROUTE gives a string representation that is - * partly compatibly with iproute2. That is, the part after `ip -[46] rule add $ARGS`. - * There are differences though: - * - * - trying to convert an invalid rule to string may not be possible. The reason is for - * example that an invalid rule can have nm_ip_routing_rule_get_from() like "bogus", - * but we don't write that as "from bogus". In general, if you try to convert an invalid - * rule to string, the operation may fail or the result may itself not be parsable. - * Of course, valid rules can be converted to string and read back the same (round-trip). - * - * - iproute2 in may regards is flexible about the command lines. For example - * - for tables it accepts table names from /etc/iproute2/rt_tables. We only - * accept the special aliases "main", "local", and "default". - * - key names like "preference" can be abbreviated to "pref", we don't do that. - * - the "preference"/"priority" may be unspecified, in which kernel automatically - * chooses an unused priority (during `ip rule add`). We don't allow for that, the - * priority must be explicitly set. - * - * - iproute2 does not support any escaping. Well, it's the shell that supports quoting - * and escaping and splits the command line. We need to split the command line ourself, - * but we don't support full shell quotation. - * from-string tokenizes words at (ASCII) whitespaces (removing the whitespaces). - * It also supports backslash escaping (e.g. to contain whitespace), but it does - * not support special escape sequences. Values are taken literally, meaning - * "\n\ \111" gives results in "n 111". - * The strings really shouldn't contain any special characters that require escaping, - * but that's the rule. - * This also goes together with the @allow_escaping parameter of nm_utils_strsplit_set(). - * If you concatenate multiple rule expressions with a delimiter, the delimiter inside - * each word can be backslash escaped, and nm_utils_strsplit_set(allow_escaping=TRUE) will - * properly split the words, preserving the backslashes, which then will be removed by - * nm_ip_routing_rule_from_string(). - */ + * partly compatibly with iproute2. That is, the part after `ip -[46] rule add $ARGS`. + * There are differences though: + * + * - trying to convert an invalid rule to string may not be possible. The reason is for + * example that an invalid rule can have nm_ip_routing_rule_get_from() like "bogus", + * but we don't write that as "from bogus". In general, if you try to convert an invalid + * rule to string, the operation may fail or the result may itself not be parsable. + * Of course, valid rules can be converted to string and read back the same (round-trip). + * + * - iproute2 in may regards is flexible about the command lines. For example + * - for tables it accepts table names from /etc/iproute2/rt_tables. We only + * accept the special aliases "main", "local", and "default". + * - key names like "preference" can be abbreviated to "pref", we don't do that. + * - the "preference"/"priority" may be unspecified, in which kernel automatically + * chooses an unused priority (during `ip rule add`). We don't allow for that, the + * priority must be explicitly set. + * + * - iproute2 does not support any escaping. Well, it's the shell that supports quoting + * and escaping and splits the command line. We need to split the command line ourself, + * but we don't support full shell quotation. + * from-string tokenizes words at (ASCII) whitespaces (removing the whitespaces). + * It also supports backslash escaping (e.g. to contain whitespace), but it does + * not support special escape sequences. Values are taken literally, meaning + * "\n\ \111" gives results in "n 111". + * The strings really shouldn't contain any special characters that require escaping, + * but that's the rule. + * This also goes together with the @allow_escaping parameter of nm_utils_strsplit_set(). + * If you concatenate multiple rule expressions with a delimiter, the delimiter inside + * each word can be backslash escaped, and nm_utils_strsplit_set(allow_escaping=TRUE) will + * properly split the words, preserving the backslashes, which then will be removed by + * nm_ip_routing_rule_from_string(). + */ addr_family = _rr_string_addr_family_from_flags(to_string_flags); @@ -3194,7 +3194,7 @@ nm_ip_routing_rule_from_string(const char * str, } /* iproute2 matches keywords with any partial prefix. We don't allow - * for that flexibility. */ + * for that flexibility. */ if (NM_IN_STRSET(word0, "from")) { if (!word1) @@ -3214,7 +3214,7 @@ nm_ip_routing_rule_from_string(const char * str, } if (NM_IN_STRSET(word0, "not")) { /* we accept multiple "not" specifiers. "not not" still means - * not. */ + * not. */ val_invert = TRUE; goto next_words_consumed; } @@ -3331,8 +3331,8 @@ nm_ip_routing_rule_from_string(const char * str, } /* also the action is still unsupported. For the moment, we only support - * FR_ACT_TO_TBL, which is the default (by not expressing it on the command - * line). */ + * FR_ACT_TO_TBL, which is the default (by not expressing it on the command + * line). */ g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, @@ -3541,13 +3541,13 @@ nm_ip_routing_rule_to_string(const NMIPRoutingRule * self, } /* It is only guaranteed that valid rules can be expressed as string. - * - * Still, unless requested proceed to convert to string without validating and - * hope for the best. - * - * That is, because self->from_str might contain an invalid IP address (indicated - * by self->from_valid). But we don't support serializing such arbitrary strings - * as "from %s". */ + * + * Still, unless requested proceed to convert to string without validating and + * hope for the best. + * + * That is, because self->from_str might contain an invalid IP address (indicated + * by self->from_valid). But we don't support serializing such arbitrary strings + * as "from %s". */ if (NM_FLAGS_HAS(to_string_flags, NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE)) { gs_free_error GError *local = NULL; @@ -5541,11 +5541,11 @@ _nm_sett_info_property_override_create_array_ip_config(void) .from_dbus_fcn = ip_gateway_set, )); /* ---dbus--- - * property: routing-rules - * format: array of 'a{sv}' - * description: Array of dictionaries for routing rules. - * ---end--- - */ + * property: routing-rules + * format: array of 'a{sv}' + * description: Array of dictionaries for routing rules. + * ---end--- + */ _nm_properties_override_dbus( properties_override, NM_SETTING_IP_CONFIG_ROUTING_RULES, @@ -5811,28 +5811,28 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) setting_class->enumerate_values = enumerate_values; /** - * NMSettingIPConfig:method: - * - * IP configuration method. - * - * #NMSettingIP4Config and #NMSettingIP6Config both support "disabled", - * "auto", "manual", and "link-local". See the subclass-specific - * documentation for other values. - * - * In general, for the "auto" method, properties such as - * #NMSettingIPConfig:dns and #NMSettingIPConfig:routes specify information - * that is added on to the information returned from automatic - * configuration. The #NMSettingIPConfig:ignore-auto-routes and - * #NMSettingIPConfig:ignore-auto-dns properties modify this behavior. - * - * For methods that imply no upstream network, such as "shared" or - * "link-local", these properties must be empty. - * - * For IPv4 method "shared", the IP subnet can be configured by adding one - * manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the - * shared method must be configured on the interface which shares the internet - * to a subnet, not on the uplink which is shared. - **/ + * NMSettingIPConfig:method: + * + * IP configuration method. + * + * #NMSettingIP4Config and #NMSettingIP6Config both support "disabled", + * "auto", "manual", and "link-local". See the subclass-specific + * documentation for other values. + * + * In general, for the "auto" method, properties such as + * #NMSettingIPConfig:dns and #NMSettingIPConfig:routes specify information + * that is added on to the information returned from automatic + * configuration. The #NMSettingIPConfig:ignore-auto-routes and + * #NMSettingIPConfig:ignore-auto-dns properties modify this behavior. + * + * For methods that imply no upstream network, such as "shared" or + * "link-local", these properties must be empty. + * + * For IPv4 method "shared", the IP subnet can be configured by adding one + * manual IPv4 address or otherwise 10.42.x.0/24 is chosen. Note that the + * shared method must be configured on the interface which shares the internet + * to a subnet, not on the uplink which is shared. + **/ obj_properties[PROP_METHOD] = g_param_spec_string( NM_SETTING_IP_CONFIG_METHOD, "", @@ -5841,10 +5841,10 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dns: - * - * Array of IP addresses of DNS servers. - **/ + * NMSettingIPConfig:dns: + * + * Array of IP addresses of DNS servers. + **/ obj_properties[PROP_DNS] = g_param_spec_boxed(NM_SETTING_IP_CONFIG_DNS, "", "", @@ -5852,18 +5852,18 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dns-search: - * - * Array of DNS search domains. Domains starting with a tilde ('~') - * are considered 'routing' domains and are used only to decide the - * interface over which a query must be forwarded; they are not used - * to complete unqualified host names. - * - * When using a DNS plugin that supports Conditional Forwarding or - * Split DNS, then the search domains specify which name servers to - * query. This makes the behavior different from running with plain - * /etc/resolv.conf. For more information see also the dns-priority setting. - **/ + * NMSettingIPConfig:dns-search: + * + * Array of DNS search domains. Domains starting with a tilde ('~') + * are considered 'routing' domains and are used only to decide the + * interface over which a query must be forwarded; they are not used + * to complete unqualified host names. + * + * When using a DNS plugin that supports Conditional Forwarding or + * Split DNS, then the search domains specify which name servers to + * query. This makes the behavior different from running with plain + * /etc/resolv.conf. For more information see also the dns-priority setting. + **/ obj_properties[PROP_DNS_SEARCH] = g_param_spec_boxed(NM_SETTING_IP_CONFIG_DNS_SEARCH, "", @@ -5872,25 +5872,25 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dns-options: - * - * Array of DNS options as described in man 5 resolv.conf. - * - * %NULL means that the options are unset and left at the default. - * In this case NetworkManager will use default options. This is - * distinct from an empty list of properties. - * - * The currently supported options are "attempts", "debug", "edns0", - * "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", - * "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", - * "single-request-reopen", "timeout", "trust-ad", "use-vc". - * - * The "trust-ad" setting is only honored if the profile contributes - * name servers to resolv.conf, and if all contributing profiles have - * "trust-ad" enabled. - * - * Since: 1.2 - **/ + * NMSettingIPConfig:dns-options: + * + * Array of DNS options as described in man 5 resolv.conf. + * + * %NULL means that the options are unset and left at the default. + * In this case NetworkManager will use default options. This is + * distinct from an empty list of properties. + * + * The currently supported options are "attempts", "debug", "edns0", + * "inet6", "ip6-bytestring", "ip6-dotint", "ndots", "no-check-names", + * "no-ip6-dotint", "no-reload", "no-tld-query", "rotate", "single-request", + * "single-request-reopen", "timeout", "trust-ad", "use-vc". + * + * The "trust-ad" setting is only honored if the profile contributes + * name servers to resolv.conf, and if all contributing profiles have + * "trust-ad" enabled. + * + * Since: 1.2 + **/ obj_properties[PROP_DNS_OPTIONS] = g_param_spec_boxed(NM_SETTING_IP_CONFIG_DNS_OPTIONS, "", @@ -5899,58 +5899,58 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dns-priority: - * - * DNS servers priority. - * - * The relative priority for DNS servers specified by this setting. A lower - * numerical value is better (higher priority). - * - * Negative values have the special effect of excluding other configurations - * with a greater numerical priority value; so in presence of at least one negative - * priority, only DNS servers from connections with the lowest priority value will be used. - * To avoid all DNS leaks, set the priority of the profile that should be used - * to the most negative value of all active connections profiles. - * - * Zero selects a globally configured default value. If the latter is missing - * or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for - * other connections. - * - * Note that the priority is to order DNS settings for multiple active - * connections. It does not disambiguate multiple DNS servers within the - * same connection profile. - * - * When multiple devices have configurations with the same priority, VPNs will be - * considered first, then devices with the best (lowest metric) default - * route and then all other devices. - * - * When using dns=default, servers with higher priority will be on top of - * resolv.conf. To prioritize a given server over another one within the - * same connection, just specify them in the desired order. - * Note that commonly the resolver tries name servers in /etc/resolv.conf - * in the order listed, proceeding with the next server in the list - * on failure. See for example the "rotate" option of the dns-options setting. - * If there are any negative DNS priorities, then only name servers from - * the devices with that lowest priority will be considered. - * - * When using a DNS resolver that supports Conditional Forwarding or - * Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection - * is used to query domains in its search list. The search domains determine which - * name servers to ask, and the DNS priority is used to prioritize - * name servers based on the domain. Queries for domains not present in any - * search list are routed through connections having the '~.' special wildcard - * domain, which is added automatically to connections with the default route - * (or can be added manually). When multiple connections specify the same domain, the - * one with the best priority (lowest numerical value) wins. If a sub domain - * is configured on another interface it will be accepted regardless the priority, - * unless parent domain on the other interface has a negative priority, which causes - * the sub domain to be shadowed. - * With Split DNS one can avoid undesired DNS leaks by properly configuring - * DNS priorities and the search domains, so that only name servers of the desired - * interface are configured. - * - * Since: 1.4 - **/ + * NMSettingIPConfig:dns-priority: + * + * DNS servers priority. + * + * The relative priority for DNS servers specified by this setting. A lower + * numerical value is better (higher priority). + * + * Negative values have the special effect of excluding other configurations + * with a greater numerical priority value; so in presence of at least one negative + * priority, only DNS servers from connections with the lowest priority value will be used. + * To avoid all DNS leaks, set the priority of the profile that should be used + * to the most negative value of all active connections profiles. + * + * Zero selects a globally configured default value. If the latter is missing + * or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for + * other connections. + * + * Note that the priority is to order DNS settings for multiple active + * connections. It does not disambiguate multiple DNS servers within the + * same connection profile. + * + * When multiple devices have configurations with the same priority, VPNs will be + * considered first, then devices with the best (lowest metric) default + * route and then all other devices. + * + * When using dns=default, servers with higher priority will be on top of + * resolv.conf. To prioritize a given server over another one within the + * same connection, just specify them in the desired order. + * Note that commonly the resolver tries name servers in /etc/resolv.conf + * in the order listed, proceeding with the next server in the list + * on failure. See for example the "rotate" option of the dns-options setting. + * If there are any negative DNS priorities, then only name servers from + * the devices with that lowest priority will be considered. + * + * When using a DNS resolver that supports Conditional Forwarding or + * Split DNS (with dns=dnsmasq or dns=systemd-resolved settings), each connection + * is used to query domains in its search list. The search domains determine which + * name servers to ask, and the DNS priority is used to prioritize + * name servers based on the domain. Queries for domains not present in any + * search list are routed through connections having the '~.' special wildcard + * domain, which is added automatically to connections with the default route + * (or can be added manually). When multiple connections specify the same domain, the + * one with the best priority (lowest numerical value) wins. If a sub domain + * is configured on another interface it will be accepted regardless the priority, + * unless parent domain on the other interface has a negative priority, which causes + * the sub domain to be shadowed. + * With Split DNS one can avoid undesired DNS leaks by properly configuring + * DNS priorities and the search domains, so that only name servers of the desired + * interface are configured. + * + * Since: 1.4 + **/ obj_properties[PROP_DNS_PRIORITY] = g_param_spec_int(NM_SETTING_IP_CONFIG_DNS_PRIORITY, "", @@ -5961,10 +5961,10 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:addresses: (type GPtrArray(NMIPAddress)) - * - * Array of IP addresses. - **/ + * NMSettingIPConfig:addresses: (type GPtrArray(NMIPAddress)) + * + * Array of IP addresses. + **/ obj_properties[PROP_ADDRESSES] = g_param_spec_boxed(NM_SETTING_IP_CONFIG_ADDRESSES, "", @@ -5978,18 +5978,18 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) NM_SETTING_PARAM_LEGACY | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:gateway: - * - * The gateway associated with this configuration. This is only meaningful - * if #NMSettingIPConfig:addresses is also set. - * - * The gateway's main purpose is to control the next hop of the standard default route on the device. - * Hence, the gateway property conflicts with #NMSettingIPConfig:never-default and will be - * automatically dropped if the IP configuration is set to never-default. - * - * As an alternative to set the gateway, configure a static default route with /0 as prefix - * length. - **/ + * NMSettingIPConfig:gateway: + * + * The gateway associated with this configuration. This is only meaningful + * if #NMSettingIPConfig:addresses is also set. + * + * The gateway's main purpose is to control the next hop of the standard default route on the device. + * Hence, the gateway property conflicts with #NMSettingIPConfig:never-default and will be + * automatically dropped if the IP configuration is set to never-default. + * + * As an alternative to set the gateway, configure a static default route with /0 as prefix + * length. + **/ obj_properties[PROP_GATEWAY] = g_param_spec_string( NM_SETTING_IP_CONFIG_GATEWAY, "", @@ -5998,10 +5998,10 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:routes: (type GPtrArray(NMIPRoute)) - * - * Array of IP routes. - **/ + * NMSettingIPConfig:routes: (type GPtrArray(NMIPRoute)) + * + * Array of IP routes. + **/ obj_properties[PROP_ROUTES] = g_param_spec_boxed(NM_SETTING_IP_CONFIG_ROUTES, "", @@ -6012,19 +6012,19 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) NM_SETTING_PARAM_LEGACY | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:route-metric: - * - * The default metric for routes that don't explicitly specify a metric. - * The default value -1 means that the metric is chosen automatically - * based on the device type. - * The metric applies to dynamic routes, manual (static) routes that - * don't have an explicit metric setting, address prefix routes, and - * the default route. - * Note that for IPv6, the kernel accepts zero (0) but coerces it to - * 1024 (user default). Hence, setting this property to zero effectively - * mean setting it to 1024. - * For IPv4, zero is a regular value for the metric. - **/ + * NMSettingIPConfig:route-metric: + * + * The default metric for routes that don't explicitly specify a metric. + * The default value -1 means that the metric is chosen automatically + * based on the device type. + * The metric applies to dynamic routes, manual (static) routes that + * don't have an explicit metric setting, address prefix routes, and + * the default route. + * Note that for IPv6, the kernel accepts zero (0) but coerces it to + * 1024 (user default). Hence, setting this property to zero effectively + * mean setting it to 1024. + * For IPv4, zero is a regular value for the metric. + **/ obj_properties[PROP_ROUTE_METRIC] = g_param_spec_int64(NM_SETTING_IP_CONFIG_ROUTE_METRIC, "", @@ -6035,26 +6035,26 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:route-table: - * - * Enable policy routing (source routing) and set the routing table used when adding routes. - * - * This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes - * and static routes. But note that static routes can individually overwrite the setting - * by explicitly specifying a non-zero routing table. - * - * If the table setting is left at zero, it is eligible to be overwritten via global - * configuration. If the property is zero even after applying the global configuration - * value, policy routing is disabled for the address family of this connection. - * - * Policy routing disabled means that NetworkManager will add all routes to the main - * table (except static routes that explicitly configure a different table). Additionally, - * NetworkManager will not delete any extraneous routes from tables except the main table. - * This is to preserve backward compatibility for users who manage routing tables outside - * of NetworkManager. - * - * Since: 1.10 - **/ + * NMSettingIPConfig:route-table: + * + * Enable policy routing (source routing) and set the routing table used when adding routes. + * + * This affects all routes, including device-routes, IPv4LL, DHCP, SLAAC, default-routes + * and static routes. But note that static routes can individually overwrite the setting + * by explicitly specifying a non-zero routing table. + * + * If the table setting is left at zero, it is eligible to be overwritten via global + * configuration. If the property is zero even after applying the global configuration + * value, policy routing is disabled for the address family of this connection. + * + * Policy routing disabled means that NetworkManager will add all routes to the main + * table (except static routes that explicitly configure a different table). Additionally, + * NetworkManager will not delete any extraneous routes from tables except the main table. + * This is to preserve backward compatibility for users who manage routing tables outside + * of NetworkManager. + * + * Since: 1.10 + **/ obj_properties[PROP_ROUTE_TABLE] = g_param_spec_uint( NM_SETTING_IP_CONFIG_ROUTE_TABLE, "", @@ -6064,12 +6064,12 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) 0, G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:ignore-auto-routes: - * - * When #NMSettingIPConfig:method is set to "auto" and this property to - * %TRUE, automatically configured routes are ignored and only routes - * specified in the #NMSettingIPConfig:routes property, if any, are used. - **/ + * NMSettingIPConfig:ignore-auto-routes: + * + * When #NMSettingIPConfig:method is set to "auto" and this property to + * %TRUE, automatically configured routes are ignored and only routes + * specified in the #NMSettingIPConfig:routes property, if any, are used. + **/ obj_properties[PROP_IGNORE_AUTO_ROUTES] = g_param_spec_boolean(NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, "", @@ -6078,14 +6078,14 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:ignore-auto-dns: - * - * When #NMSettingIPConfig:method is set to "auto" and this property to - * %TRUE, automatically configured name servers and search domains are - * ignored and only name servers and search domains specified in the - * #NMSettingIPConfig:dns and #NMSettingIPConfig:dns-search properties, if - * any, are used. - **/ + * NMSettingIPConfig:ignore-auto-dns: + * + * When #NMSettingIPConfig:method is set to "auto" and this property to + * %TRUE, automatically configured name servers and search domains are + * ignored and only name servers and search domains specified in the + * #NMSettingIPConfig:dns and #NMSettingIPConfig:dns-search properties, if + * any, are used. + **/ obj_properties[PROP_IGNORE_AUTO_DNS] = g_param_spec_boolean(NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, "", @@ -6094,13 +6094,13 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dhcp-hostname: - * - * If the #NMSettingIPConfig:dhcp-send-hostname property is %TRUE, then the - * specified name will be sent to the DHCP server when acquiring a lease. - * This property and #NMSettingIP4Config:dhcp-fqdn are mutually exclusive and - * cannot be set at the same time. - **/ + * NMSettingIPConfig:dhcp-hostname: + * + * If the #NMSettingIPConfig:dhcp-send-hostname property is %TRUE, then the + * specified name will be sent to the DHCP server when acquiring a lease. + * This property and #NMSettingIP4Config:dhcp-fqdn are mutually exclusive and + * cannot be set at the same time. + **/ obj_properties[PROP_DHCP_HOSTNAME] = g_param_spec_string(NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, "", @@ -6109,14 +6109,14 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dhcp-send-hostname: - * - * If %TRUE, a hostname is sent to the DHCP server when acquiring a lease. - * Some DHCP servers use this hostname to update DNS databases, essentially - * providing a static hostname for the computer. If the - * #NMSettingIPConfig:dhcp-hostname property is %NULL and this property is - * %TRUE, the current persistent hostname of the computer is sent. - **/ + * NMSettingIPConfig:dhcp-send-hostname: + * + * If %TRUE, a hostname is sent to the DHCP server when acquiring a lease. + * Some DHCP servers use this hostname to update DNS databases, essentially + * providing a static hostname for the computer. If the + * #NMSettingIPConfig:dhcp-hostname property is %NULL and this property is + * %TRUE, the current persistent hostname of the computer is sent. + **/ obj_properties[PROP_DHCP_SEND_HOSTNAME] = g_param_spec_boolean(NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, "", @@ -6125,12 +6125,12 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:never-default: - * - * If %TRUE, this connection will never be the default connection for this - * IP type, meaning it will never be assigned the default route by - * NetworkManager. - **/ + * NMSettingIPConfig:never-default: + * + * If %TRUE, this connection will never be the default connection for this + * IP type, meaning it will never be assigned the default route by + * NetworkManager. + **/ obj_properties[PROP_NEVER_DEFAULT] = g_param_spec_boolean(NM_SETTING_IP_CONFIG_NEVER_DEFAULT, "", @@ -6139,16 +6139,16 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:may-fail: - * - * If %TRUE, allow overall network configuration to proceed even if the - * configuration specified by this property times out. Note that at least - * one IP configuration must succeed or overall network configuration will - * still fail. For example, in IPv6-only networks, setting this property to - * %TRUE on the #NMSettingIP4Config allows the overall network configuration - * to succeed if IPv4 configuration fails but IPv6 configuration completes - * successfully. - **/ + * NMSettingIPConfig:may-fail: + * + * If %TRUE, allow overall network configuration to proceed even if the + * configuration specified by this property times out. Note that at least + * one IP configuration must succeed or overall network configuration will + * still fail. For example, in IPv6-only networks, setting this property to + * %TRUE on the #NMSettingIP4Config allows the overall network configuration + * to succeed if IPv4 configuration fails but IPv6 configuration completes + * successfully. + **/ obj_properties[PROP_MAY_FAIL] = g_param_spec_boolean(NM_SETTING_IP_CONFIG_MAY_FAIL, "", @@ -6157,19 +6157,19 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dad-timeout: - * - * Timeout in milliseconds used to check for the presence of duplicate IP - * addresses on the network. If an address conflict is detected, the - * activation will fail. A zero value means that no duplicate address - * detection is performed, -1 means the default value (either configuration - * ipvx.dad-timeout override or zero). A value greater than zero is a - * timeout in milliseconds. - * - * The property is currently implemented only for IPv4. - * - * Since: 1.2 - **/ + * NMSettingIPConfig:dad-timeout: + * + * Timeout in milliseconds used to check for the presence of duplicate IP + * addresses on the network. If an address conflict is detected, the + * activation will fail. A zero value means that no duplicate address + * detection is performed, -1 means the default value (either configuration + * ipvx.dad-timeout override or zero). A value greater than zero is a + * timeout in milliseconds. + * + * The property is currently implemented only for IPv4. + * + * Since: 1.2 + **/ obj_properties[PROP_DAD_TIMEOUT] = g_param_spec_int( NM_SETTING_IP_CONFIG_DAD_TIMEOUT, "", @@ -6180,14 +6180,14 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dhcp-timeout: - * - * A timeout for a DHCP transaction in seconds. If zero (the default), a - * globally configured default is used. If still unspecified, a device specific - * timeout is used (usually 45 seconds). - * - * Set to 2147483647 (MAXINT32) for infinity. - **/ + * NMSettingIPConfig:dhcp-timeout: + * + * A timeout for a DHCP transaction in seconds. If zero (the default), a + * globally configured default is used. If still unspecified, a device specific + * timeout is used (usually 45 seconds). + * + * Set to 2147483647 (MAXINT32) for infinity. + **/ obj_properties[PROP_DHCP_TIMEOUT] = g_param_spec_int( NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, "", @@ -6198,23 +6198,23 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dhcp-iaid: - * - * A string containing the "Identity Association Identifier" (IAID) used - * by the DHCP client. The property is a 32-bit decimal value or a - * special value among "mac", "perm-mac", "ifname" and "stable". When - * set to "mac" (or "perm-mac"), the last 4 bytes of the current (or - * permanent) MAC address are used as IAID. When set to "ifname", the - * IAID is computed by hashing the interface name. The special value - * "stable" can be used to generate an IAID based on the stable-id (see - * connection.stable-id), a per-host key and the interface name. When - * the property is unset, the value from global configuration is used; - * if no global default is set then the IAID is assumed to be - * "ifname". Note that at the moment this property is ignored for IPv6 - * by dhclient, which always derives the IAID from the MAC address. - * - * Since: 1.22 - **/ + * NMSettingIPConfig:dhcp-iaid: + * + * A string containing the "Identity Association Identifier" (IAID) used + * by the DHCP client. The property is a 32-bit decimal value or a + * special value among "mac", "perm-mac", "ifname" and "stable". When + * set to "mac" (or "perm-mac"), the last 4 bytes of the current (or + * permanent) MAC address are used as IAID. When set to "ifname", the + * IAID is computed by hashing the interface name. The special value + * "stable" can be used to generate an IAID based on the stable-id (see + * connection.stable-id), a per-host key and the interface name. When + * the property is unset, the value from global configuration is used; + * if no global default is set then the IAID is assumed to be + * "ifname". Note that at the moment this property is ignored for IPv6 + * by dhclient, which always derives the IAID from the MAC address. + * + * Since: 1.22 + **/ obj_properties[PROP_DHCP_IAID] = g_param_spec_string(NM_SETTING_IP_CONFIG_DHCP_IAID, "", @@ -6223,30 +6223,30 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dhcp-hostname-flags: - * - * Flags for the DHCP hostname and FQDN. - * - * Currently, this property only includes flags to control the FQDN flags - * set in the DHCP FQDN option. Supported FQDN flags are - * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE, - * %NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED and - * %NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE. When no FQDN flag is set and - * %NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS is set, the DHCP FQDN option will - * contain no flag. Otherwise, if no FQDN flag is set and - * %NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS is not set, the standard FQDN flags - * are set in the request: - * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE, - * %NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED for IPv4 and - * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE for IPv6. - * - * When this property is set to the default value %NM_DHCP_HOSTNAME_FLAG_NONE, - * a global default is looked up in NetworkManager configuration. If that value - * is unset or also %NM_DHCP_HOSTNAME_FLAG_NONE, then the standard FQDN flags - * described above are sent in the DHCP requests. - * - * Since: 1.22 - */ + * NMSettingIPConfig:dhcp-hostname-flags: + * + * Flags for the DHCP hostname and FQDN. + * + * Currently, this property only includes flags to control the FQDN flags + * set in the DHCP FQDN option. Supported FQDN flags are + * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE, + * %NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED and + * %NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE. When no FQDN flag is set and + * %NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS is set, the DHCP FQDN option will + * contain no flag. Otherwise, if no FQDN flag is set and + * %NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS is not set, the standard FQDN flags + * are set in the request: + * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE, + * %NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED for IPv4 and + * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE for IPv6. + * + * When this property is set to the default value %NM_DHCP_HOSTNAME_FLAG_NONE, + * a global default is looked up in NetworkManager configuration. If that value + * is unset or also %NM_DHCP_HOSTNAME_FLAG_NONE, then the standard FQDN flags + * described above are sent in the DHCP requests. + * + * Since: 1.22 + */ obj_properties[PROP_DHCP_HOSTNAME_FLAGS] = g_param_spec_uint(NM_SETTING_IP_CONFIG_DHCP_HOSTNAME_FLAGS, "", @@ -6257,18 +6257,18 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPConfig:dhcp-reject-servers: - * - * Array of servers from which DHCP offers must be rejected. This property - * is useful to avoid getting a lease from misconfigured or rogue servers. - * - * For DHCPv4, each element must be an IPv4 address, optionally - * followed by a slash and a prefix length (e.g. "192.168.122.0/24"). - * - * This property is currently not implemented for DHCPv6. - * - * Since: 1.28 - **/ + * NMSettingIPConfig:dhcp-reject-servers: + * + * Array of servers from which DHCP offers must be rejected. This property + * is useful to avoid getting a lease from misconfigured or rogue servers. + * + * For DHCPv4, each element must be an IPv4 address, optionally + * followed by a slash and a prefix length (e.g. "192.168.122.0/24"). + * + * This property is currently not implemented for DHCPv6. + * + * Since: 1.28 + **/ obj_properties[PROP_DHCP_REJECT_SERVERS] = g_param_spec_boxed(NM_SETTING_IP_CONFIG_DHCP_REJECT_SERVERS, "", diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c index a6c2cfd1a6..ec096b2672 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/libnm-core/nm-setting-ip-tunnel.c @@ -650,14 +650,14 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) setting_class->verify = verify; /** - * NMSettingIPTunnel:parent: - * - * If given, specifies the parent interface name or parent connection UUID - * the new device will be bound to so that tunneled packets will only be - * routed via that interface. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:parent: + * + * If given, specifies the parent interface name or parent connection UUID + * the new device will be bound to so that tunneled packets will only be + * routed via that interface. + * + * Since: 1.2 + **/ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_IP_TUNNEL_PARENT, "", @@ -666,13 +666,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:mode: - * - * The tunneling mode, for example %NM_IP_TUNNEL_MODE_IPIP or - * %NM_IP_TUNNEL_MODE_GRE. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:mode: + * + * The tunneling mode, for example %NM_IP_TUNNEL_MODE_IPIP or + * %NM_IP_TUNNEL_MODE_GRE. + * + * Since: 1.2 + **/ obj_properties[PROP_MODE] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_MODE, "", @@ -683,13 +683,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:local: - * - * The local endpoint of the tunnel; the value can be empty, otherwise it - * must contain an IPv4 or IPv6 address. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:local: + * + * The local endpoint of the tunnel; the value can be empty, otherwise it + * must contain an IPv4 or IPv6 address. + * + * Since: 1.2 + **/ obj_properties[PROP_LOCAL] = g_param_spec_string(NM_SETTING_IP_TUNNEL_LOCAL, "", "", @@ -698,13 +698,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:remote: - * - * The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 - * address. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:remote: + * + * The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 + * address. + * + * Since: 1.2 + **/ obj_properties[PROP_REMOTE] = g_param_spec_string( NM_SETTING_IP_TUNNEL_REMOTE, "", @@ -713,13 +713,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:ttl - * - * The TTL to assign to tunneled packets. 0 is a special value meaning that - * packets inherit the TTL value. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:ttl + * + * The TTL to assign to tunneled packets. 0 is a special value meaning that + * packets inherit the TTL value. + * + * Since: 1.2 + **/ obj_properties[PROP_TTL] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_TTL, "", @@ -730,13 +730,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:tos - * - * The type of service (IPv4) or traffic class (IPv6) field to be set on - * tunneled packets. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:tos + * + * The type of service (IPv4) or traffic class (IPv6) field to be set on + * tunneled packets. + * + * Since: 1.2 + **/ obj_properties[PROP_TOS] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_TOS, "", @@ -747,12 +747,12 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:path-mtu-discovery - * - * Whether to enable Path MTU Discovery on this tunnel. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:path-mtu-discovery + * + * Whether to enable Path MTU Discovery on this tunnel. + * + * Since: 1.2 + **/ obj_properties[PROP_PATH_MTU_DISCOVERY] = g_param_spec_boolean( NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, "", @@ -761,13 +761,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:input-key: - * - * The key used for tunnel input packets; the property is valid only for - * certain tunnel modes (GRE, IP6GRE). If empty, no key is used. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:input-key: + * + * The key used for tunnel input packets; the property is valid only for + * certain tunnel modes (GRE, IP6GRE). If empty, no key is used. + * + * Since: 1.2 + **/ obj_properties[PROP_INPUT_KEY] = g_param_spec_string( NM_SETTING_IP_TUNNEL_INPUT_KEY, "", @@ -776,13 +776,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:output-key: - * - * The key used for tunnel output packets; the property is valid only for - * certain tunnel modes (GRE, IP6GRE). If empty, no key is used. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:output-key: + * + * The key used for tunnel output packets; the property is valid only for + * certain tunnel modes (GRE, IP6GRE). If empty, no key is used. + * + * Since: 1.2 + **/ obj_properties[PROP_OUTPUT_KEY] = g_param_spec_string( NM_SETTING_IP_TUNNEL_OUTPUT_KEY, "", @@ -791,13 +791,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:encapsulation-limit: - * - * How many additional levels of encapsulation are permitted to be prepended - * to packets. This property applies only to IPv6 tunnels. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:encapsulation-limit: + * + * How many additional levels of encapsulation are permitted to be prepended + * to packets. This property applies only to IPv6 tunnels. + * + * Since: 1.2 + **/ obj_properties[PROP_ENCAPSULATION_LIMIT] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, "", @@ -808,13 +808,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:flow-label: - * - * The flow label to assign to tunnel packets. This property applies only to - * IPv6 tunnels. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:flow-label: + * + * The flow label to assign to tunnel packets. This property applies only to + * IPv6 tunnels. + * + * Since: 1.2 + **/ obj_properties[PROP_FLOW_LABEL] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_FLOW_LABEL, "", @@ -825,13 +825,13 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple fragments. - * - * Since: 1.2 - **/ + * NMSettingIPTunnel:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple fragments. + * + * Since: 1.2 + **/ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_MTU, "", "", @@ -842,16 +842,16 @@ nm_setting_ip_tunnel_class_init(NMSettingIPTunnelClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingIPTunnel:flags: - * - * Tunnel flags. Currently, the following values are supported: - * %NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT, %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS, - * %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL, %NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV, - * %NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY, %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK. - * They are valid only for IPv6 tunnels. - * - * Since: 1.12 - **/ + * NMSettingIPTunnel:flags: + * + * Tunnel flags. Currently, the following values are supported: + * %NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT, %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS, + * %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL, %NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV, + * %NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY, %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK. + * They are valid only for IPv6 tunnels. + * + * Since: 1.12 + **/ obj_properties[PROP_FLAGS] = g_param_spec_uint(NM_SETTING_IP_TUNNEL_FLAGS, "", "", diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 26eb6cc341..1187601780 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -625,208 +625,208 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) setting_class->verify = verify; /* ---ifcfg-rh--- - * property: method - * variable: BOOTPROTO - * format: string - * values: none, dhcp (bootp), static, ibft, autoip, shared - * default: none - * description: Method used for IPv4 protocol configuration. - * ---end--- - */ + * property: method + * variable: BOOTPROTO + * format: string + * values: none, dhcp (bootp), static, ibft, autoip, shared + * default: none + * description: Method used for IPv4 protocol configuration. + * ---end--- + */ /* ---keyfile--- - * property: dns - * format: list of DNS IP addresses - * description: List of DNS servers. - * example: dns=1.2.3.4;8.8.8.8;8.8.4.4; - * ---end--- - * ---ifcfg-rh--- - * property: dns - * variable: DNS1, DNS2, ... - * format: string - * description: List of DNS servers. Even if NetworkManager supports many DNS - * servers, initscripts and resolver only care about the first three, usually. - * example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8 - * ---end--- - */ + * property: dns + * format: list of DNS IP addresses + * description: List of DNS servers. + * example: dns=1.2.3.4;8.8.8.8;8.8.4.4; + * ---end--- + * ---ifcfg-rh--- + * property: dns + * variable: DNS1, DNS2, ... + * format: string + * description: List of DNS servers. Even if NetworkManager supports many DNS + * servers, initscripts and resolver only care about the first three, usually. + * example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8 + * ---end--- + */ /* ---ifcfg-rh--- - * property: dns-search - * variable: DOMAIN - * format: string (space-separated domains) - * description: List of DNS search domains. - * ---end--- - */ + * property: dns-search + * variable: DOMAIN + * format: string (space-separated domains) + * description: List of DNS search domains. + * ---end--- + */ /* ---keyfile--- - * property: addresses - * variable: address1, address2, ... - * format: address/plen - * description: List of static IP addresses. - * example: address1=192.168.100.100/24 address2=10.1.1.5/24 - * ---end--- - * ---ifcfg-rh--- - * property: addresses - * variable: IPADDR, PREFIX, IPADDR1, PREFIX1, ... - * description: List of static IP addresses. - * example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16 - * ---end--- - */ + * property: addresses + * variable: address1, address2, ... + * format: address/plen + * description: List of static IP addresses. + * example: address1=192.168.100.100/24 address2=10.1.1.5/24 + * ---end--- + * ---ifcfg-rh--- + * property: addresses + * variable: IPADDR, PREFIX, IPADDR1, PREFIX1, ... + * description: List of static IP addresses. + * example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16 + * ---end--- + */ /* ---keyfile--- - * property: gateway - * variable: gateway - * format: string - * description: Gateway IP addresses as a string. - * example: gateway=192.168.100.1 - * ---end--- - * ---ifcfg-rh--- - * property: gateway - * variable: GATEWAY - * description: Gateway IP address. - * example: GATEWAY=10.5.5.1 - * ---end--- - */ + * property: gateway + * variable: gateway + * format: string + * description: Gateway IP addresses as a string. + * example: gateway=192.168.100.1 + * ---end--- + * ---ifcfg-rh--- + * property: gateway + * variable: GATEWAY + * description: Gateway IP address. + * example: GATEWAY=10.5.5.1 + * ---end--- + */ /* ---keyfile--- - * property: routes - * variable: route1, route2, ... - * format: route/plen[,gateway,metric] - * description: List of IP routes. - * example: route1=8.8.8.0/24,10.1.1.1,77 - * route2=7.7.0.0/16 - * ---end--- - * ---ifcfg-rh--- - * property: routes - * variable: ADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ... - * description: List of static routes. They are not stored in ifcfg-* file, - * but in route-* file instead. - * ---end--- - */ + * property: routes + * variable: route1, route2, ... + * format: route/plen[,gateway,metric] + * description: List of IP routes. + * example: route1=8.8.8.0/24,10.1.1.1,77 + * route2=7.7.0.0/16 + * ---end--- + * ---ifcfg-rh--- + * property: routes + * variable: ADDRESS1, NETMASK1, GATEWAY1, METRIC1, OPTIONS1, ... + * description: List of static routes. They are not stored in ifcfg-* file, + * but in route-* file instead. + * ---end--- + */ /* ---ifcfg-rh--- - * property: ignore-auto-routes - * variable: PEERROUTES(+) - * default: yes - * description: PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. - * ---end--- - */ + * property: ignore-auto-routes + * variable: PEERROUTES(+) + * default: yes + * description: PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: ignore-auto-dns - * variable: PEERDNS - * default: yes - * description: PEERDNS has the opposite meaning as 'ignore-auto-dns' property. - * ---end--- - */ + * property: ignore-auto-dns + * variable: PEERDNS + * default: yes + * description: PEERDNS has the opposite meaning as 'ignore-auto-dns' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-send-hostname - * variable: DHCP_SEND_HOSTNAME(+) - * default: yes - * description: Whether DHCP_HOSTNAME should be sent to the DHCP server. - * ---end--- - */ + * property: dhcp-send-hostname + * variable: DHCP_SEND_HOSTNAME(+) + * default: yes + * description: Whether DHCP_HOSTNAME should be sent to the DHCP server. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-hostname - * variable: DHCP_HOSTNAME - * description: Hostname to send to the DHCP server. When both DHCP_HOSTNAME and - * DHCP_FQDN are specified only the latter is used. - * ---end--- - */ + * property: dhcp-hostname + * variable: DHCP_HOSTNAME + * description: Hostname to send to the DHCP server. When both DHCP_HOSTNAME and + * DHCP_FQDN are specified only the latter is used. + * ---end--- + */ /* ---ifcfg-rh--- - * property: never-default - * variable: DEFROUTE (GATEWAYDEV in /etc/sysconfig/network) - * default: yes - * description: DEFROUTE=no tells NetworkManager that this connection - * should not be assigned the default route. DEFROUTE has the opposite - * meaning as 'never-default' property. - * ---end--- - */ + * property: never-default + * variable: DEFROUTE (GATEWAYDEV in /etc/sysconfig/network) + * default: yes + * description: DEFROUTE=no tells NetworkManager that this connection + * should not be assigned the default route. DEFROUTE has the opposite + * meaning as 'never-default' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: may-fail - * variable: IPV4_FAILURE_FATAL(+) - * default: no - * description: IPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property. - * ---end--- - */ + * property: may-fail + * variable: IPV4_FAILURE_FATAL(+) + * default: no + * description: IPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: route-metric - * variable: IPV4_ROUTE_METRIC(+) - * default: -1 - * description: IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. - * If set to -1, a default metric based on the device type is used. - * ---end--- - */ + * property: route-metric + * variable: IPV4_ROUTE_METRIC(+) + * default: -1 + * description: IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. + * If set to -1, a default metric based on the device type is used. + * ---end--- + */ /* ---ifcfg-rh--- - * property: route-table - * variable: IPV4_ROUTE_TABLE(+) - * default: 0 - * description: IPV4_ROUTE_TABLE enables policy-routing and sets the default routing table. - * ---end--- - */ + * property: route-table + * variable: IPV4_ROUTE_TABLE(+) + * default: 0 + * description: IPV4_ROUTE_TABLE enables policy-routing and sets the default routing table. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dns-options - * variable: RES_OPTIONS(+) - * description: List of DNS options to be added to /etc/resolv.conf - * example: RES_OPTIONS=ndots:2 timeout:3 - * ---end--- - */ + * property: dns-options + * variable: RES_OPTIONS(+) + * description: List of DNS options to be added to /etc/resolv.conf + * example: RES_OPTIONS=ndots:2 timeout:3 + * ---end--- + */ /* ---ifcfg-rh--- - * property: dns-priority - * variable: IPV4_DNS_PRIORITY(+) - * description: The priority for DNS servers of this connection. Lower values have higher priority. - * If zero, the default value will be used (50 for VPNs, 100 for other connections). - * A negative value prevents DNS from other connections with greater values to be used. - * default: 0 - * example: IPV4_DNS_PRIORITY=20 - * ---end--- - */ + * property: dns-priority + * variable: IPV4_DNS_PRIORITY(+) + * description: The priority for DNS servers of this connection. Lower values have higher priority. + * If zero, the default value will be used (50 for VPNs, 100 for other connections). + * A negative value prevents DNS from other connections with greater values to be used. + * default: 0 + * example: IPV4_DNS_PRIORITY=20 + * ---end--- + */ /** - * NMSettingIP4Config:dhcp-client-id: - * - * A string sent to the DHCP server to identify the local machine which the - * DHCP server may use to customize the DHCP lease and options. - * When the property is a hex string ('aa:bb:cc') it is interpreted as a - * binary client ID, in which case the first byte is assumed to be the - * 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be - * an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet - * ARP type and the rest is a MAC address). - * If the property is not a hex string it is considered as a - * non-hardware-address client ID and the 'type' field is set to 0. - * - * The special values "mac" and "perm-mac" are supported, which use the - * current or permanent MAC address of the device to generate a client identifier - * with type ethernet (01). Currently, these options only work for ethernet - * type of links. - * - * The special value "duid" generates a RFC4361-compliant client identifier based - * on a hash of the interface name as IAID and /etc/machine-id. - * - * The special value "stable" is supported to generate a type 0 client identifier based - * on the stable-id (see connection.stable-id) and a per-host key. If you set the - * stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a - * per-device key. - * - * If unset, a globally configured default is used. If still unset, the default - * depends on the DHCP plugin. - **/ + * NMSettingIP4Config:dhcp-client-id: + * + * A string sent to the DHCP server to identify the local machine which the + * DHCP server may use to customize the DHCP lease and options. + * When the property is a hex string ('aa:bb:cc') it is interpreted as a + * binary client ID, in which case the first byte is assumed to be the + * 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be + * an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet + * ARP type and the rest is a MAC address). + * If the property is not a hex string it is considered as a + * non-hardware-address client ID and the 'type' field is set to 0. + * + * The special values "mac" and "perm-mac" are supported, which use the + * current or permanent MAC address of the device to generate a client identifier + * with type ethernet (01). Currently, these options only work for ethernet + * type of links. + * + * The special value "duid" generates a RFC4361-compliant client identifier based + * on a hash of the interface name as IAID and /etc/machine-id. + * + * The special value "stable" is supported to generate a type 0 client identifier based + * on the stable-id (see connection.stable-id) and a per-host key. If you set the + * stable-id, you may want to include the "${DEVICE}" or "${MAC}" specifier to get a + * per-device key. + * + * If unset, a globally configured default is used. If still unset, the default + * depends on the DHCP plugin. + **/ /* ---ifcfg-rh--- - * property: dhcp-client-id - * variable: DHCP_CLIENT_ID(+) - * description: A string sent to the DHCP server to identify the local machine. - * A binary value can be specified using hex notation ('aa:bb:cc'). - * example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44 - * ---end--- - */ + * property: dhcp-client-id + * variable: DHCP_CLIENT_ID(+) + * description: A string sent to the DHCP server to identify the local machine. + * A binary value can be specified using hex notation ('aa:bb:cc'). + * example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44 + * ---end--- + */ obj_properties[PROP_DHCP_CLIENT_ID] = g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", @@ -835,49 +835,49 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /* ---ifcfg-rh--- - * property: dad-timeout - * variable: ACD_TIMEOUT(+), ARPING_WAIT - * default: missing variable means global default (config override or zero) - * description: Timeout (in milliseconds for ACD_TIMEOUT or in seconds - * for ARPING_WAIT) for address conflict detection before configuring - * IPv4 addresses. 0 turns off the ACD completely, -1 means default value. - * example: ACD_TIMEOUT=2000 or ARPING_WAIT=2 - * ---end--- - */ + * property: dad-timeout + * variable: ACD_TIMEOUT(+), ARPING_WAIT + * default: missing variable means global default (config override or zero) + * description: Timeout (in milliseconds for ACD_TIMEOUT or in seconds + * for ARPING_WAIT) for address conflict detection before configuring + * IPv4 addresses. 0 turns off the ACD completely, -1 means default value. + * example: ACD_TIMEOUT=2000 or ARPING_WAIT=2 + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-timeout - * variable: IPV4_DHCP_TIMEOUT(+) - * description: A timeout after which the DHCP transaction fails in case of no response. - * example: IPV4_DHCP_TIMEOUT=10 - * ---end--- - */ + * property: dhcp-timeout + * variable: IPV4_DHCP_TIMEOUT(+) + * description: A timeout after which the DHCP transaction fails in case of no response. + * example: IPV4_DHCP_TIMEOUT=10 + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-hostname-flags - * variable: DHCP_HOSTNAME_FLAGS - * description: flags for the DHCP hostname and FQDN properties - * example: DHCP_HOSTNAME_FLAGS=5 - */ + * property: dhcp-hostname-flags + * variable: DHCP_HOSTNAME_FLAGS + * description: flags for the DHCP hostname and FQDN properties + * example: DHCP_HOSTNAME_FLAGS=5 + */ /** - * NMSettingIP4Config:dhcp-fqdn: - * - * If the #NMSettingIPConfig:dhcp-send-hostname property is %TRUE, then the - * specified FQDN will be sent to the DHCP server when acquiring a lease. This - * property and #NMSettingIPConfig:dhcp-hostname are mutually exclusive and - * cannot be set at the same time. - * - * Since: 1.2 - */ + * NMSettingIP4Config:dhcp-fqdn: + * + * If the #NMSettingIPConfig:dhcp-send-hostname property is %TRUE, then the + * specified FQDN will be sent to the DHCP server when acquiring a lease. This + * property and #NMSettingIPConfig:dhcp-hostname are mutually exclusive and + * cannot be set at the same time. + * + * Since: 1.2 + */ /* ---ifcfg-rh--- - * property: dhcp-fqdn - * variable: DHCP_FQDN - * description: FQDN to send to the DHCP server. When both DHCP_HOSTNAME and - * DHCP_FQDN are specified only the latter is used. - * example: DHCP_FQDN=foo.bar.com - * ---end--- - */ + * property: dhcp-fqdn + * variable: DHCP_FQDN + * description: FQDN to send to the DHCP server. When both DHCP_HOSTNAME and + * DHCP_FQDN are specified only the latter is used. + * example: DHCP_FQDN=foo.bar.com + * ---end--- + */ obj_properties[PROP_DHCP_FQDN] = g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_FQDN, "", @@ -886,24 +886,24 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIP4Config:dhcp-vendor-class-identifier: - * - * The Vendor Class Identifier DHCP option (60). - * Special characters in the data string may be escaped using C-style escapes, - * nevertheless this property cannot contain nul bytes. - * If the per-profile value is unspecified (the default), - * a global connection default gets consulted. - * If still unspecified, the DHCP option is not sent to the server. - * - * Since 1.28 - */ + * NMSettingIP4Config:dhcp-vendor-class-identifier: + * + * The Vendor Class Identifier DHCP option (60). + * Special characters in the data string may be escaped using C-style escapes, + * nevertheless this property cannot contain nul bytes. + * If the per-profile value is unspecified (the default), + * a global connection default gets consulted. + * If still unspecified, the DHCP option is not sent to the server. + * + * Since 1.28 + */ /* ---ifcfg-rh--- - * property: dhcp-vendor-class-identifier - * variable: DHCP_VENDOR_CLASS_IDENTIFIER(+) - * description: The Vendor Class Identifier DHCP option (60). - * example: DHCP_VENDOR_CLASS_IDENTIFIER=foo - * ---end--- - */ + * property: dhcp-vendor-class-identifier + * variable: DHCP_VENDOR_CLASS_IDENTIFIER(+) + * description: The Vendor Class Identifier DHCP option (60). + * example: DHCP_VENDOR_CLASS_IDENTIFIER=foo + * ---end--- + */ obj_properties[PROP_DHCP_VENDOR_CLASS_IDENTIFIER] = g_param_spec_string(NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER, "", @@ -914,12 +914,12 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) /* IP4-specific property overrides */ /* ---dbus--- - * property: dns - * format: array of uint32 - * description: Array of IP addresses of DNS servers (as network-byte-order - * integers) - * ---end--- - */ + * property: dns + * format: array of uint32 + * description: Array of IP addresses of DNS servers (as network-byte-order + * integers) + * ---end--- + */ _nm_properties_override_gobj( properties_override, g_object_class_find_property(G_OBJECT_CLASS(setting_class), NM_SETTING_IP_CONFIG_DNS), @@ -928,20 +928,20 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) .gprop_from_dbus_fcn = ip4_dns_from_dbus, )); /* ---dbus--- - * property: addresses - * format: array of array of uint32 - * description: Deprecated in favor of the 'address-data' and 'gateway' - * properties, but this can be used for backward-compatibility with older - * daemons. Note that if you send this property the daemon will ignore - * 'address-data' and 'gateway'. - * - * Array of IPv4 address structures. Each IPv4 address structure is - * composed of 3 32-bit values; the first being the IPv4 address (network - * byte order), the second the prefix (1 - 32), and last the IPv4 gateway - * (network byte order). The gateway may be left as 0 if no gateway exists - * for that subnet. - * ---end--- - */ + * property: addresses + * format: array of array of uint32 + * description: Deprecated in favor of the 'address-data' and 'gateway' + * properties, but this can be used for backward-compatibility with older + * daemons. Note that if you send this property the daemon will ignore + * 'address-data' and 'gateway'. + * + * Array of IPv4 address structures. Each IPv4 address structure is + * composed of 3 32-bit values; the first being the IPv4 address (network + * byte order), the second the prefix (1 - 32), and last the IPv4 gateway + * (network byte order). The gateway may be left as 0 if no gateway exists + * for that subnet. + * ---end--- + */ _nm_properties_override_gobj( properties_override, g_object_class_find_property(G_OBJECT_CLASS(setting_class), NM_SETTING_IP_CONFIG_ADDRESSES), @@ -955,14 +955,14 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) .to_dbus_fcn = ip4_address_labels_get, )); /* ---dbus--- - * property: address-data - * format: array of vardict - * description: Array of IPv4 addresses. Each address dictionary contains at - * least 'address' and 'prefix' entries, containing the IP address as a - * string, and the prefix length as a uint32. Additional attributes may - * also exist on some addresses. - * ---end--- - */ + * property: address-data + * format: array of vardict + * description: Array of IPv4 addresses. Each address dictionary contains at + * least 'address' and 'prefix' entries, containing the IP address as a + * string, and the prefix length as a uint32. Additional attributes may + * also exist on some addresses. + * ---end--- + */ _nm_properties_override_dbus( properties_override, "address-data", @@ -971,22 +971,22 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) .from_dbus_fcn = ip4_address_data_set, )); /* ---dbus--- - * property: routes - * format: array of array of uint32 - * description: Deprecated in favor of the 'route-data' property, but this - * can be used for backward-compatibility with older daemons. Note that if - * you send this property the daemon will ignore 'route-data'. - * - * Array of IPv4 route structures. Each IPv4 route structure is composed - * of 4 32-bit values; the first being the destination IPv4 network or - * address (network byte order), the second the destination network or - * address prefix (1 - 32), the third being the next-hop (network byte - * order) if any, and the fourth being the route metric. If the metric is - * 0, NM will choose an appropriate default metric for the device. (There - * is no way to explicitly specify an actual metric of 0 with this - * property.) - * ---end--- - */ + * property: routes + * format: array of array of uint32 + * description: Deprecated in favor of the 'route-data' property, but this + * can be used for backward-compatibility with older daemons. Note that if + * you send this property the daemon will ignore 'route-data'. + * + * Array of IPv4 route structures. Each IPv4 route structure is composed + * of 4 32-bit values; the first being the destination IPv4 network or + * address (network byte order), the second the destination network or + * address prefix (1 - 32), the third being the next-hop (network byte + * order) if any, and the fourth being the route metric. If the metric is + * 0, NM will choose an appropriate default metric for the device. (There + * is no way to explicitly specify an actual metric of 0 with this + * property.) + * ---end--- + */ _nm_properties_override_gobj( properties_override, g_object_class_find_property(G_OBJECT_CLASS(setting_class), NM_SETTING_IP_CONFIG_ROUTES), @@ -995,18 +995,18 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass) .from_dbus_fcn = ip4_routes_set, )); /* ---dbus--- - * property: route-data - * format: array of vardict - * description: Array of IPv4 routes. Each route dictionary contains at - * least 'dest' and 'prefix' entries, containing the destination IP - * address as a string, and the prefix length as a uint32. Most routes - * will also have a 'next-hop' entry, containing the next hop IP address as - * a string. If the route has a 'metric' entry (containing a uint32), that - * will be used as the metric for the route (otherwise NM will pick a - * default value appropriate to the device). Additional attributes may - * also exist on some routes. - * ---end--- - */ + * property: route-data + * format: array of vardict + * description: Array of IPv4 routes. Each route dictionary contains at + * least 'dest' and 'prefix' entries, containing the destination IP + * address as a string, and the prefix length as a uint32. Most routes + * will also have a 'next-hop' entry, containing the next hop IP address as + * a string. If the route has a 'metric' entry (containing a uint32), that + * will be used as the metric for the route (otherwise NM will pick a + * default value appropriate to the device). Additional attributes may + * also exist on some routes. + * ---end--- + */ _nm_properties_override_dbus(properties_override, "route-data", NM_SETT_INFO_PROPERT_TYPE(.dbus_type = NM_G_VARIANT_TYPE("aa{sv}"), diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 1d6f9ed688..337486ac67 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -623,207 +623,207 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) setting_class->verify = verify; /* ---ifcfg-rh--- - * property: method - * variable: IPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6C, IPV6_DISABLED - * default: IPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=no - * description: Method used for IPv6 protocol configuration. - * ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes; - * disabled ~ IPV6_DISABLED=yes - * ---end--- - */ + * property: method + * variable: IPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6C, IPV6_DISABLED + * default: IPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=no + * description: Method used for IPv6 protocol configuration. + * ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes; + * disabled ~ IPV6_DISABLED=yes + * ---end--- + */ /* ---keyfile--- - * property: dns - * format: list of DNS IP addresses - * description: List of DNS servers. - * example: dns=2001:4860:4860::8888;2001:4860:4860::8844; - * ---end--- - * ---ifcfg-rh--- - * property: dns - * variable: DNS1, DNS2, ... - * format: string - * description: List of DNS servers. NetworkManager uses the variables both - * for IPv4 and IPv6. - * ---end--- - */ + * property: dns + * format: list of DNS IP addresses + * description: List of DNS servers. + * example: dns=2001:4860:4860::8888;2001:4860:4860::8844; + * ---end--- + * ---ifcfg-rh--- + * property: dns + * variable: DNS1, DNS2, ... + * format: string + * description: List of DNS servers. NetworkManager uses the variables both + * for IPv4 and IPv6. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dns-search - * variable: IPV6_DOMAIN(+) - * format: string (space-separated domains) - * description: List of DNS search domains. - * ---end--- - */ + * property: dns-search + * variable: IPV6_DOMAIN(+) + * format: string (space-separated domains) + * description: List of DNS search domains. + * ---end--- + */ /* ---keyfile--- - * property: addresses - * variable: address1, address2, ... - * format: address/plen - * description: List of static IP addresses. - * example: address1=abbe::cafe/96 address2=2001::1234 - * ---end--- - * ---ifcfg-rh--- - * property: addresses - * variable: IPV6ADDR, IPV6ADDR_SECONDARIES - * description: List of static IP addresses. - * example: IPV6ADDR=ab12:9876::1 - * IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3" - * ---end--- - */ + * property: addresses + * variable: address1, address2, ... + * format: address/plen + * description: List of static IP addresses. + * example: address1=abbe::cafe/96 address2=2001::1234 + * ---end--- + * ---ifcfg-rh--- + * property: addresses + * variable: IPV6ADDR, IPV6ADDR_SECONDARIES + * description: List of static IP addresses. + * example: IPV6ADDR=ab12:9876::1 + * IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3" + * ---end--- + */ /* ---keyfile--- - * property: gateway - * variable: gateway - * format: string - * description: Gateway IP addresses as a string. - * example: gateway=abbe::1 - * ---end--- - * ---ifcfg-rh--- - * property: gateway - * variable: IPV6_DEFAULTGW - * description: Gateway IP address. - * example: IPV6_DEFAULTGW=abbe::1 - * ---end--- - */ + * property: gateway + * variable: gateway + * format: string + * description: Gateway IP addresses as a string. + * example: gateway=abbe::1 + * ---end--- + * ---ifcfg-rh--- + * property: gateway + * variable: IPV6_DEFAULTGW + * description: Gateway IP address. + * example: IPV6_DEFAULTGW=abbe::1 + * ---end--- + */ /* ---keyfile--- - * property: routes - * variable: route1, route2, ... - * format: route/plen[,gateway,metric] - * description: List of IP routes. - * example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403 - * ---end--- - * ---ifcfg-rh--- - * property: routes - * variable: (none) - * description: List of static routes. They are not stored in ifcfg-* file, - * but in route6-* file instead in the form of command line for 'ip route add'. - * ---end--- - */ + * property: routes + * variable: route1, route2, ... + * format: route/plen[,gateway,metric] + * description: List of IP routes. + * example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403 + * ---end--- + * ---ifcfg-rh--- + * property: routes + * variable: (none) + * description: List of static routes. They are not stored in ifcfg-* file, + * but in route6-* file instead in the form of command line for 'ip route add'. + * ---end--- + */ /* ---ifcfg-rh--- - * property: ignore-auto-routes - * variable: IPV6_PEERROUTES(+) - * default: yes - * description: IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. - * ---end--- - */ + * property: ignore-auto-routes + * variable: IPV6_PEERROUTES(+) + * default: yes + * description: IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: ignore-auto-dns - * variable: IPV6_PEERDNS(+) - * default: yes - * description: IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property. - * ---end--- - */ + * property: ignore-auto-dns + * variable: IPV6_PEERDNS(+) + * default: yes + * description: IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-hostname - * variable: DHCPV6_HOSTNAME - * description: Hostname to send the DHCP server. - * ---end--- - */ + * property: dhcp-hostname + * variable: DHCPV6_HOSTNAME + * description: Hostname to send the DHCP server. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-timeout - * variable: IPV6_DHCP_TIMEOUT(+) - * description: A timeout after which the DHCP transaction fails in case of no response. - * example: IPV6_DHCP_TIMEOUT=10 - * ---end--- - */ + * property: dhcp-timeout + * variable: IPV6_DHCP_TIMEOUT(+) + * description: A timeout after which the DHCP transaction fails in case of no response. + * example: IPV6_DHCP_TIMEOUT=10 + * ---end--- + */ /* ---ifcfg-rh--- - * property: dhcp-hostname-flags - * variable: DHCPV6_HOSTNAME_FLAGS - * description: flags for the DHCP hostname property - * example: DHCPV6_HOSTNAME_FLAGS=5 - */ + * property: dhcp-hostname-flags + * variable: DHCPV6_HOSTNAME_FLAGS + * description: flags for the DHCP hostname property + * example: DHCPV6_HOSTNAME_FLAGS=5 + */ /* ---ifcfg-rh--- - * property: never-default - * variable: IPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network) - * default: IPV6_DEFROUTE=yes (when no variable specified) - * description: IPV6_DEFROUTE=no tells NetworkManager that this connection - * should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite - * meaning as 'never-default' property. - * ---end--- - */ + * property: never-default + * variable: IPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network) + * default: IPV6_DEFROUTE=yes (when no variable specified) + * description: IPV6_DEFROUTE=no tells NetworkManager that this connection + * should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite + * meaning as 'never-default' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: may-fail - * variable: IPV6_FAILURE_FATAL(+) - * default: no - * description: IPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property. - * ---end--- - */ + * property: may-fail + * variable: IPV6_FAILURE_FATAL(+) + * default: no + * description: IPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property. + * ---end--- + */ /* ---ifcfg-rh--- - * property: route-metric - * variable: IPV6_ROUTE_METRIC(+) - * default: -1 - * description: IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection. - * If set to -1, a default metric based on the device type is used. - * ---end--- - */ + * property: route-metric + * variable: IPV6_ROUTE_METRIC(+) + * default: -1 + * description: IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection. + * If set to -1, a default metric based on the device type is used. + * ---end--- + */ /* ---ifcfg-rh--- - * property: route-table - * variable: IPV6_ROUTE_TABLE(+) - * default: 0 - * description: IPV6_ROUTE_TABLE enables policy-routing and sets the default routing table. - * ---end--- - */ + * property: route-table + * variable: IPV6_ROUTE_TABLE(+) + * default: 0 + * description: IPV6_ROUTE_TABLE enables policy-routing and sets the default routing table. + * ---end--- + */ /* ---ifcfg-rh--- - * property: dns-priority - * variable: IPV6_DNS_PRIORITY(+) - * description: The priority for DNS servers of this connection. Lower values have higher priority. - * If zero, the default value will be used (50 for VPNs, 100 for other connections). - * A negative value prevents DNS from other connections with greater values to be used. - * default: 0 - * example: IPV6_DNS_PRIORITY=20 - * ---end--- - */ + * property: dns-priority + * variable: IPV6_DNS_PRIORITY(+) + * description: The priority for DNS servers of this connection. Lower values have higher priority. + * If zero, the default value will be used (50 for VPNs, 100 for other connections). + * A negative value prevents DNS from other connections with greater values to be used. + * default: 0 + * example: IPV6_DNS_PRIORITY=20 + * ---end--- + */ /* ---ifcfg-rh--- - * property: dns-options - * variable: IPV6_RES_OPTIONS(+) - * description: List of DNS options to be added to /etc/resolv.conf - * example: IPV6_RES_OPTIONS=ndots:2 timeout:3 - * ---end--- - */ + * property: dns-options + * variable: IPV6_RES_OPTIONS(+) + * description: List of DNS options to be added to /etc/resolv.conf + * example: IPV6_RES_OPTIONS=ndots:2 timeout:3 + * ---end--- + */ /** - * NMSettingIP6Config:ip6-privacy: - * - * Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If - * enabled, it makes the kernel generate a temporary IPv6 address in - * addition to the public one generated from MAC address via modified - * EUI-64. This enhances privacy, but could cause problems in some - * applications, on the other hand. The permitted values are: -1: unknown, - * 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary - * addresses). - * - * Having a per-connection setting set to "-1" (unknown) means fallback to - * global configuration "ipv6.ip6-privacy". - * - * If also global configuration is unspecified or set to "-1", fallback to read - * "/proc/sys/net/ipv6/conf/default/use_tempaddr". - * - * Note that this setting is distinct from the Stable Privacy addresses - * that can be enabled with the "addr-gen-mode" property's "stable-privacy" - * setting as another way of avoiding host tracking with IPv6 addresses. - **/ + * NMSettingIP6Config:ip6-privacy: + * + * Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941. If + * enabled, it makes the kernel generate a temporary IPv6 address in + * addition to the public one generated from MAC address via modified + * EUI-64. This enhances privacy, but could cause problems in some + * applications, on the other hand. The permitted values are: -1: unknown, + * 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary + * addresses). + * + * Having a per-connection setting set to "-1" (unknown) means fallback to + * global configuration "ipv6.ip6-privacy". + * + * If also global configuration is unspecified or set to "-1", fallback to read + * "/proc/sys/net/ipv6/conf/default/use_tempaddr". + * + * Note that this setting is distinct from the Stable Privacy addresses + * that can be enabled with the "addr-gen-mode" property's "stable-privacy" + * setting as another way of avoiding host tracking with IPv6 addresses. + **/ /* ---ifcfg-rh--- - * property: ip6-privacy - * variable: IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+) - * values: IPV6_PRIVACY: no, yes (rfc3041 or rfc4941); - * IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no - * default: no - * description: Configure IPv6 Privacy Extensions for SLAAC (RFC4941). - * example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes - * ---end--- - */ + * property: ip6-privacy + * variable: IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+) + * values: IPV6_PRIVACY: no, yes (rfc3041 or rfc4941); + * IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no + * default: no + * description: Configure IPv6 Privacy Extensions for SLAAC (RFC4941). + * example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes + * ---end--- + */ obj_properties[PROP_IP6_PRIVACY] = g_param_spec_enum(NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", @@ -833,46 +833,46 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIP6Config:addr-gen-mode: - * - * Configure method for creating the address for use with RFC4862 IPv6 - * Stateless Address Autoconfiguration. The permitted values are: - * %NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 or - * %NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY. - * - * If the property is set to EUI64, the addresses will be generated - * using the interface tokens derived from hardware address. This makes - * the host part of the address to stay constant, making it possible - * to track host's presence when it changes networks. The address changes - * when the interface hardware is replaced. - * - * The value of stable-privacy enables use of cryptographically - * secure hash of a secret host-specific key along with the connection's - * stable-id and the network address as specified by RFC7217. - * This makes it impossible to use the address track host's presence, - * and makes the address stable when the network interface hardware is - * replaced. - * - * On D-Bus, the absence of an addr-gen-mode setting equals enabling - * stable-privacy. For keyfile plugin, the absence of the setting - * on disk means EUI64 so that the property doesn't change on upgrade - * from older versions. - * - * Note that this setting is distinct from the Privacy Extensions as - * configured by "ip6-privacy" property and it does not affect the - * temporary addresses configured with this option. - * - * Since: 1.2 - **/ + * NMSettingIP6Config:addr-gen-mode: + * + * Configure method for creating the address for use with RFC4862 IPv6 + * Stateless Address Autoconfiguration. The permitted values are: + * %NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64 or + * %NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY. + * + * If the property is set to EUI64, the addresses will be generated + * using the interface tokens derived from hardware address. This makes + * the host part of the address to stay constant, making it possible + * to track host's presence when it changes networks. The address changes + * when the interface hardware is replaced. + * + * The value of stable-privacy enables use of cryptographically + * secure hash of a secret host-specific key along with the connection's + * stable-id and the network address as specified by RFC7217. + * This makes it impossible to use the address track host's presence, + * and makes the address stable when the network interface hardware is + * replaced. + * + * On D-Bus, the absence of an addr-gen-mode setting equals enabling + * stable-privacy. For keyfile plugin, the absence of the setting + * on disk means EUI64 so that the property doesn't change on upgrade + * from older versions. + * + * Note that this setting is distinct from the Privacy Extensions as + * configured by "ip6-privacy" property and it does not affect the + * temporary addresses configured with this option. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: addr-gen-mode - * variable: IPV6_ADDR_GEN_MODE - * values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy - * default: eui64 - * description: Configure IPv6 Stable Privacy addressing for SLAAC (RFC7217). - * example: IPV6_ADDR_GEN_MODE=stable-privacy - * ---end--- - */ + * property: addr-gen-mode + * variable: IPV6_ADDR_GEN_MODE + * values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy + * default: eui64 + * description: Configure IPv6 Stable Privacy addressing for SLAAC (RFC7217). + * example: IPV6_ADDR_GEN_MODE=stable-privacy + * ---end--- + */ obj_properties[PROP_ADDR_GEN_MODE] = g_param_spec_int(NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, "", @@ -883,20 +883,20 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIP6Config:token: - * - * Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 - * IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode. - * - * Since: 1.4 - **/ + * NMSettingIP6Config:token: + * + * Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 + * IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode. + * + * Since: 1.4 + **/ /* ---ifcfg-rh--- - * property: token - * variable: IPV6_TOKEN - * description: The IPv6 tokenized interface identifier token - * example: IPV6_TOKEN=::53 - * ---end--- - */ + * property: token + * variable: IPV6_TOKEN + * description: The IPv6 tokenized interface identifier token + * example: IPV6_TOKEN=::53 + * ---end--- + */ obj_properties[PROP_TOKEN] = g_param_spec_string(NM_SETTING_IP6_CONFIG_TOKEN, "", "", @@ -905,23 +905,23 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingIP6Config:ra-timeout: - * - * A timeout for waiting Router Advertisements in seconds. If zero (the default), a - * globally configured default is used. If still unspecified, the timeout depends on the - * sysctl settings of the device. - * - * Set to 2147483647 (MAXINT32) for infinity. - * - * Since: 1.24 - **/ + * NMSettingIP6Config:ra-timeout: + * + * A timeout for waiting Router Advertisements in seconds. If zero (the default), a + * globally configured default is used. If still unspecified, the timeout depends on the + * sysctl settings of the device. + * + * Set to 2147483647 (MAXINT32) for infinity. + * + * Since: 1.24 + **/ /* ---ifcfg-rh--- - * property: dhcp-timeout - * variable: IPV6_RA_TIMEOUT(+) - * description: A timeout for waiting Router Advertisements in seconds. - * example: IPV6_RA_TIMEOUT=10 - * ---end--- - */ + * property: dhcp-timeout + * variable: IPV6_RA_TIMEOUT(+) + * description: A timeout for waiting Router Advertisements in seconds. + * example: IPV6_RA_TIMEOUT=10 + * ---end--- + */ obj_properties[PROP_RA_TIMEOUT] = g_param_spec_int( NM_SETTING_IP6_CONFIG_RA_TIMEOUT, @@ -933,50 +933,50 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingIP6Config:dhcp-duid: - * - * A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp - * client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried - * in the Client Identifier option. - * If the property is a hex string ('aa:bb:cc') it is interpreted as a binary - * DUID and filled as an opaque value in the Client Identifier option. - * - * The special value "lease" will retrieve the DUID previously used from the - * lease file belonging to the connection. If no DUID is found and "dhclient" - * is the configured dhcp client, the DUID is searched in the system-wide - * dhclient lease file. If still no DUID is found, or another dhcp client is - * used, a global and permanent DUID-UUID (RFC 6355) will be generated based - * on the machine-id. - * - * The special values "llt" and "ll" will generate a DUID of type LLT or LL - * (see RFC 3315) based on the current MAC address of the device. In order to - * try providing a stable DUID-LLT, the time field will contain a constant - * timestamp that is used globally (for all profiles) and persisted to disk. - * - * The special values "stable-llt", "stable-ll" and "stable-uuid" will generate - * a DUID of the corresponding type, derived from the connection's stable-id and - * a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier - * in the stable-id, in case this profile gets activated on multiple devices. - * So, the link-layer address of "stable-ll" and "stable-llt" will be a generated - * address derived from the stable id. The DUID-LLT time value in the "stable-llt" - * option will be picked among a static timespan of three years (the upper bound - * of the interval is the same constant timestamp used in "llt"). - * - * When the property is unset, the global value provided for "ipv6.dhcp-duid" is - * used. If no global value is provided, the default "lease" value is assumed. - * - * Since: 1.12 - **/ + * NMSettingIP6Config:dhcp-duid: + * + * A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp + * client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried + * in the Client Identifier option. + * If the property is a hex string ('aa:bb:cc') it is interpreted as a binary + * DUID and filled as an opaque value in the Client Identifier option. + * + * The special value "lease" will retrieve the DUID previously used from the + * lease file belonging to the connection. If no DUID is found and "dhclient" + * is the configured dhcp client, the DUID is searched in the system-wide + * dhclient lease file. If still no DUID is found, or another dhcp client is + * used, a global and permanent DUID-UUID (RFC 6355) will be generated based + * on the machine-id. + * + * The special values "llt" and "ll" will generate a DUID of type LLT or LL + * (see RFC 3315) based on the current MAC address of the device. In order to + * try providing a stable DUID-LLT, the time field will contain a constant + * timestamp that is used globally (for all profiles) and persisted to disk. + * + * The special values "stable-llt", "stable-ll" and "stable-uuid" will generate + * a DUID of the corresponding type, derived from the connection's stable-id and + * a per-host unique key. You may want to include the "${DEVICE}" or "${MAC}" specifier + * in the stable-id, in case this profile gets activated on multiple devices. + * So, the link-layer address of "stable-ll" and "stable-llt" will be a generated + * address derived from the stable id. The DUID-LLT time value in the "stable-llt" + * option will be picked among a static timespan of three years (the upper bound + * of the interval is the same constant timestamp used in "llt"). + * + * When the property is unset, the global value provided for "ipv6.dhcp-duid" is + * used. If no global value is provided, the default "lease" value is assumed. + * + * Since: 1.12 + **/ /* ---ifcfg-rh--- - * property: dhcp-duid - * variable: DHCPV6_DUID(+) - * description: A string sent to the DHCPv6 server to identify the local machine. - * Apart from the special values "lease", "stable-llt", "stable-ll", "stable-uuid", - * "llt" and "ll" a binary value in hex format is expected. An hex string where - * each octet is separated by a colon is also accepted. - * example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01 - * ---end--- - */ + * property: dhcp-duid + * variable: DHCPV6_DUID(+) + * description: A string sent to the DHCPv6 server to identify the local machine. + * Apart from the special values "lease", "stable-llt", "stable-ll", "stable-uuid", + * "llt" and "ll" a binary value in hex format is expected. An hex string where + * each octet is separated by a colon is also accepted. + * example: DHCPV6_DUID=LL; DHCPV6_DUID=0301deadbeef0001; DHCPV6_DUID=03:01:de:ad:be:ef:00:01 + * ---end--- + */ obj_properties[PROP_DHCP_DUID] = g_param_spec_string(NM_SETTING_IP6_CONFIG_DHCP_DUID, "", @@ -987,11 +987,11 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) /* IP6-specific property overrides */ /* ---dbus--- - * property: dns - * format: array of byte array - * description: Array of IP addresses of DNS servers (in network byte order) - * ---end--- - */ + * property: dns + * format: array of byte array + * description: Array of IP addresses of DNS servers (in network byte order) + * ---end--- + */ _nm_properties_override_gobj( properties_override, g_object_class_find_property(G_OBJECT_CLASS(setting_class), NM_SETTING_IP_CONFIG_DNS), @@ -1000,19 +1000,19 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) .gprop_from_dbus_fcn = ip6_dns_from_dbus, )); /* ---dbus--- - * property: addresses - * format: array of legacy IPv6 address struct (a(ayuay)) - * description: Deprecated in favor of the 'address-data' and 'gateway' - * properties, but this can be used for backward-compatibility with older - * daemons. Note that if you send this property the daemon will ignore - * 'address-data' and 'gateway'. - * - * Array of IPv6 address structures. Each IPv6 address structure is - * composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 - * gateway address. The gateway may be zeroed out if no gateway exists for - * that subnet. - * ---end--- - */ + * property: addresses + * format: array of legacy IPv6 address struct (a(ayuay)) + * description: Deprecated in favor of the 'address-data' and 'gateway' + * properties, but this can be used for backward-compatibility with older + * daemons. Note that if you send this property the daemon will ignore + * 'address-data' and 'gateway'. + * + * Array of IPv6 address structures. Each IPv6 address structure is + * composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 + * gateway address. The gateway may be zeroed out if no gateway exists for + * that subnet. + * ---end--- + */ _nm_properties_override_gobj( properties_override, g_object_class_find_property(G_OBJECT_CLASS(setting_class), NM_SETTING_IP_CONFIG_ADDRESSES), @@ -1021,14 +1021,14 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) .from_dbus_fcn = ip6_addresses_set, )); /* ---dbus--- - * property: address-data - * format: array of vardict - * description: Array of IPv6 addresses. Each address dictionary contains at - * least 'address' and 'prefix' entries, containing the IP address as a - * string, and the prefix length as a uint32. Additional attributes may - * also exist on some addresses. - * ---end--- - */ + * property: address-data + * format: array of vardict + * description: Array of IPv6 addresses. Each address dictionary contains at + * least 'address' and 'prefix' entries, containing the IP address as a + * string, and the prefix length as a uint32. Additional attributes may + * also exist on some addresses. + * ---end--- + */ _nm_properties_override_dbus( properties_override, "address-data", @@ -1037,19 +1037,19 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) .from_dbus_fcn = ip6_address_data_set, )); /* ---dbus--- - * property: routes - * format: array of legacy IPv6 route struct (a(ayuayu)) - * description: Deprecated in favor of the 'route-data' property, but this - * can be used for backward-compatibility with older daemons. Note that if - * you send this property the daemon will ignore 'route-data'. - * - * Array of IPv6 route structures. Each IPv6 route structure is - * composed of an IPv6 address, a prefix length (1 - 128), an IPv6 - * next hop address (which may be zeroed out if there is no next hop), - * and a metric. If the metric is 0, NM will choose an appropriate - * default metric for the device. - * ---end--- - */ + * property: routes + * format: array of legacy IPv6 route struct (a(ayuayu)) + * description: Deprecated in favor of the 'route-data' property, but this + * can be used for backward-compatibility with older daemons. Note that if + * you send this property the daemon will ignore 'route-data'. + * + * Array of IPv6 route structures. Each IPv6 route structure is + * composed of an IPv6 address, a prefix length (1 - 128), an IPv6 + * next hop address (which may be zeroed out if there is no next hop), + * and a metric. If the metric is 0, NM will choose an appropriate + * default metric for the device. + * ---end--- + */ _nm_properties_override_gobj( properties_override, g_object_class_find_property(G_OBJECT_CLASS(setting_class), NM_SETTING_IP_CONFIG_ROUTES), @@ -1058,18 +1058,18 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass) .from_dbus_fcn = ip6_routes_set, )); /* ---dbus--- - * property: route-data - * format: array of vardict - * description: Array of IPv6 routes. Each route dictionary contains at - * least 'dest' and 'prefix' entries, containing the destination IP - * address as a string, and the prefix length as a uint32. Most routes - * will also have a 'next-hop' entry, containing the next hop IP address as - * a string. If the route has a 'metric' entry (containing a uint32), that - * will be used as the metric for the route (otherwise NM will pick a - * default value appropriate to the device). Additional attributes may - * also exist on some routes. - * ---end--- - */ + * property: route-data + * format: array of vardict + * description: Array of IPv6 routes. Each route dictionary contains at + * least 'dest' and 'prefix' entries, containing the destination IP + * address as a string, and the prefix length as a uint32. Most routes + * will also have a 'next-hop' entry, containing the next hop IP address as + * a string. If the route has a 'metric' entry (containing a uint32), that + * will be used as the metric for the route (otherwise NM will pick a + * default value appropriate to the device). Additional attributes may + * also exist on some routes. + * ---end--- + */ _nm_properties_override_dbus(properties_override, "route-data", NM_SETT_INFO_PROPERT_TYPE(.dbus_type = NM_G_VARIANT_TYPE("aa{sv}"), diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c index 37bcdcd8a5..7a2beaae3b 100644 --- a/libnm-core/nm-setting-macsec.c +++ b/libnm-core/nm-setting-macsec.c @@ -218,8 +218,8 @@ verify_macsec_key(const char *key, gboolean cak, GError **error) int req_len; /* CAK is a connection secret and can be NULL for various - * reasons (agent-owned, no permissions to get secrets, etc.) - */ + * reasons (agent-owned, no permissions to get secrets, etc.) + */ if (cak && !key) return TRUE; @@ -269,8 +269,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (priv->parent) { if (nm_utils_is_uuid(priv->parent)) { /* If we have an NMSettingConnection:master with slave-type="macsec", - * then it must be the same UUID. - */ + * then it must be the same UUID. + */ if (s_con) { const char *master = NULL, *slave_type = NULL; @@ -308,8 +308,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } } else { /* If parent is NULL, the parent must be specified via - * NMSettingWired:mac-address. - */ + * NMSettingWired:mac-address. + */ if (connection && (!s_wired || !nm_setting_wired_get_mac_address(s_wired))) { g_set_error(error, NM_CONNECTION_ERROR, @@ -527,15 +527,15 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) setting_class->need_secrets = need_secrets; /** - * NMSettingMacsec:parent: - * - * If given, specifies the parent interface name or parent connection UUID - * from which this MACSEC interface should be created. If this property is - * not specified, the connection must contain an #NMSettingWired setting - * with a #NMSettingWired:mac-address property. - * - * Since: 1.6 - **/ + * NMSettingMacsec:parent: + * + * If given, specifies the parent interface name or parent connection UUID + * from which this MACSEC interface should be created. If this property is + * not specified, the connection must contain an #NMSettingWired setting + * with a #NMSettingWired:mac-address property. + * + * Since: 1.6 + **/ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_MACSEC_PARENT, "", @@ -544,13 +544,13 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:mode: - * - * Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key - * Agreement) is obtained. - * - * Since: 1.6 - **/ + * NMSettingMacsec:mode: + * + * Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key + * Agreement) is obtained. + * + * Since: 1.6 + **/ obj_properties[PROP_MODE] = g_param_spec_int(NM_SETTING_MACSEC_MODE, "", @@ -561,12 +561,12 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:encrypt: - * - * Whether the transmitted traffic must be encrypted. - * - * Since: 1.6 - **/ + * NMSettingMacsec:encrypt: + * + * Whether the transmitted traffic must be encrypted. + * + * Since: 1.6 + **/ obj_properties[PROP_ENCRYPT] = g_param_spec_boolean(NM_SETTING_MACSEC_ENCRYPT, "", "", @@ -574,13 +574,13 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:mka-cak: - * - * The pre-shared CAK (Connectivity Association Key) for MACsec - * Key Agreement. - * - * Since: 1.6 - **/ + * NMSettingMacsec:mka-cak: + * + * The pre-shared CAK (Connectivity Association Key) for MACsec + * Key Agreement. + * + * Since: 1.6 + **/ obj_properties[PROP_MKA_CAK] = g_param_spec_string(NM_SETTING_MACSEC_MKA_CAK, "", @@ -589,13 +589,13 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:mka-cak-flags: - * - * Flags indicating how to handle the #NMSettingMacsec:mka-cak - * property. - * - * Since: 1.6 - **/ + * NMSettingMacsec:mka-cak-flags: + * + * Flags indicating how to handle the #NMSettingMacsec:mka-cak + * property. + * + * Since: 1.6 + **/ obj_properties[PROP_MKA_CAK_FLAGS] = g_param_spec_flags(NM_SETTING_MACSEC_MKA_CAK_FLAGS, "", @@ -605,13 +605,13 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:mka-ckn: - * - * The pre-shared CKN (Connectivity-association Key Name) for - * MACsec Key Agreement. - * - * Since: 1.6 - **/ + * NMSettingMacsec:mka-ckn: + * + * The pre-shared CKN (Connectivity-association Key Name) for + * MACsec Key Agreement. + * + * Since: 1.6 + **/ obj_properties[PROP_MKA_CKN] = g_param_spec_string(NM_SETTING_MACSEC_MKA_CKN, "", "", @@ -619,12 +619,12 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:port: - * - * The port component of the SCI (Secure Channel Identifier), between 1 and 65534. - * - * Since: 1.6 - **/ + * NMSettingMacsec:port: + * + * The port component of the SCI (Secure Channel Identifier), between 1 and 65534. + * + * Since: 1.6 + **/ obj_properties[PROP_PORT] = g_param_spec_int(NM_SETTING_MACSEC_PORT, "", @@ -635,12 +635,12 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:validation: - * - * Specifies the validation mode for incoming frames. - * - * Since: 1.6 - **/ + * NMSettingMacsec:validation: + * + * Specifies the validation mode for incoming frames. + * + * Since: 1.6 + **/ obj_properties[PROP_VALIDATION] = g_param_spec_int(NM_SETTING_MACSEC_VALIDATION, "", @@ -651,13 +651,13 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacsec:send-sci: - * - * Specifies whether the SCI (Secure Channel Identifier) is included - * in every packet. - * - * Since: 1.12 - **/ + * NMSettingMacsec:send-sci: + * + * Specifies whether the SCI (Secure Channel Identifier) is included + * in every packet. + * + * Since: 1.12 + **/ obj_properties[PROP_SEND_SCI] = g_param_spec_boolean(NM_SETTING_MACSEC_SEND_SCI, "", diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c index d5bfe53db4..85566c0764 100644 --- a/libnm-core/nm-setting-macvlan.c +++ b/libnm-core/nm-setting-macvlan.c @@ -129,8 +129,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } } else { /* If parent is NULL, the parent must be specified via - * NMSettingWired:mac-address. - */ + * NMSettingWired:mac-address. + */ if (connection && (!s_wired || !nm_setting_wired_get_mac_address(s_wired))) { g_set_error(error, NM_CONNECTION_ERROR, @@ -265,15 +265,15 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass) setting_class->verify = verify; /** - * NMSettingMacvlan:parent: - * - * If given, specifies the parent interface name or parent connection UUID - * from which this MAC-VLAN interface should be created. If this property is - * not specified, the connection must contain an #NMSettingWired setting - * with a #NMSettingWired:mac-address property. - * - * Since: 1.2 - **/ + * NMSettingMacvlan:parent: + * + * If given, specifies the parent interface name or parent connection UUID + * from which this MAC-VLAN interface should be created. If this property is + * not specified, the connection must contain an #NMSettingWired setting + * with a #NMSettingWired:mac-address property. + * + * Since: 1.2 + **/ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_MACVLAN_PARENT, "", @@ -282,13 +282,13 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacvlan:mode: - * - * The macvlan mode, which specifies the communication mechanism between multiple - * macvlans on the same lower device. - * - * Since: 1.2 - **/ + * NMSettingMacvlan:mode: + * + * The macvlan mode, which specifies the communication mechanism between multiple + * macvlans on the same lower device. + * + * Since: 1.2 + **/ obj_properties[PROP_MODE] = g_param_spec_uint(NM_SETTING_MACVLAN_MODE, "", @@ -299,12 +299,12 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacvlan:promiscuous: - * - * Whether the interface should be put in promiscuous mode. - * - * Since: 1.2 - **/ + * NMSettingMacvlan:promiscuous: + * + * Whether the interface should be put in promiscuous mode. + * + * Since: 1.2 + **/ obj_properties[PROP_PROMISCUOUS] = g_param_spec_boolean( NM_SETTING_MACVLAN_PROMISCUOUS, "", @@ -313,12 +313,12 @@ nm_setting_macvlan_class_init(NMSettingMacvlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMacvlan:tap: - * - * Whether the interface should be a MACVTAP. - * - * Since: 1.2 - **/ + * NMSettingMacvlan:tap: + * + * Whether the interface should be a MACVTAP. + * + * Since: 1.2 + **/ obj_properties[PROP_TAP] = g_param_spec_boolean(NM_SETTING_MACVLAN_TAP, "", "", diff --git a/libnm-core/nm-setting-match.c b/libnm-core/nm-setting-match.c index 85c816499d..d2dbbc249f 100644 --- a/libnm-core/nm-setting-match.c +++ b/libnm-core/nm-setting-match.c @@ -785,25 +785,25 @@ nm_setting_match_class_init(NMSettingMatchClass *klass) setting_class->verify = verify; /** - * NMSettingMatch:interface-name - * - * A list of interface names to match. Each element is a shell wildcard - * pattern. - * - * An element can be prefixed with a pipe symbol (|) or an ampersand (&). - * The former means that the element is optional and the latter means that - * it is mandatory. If there are any optional elements, than the match - * evaluates to true if at least one of the optional element matches - * (logical OR). If there are any mandatory elements, then they all - * must match (logical AND). By default, an element is optional. This means - * that an element "foo" behaves the same as "|foo". An element can also be inverted - * with exclamation mark (!) between the pipe symbol (or the ampersand) and before - * the pattern. Note that "!foo" is a shortcut for the mandatory match "&!foo". Finally, - * a backslash can be used at the beginning of the element (after the optional special characters) - * to escape the start of the pattern. For example, "&\\!a" is an mandatory match for literally "!a". - * - * Since: 1.14 - **/ + * NMSettingMatch:interface-name + * + * A list of interface names to match. Each element is a shell wildcard + * pattern. + * + * An element can be prefixed with a pipe symbol (|) or an ampersand (&). + * The former means that the element is optional and the latter means that + * it is mandatory. If there are any optional elements, than the match + * evaluates to true if at least one of the optional element matches + * (logical OR). If there are any mandatory elements, then they all + * must match (logical AND). By default, an element is optional. This means + * that an element "foo" behaves the same as "|foo". An element can also be inverted + * with exclamation mark (!) between the pipe symbol (or the ampersand) and before + * the pattern. Note that "!foo" is a shortcut for the mandatory match "&!foo". Finally, + * a backslash can be used at the beginning of the element (after the optional special characters) + * to escape the start of the pattern. For example, "&\\!a" is an mandatory match for literally "!a". + * + * Since: 1.14 + **/ obj_properties[PROP_INTERFACE_NAME] = g_param_spec_boxed( NM_SETTING_MATCH_INTERFACE_NAME, "", @@ -812,22 +812,22 @@ nm_setting_match_class_init(NMSettingMatchClass *klass) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMatch:kernel-command-line - * - * A list of kernel command line arguments to match. This may be used to check - * whether a specific kernel command line option is set (or if prefixed with - * the exclamation mark unset). The argument must either be a single word, or - * an assignment (i.e. two words, separated "="). In the former case the kernel - * command line is searched for the word appearing as is, or as left hand side - * of an assignment. In the latter case, the exact assignment is looked for - * with right and left hand side matching. - * - * See NMSettingMatch:interface-name for how special characters '|', '&', - * '!' and '\\' are used for optional and mandatory matches and inverting the - * pattern. - * - * Since: 1.26 - **/ + * NMSettingMatch:kernel-command-line + * + * A list of kernel command line arguments to match. This may be used to check + * whether a specific kernel command line option is set (or if prefixed with + * the exclamation mark unset). The argument must either be a single word, or + * an assignment (i.e. two words, separated "="). In the former case the kernel + * command line is searched for the word appearing as is, or as left hand side + * of an assignment. In the latter case, the exact assignment is looked for + * with right and left hand side matching. + * + * See NMSettingMatch:interface-name for how special characters '|', '&', + * '!' and '\\' are used for optional and mandatory matches and inverting the + * pattern. + * + * Since: 1.26 + **/ obj_properties[PROP_KERNEL_COMMAND_LINE] = g_param_spec_boxed( NM_SETTING_MATCH_KERNEL_COMMAND_LINE, "", @@ -836,16 +836,16 @@ nm_setting_match_class_init(NMSettingMatchClass *klass) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMatch:driver - * - * A list of driver names to match. Each element is a shell wildcard pattern. - * - * See NMSettingMatch:interface-name for how special characters '|', '&', - * '!' and '\\' are used for optional and mandatory matches and inverting the - * pattern. - * - * Since: 1.26 - **/ + * NMSettingMatch:driver + * + * A list of driver names to match. Each element is a shell wildcard pattern. + * + * See NMSettingMatch:interface-name for how special characters '|', '&', + * '!' and '\\' are used for optional and mandatory matches and inverting the + * pattern. + * + * Since: 1.26 + **/ obj_properties[PROP_DRIVER] = g_param_spec_boxed( NM_SETTING_MATCH_DRIVER, "", @@ -854,38 +854,38 @@ nm_setting_match_class_init(NMSettingMatchClass *klass) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingMatch:path - * - * A list of paths to match against the ID_PATH udev property of - * devices. ID_PATH represents the topological persistent path of a - * device. It typically contains a subsystem string (pci, usb, platform, - * etc.) and a subsystem-specific identifier. - * - * For PCI devices the path has the form - * "pci-$domain:$bus:$device.$function", where each variable is an - * hexadecimal value; for example "pci-0000:0a:00.0". - * - * The path of a device can be obtained with "udevadm info - * /sys/class/net/$dev | grep ID_PATH=" or by looking at the "path" - * property exported by NetworkManager ("nmcli -f general.path device - * show $dev"). - * - * Each element of the list is a shell wildcard pattern. - * - * See NMSettingMatch:interface-name for how special characters '|', '&', - * '!' and '\\' are used for optional and mandatory matches and inverting the - * pattern. - * - * Since: 1.26 - **/ + * NMSettingMatch:path + * + * A list of paths to match against the ID_PATH udev property of + * devices. ID_PATH represents the topological persistent path of a + * device. It typically contains a subsystem string (pci, usb, platform, + * etc.) and a subsystem-specific identifier. + * + * For PCI devices the path has the form + * "pci-$domain:$bus:$device.$function", where each variable is an + * hexadecimal value; for example "pci-0000:0a:00.0". + * + * The path of a device can be obtained with "udevadm info + * /sys/class/net/$dev | grep ID_PATH=" or by looking at the "path" + * property exported by NetworkManager ("nmcli -f general.path device + * show $dev"). + * + * Each element of the list is a shell wildcard pattern. + * + * See NMSettingMatch:interface-name for how special characters '|', '&', + * '!' and '\\' are used for optional and mandatory matches and inverting the + * pattern. + * + * Since: 1.26 + **/ /* ---ifcfg-rh--- - * property: path - * variable: MATCH_PATH - * description: space-separated list of paths to match against the udev - * property ID_PATHS of devices - * example: MATCH_PATH="pci-0000:01:00.0 pci-0000:0c:00.0" - * ---end--- - */ + * property: path + * variable: MATCH_PATH + * description: space-separated list of paths to match against the udev + * property ID_PATHS of devices + * example: MATCH_PATH="pci-0000:01:00.0 pci-0000:0c:00.0" + * ---end--- + */ obj_properties[PROP_PATH] = g_param_spec_boxed(NM_SETTING_MATCH_PATH, "", "", diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c index edaeb17e5c..101190d1a2 100644 --- a/libnm-core/nm-setting-olpc-mesh.c +++ b/libnm-core/nm-setting-olpc-mesh.c @@ -221,10 +221,10 @@ nm_setting_olpc_mesh_class_init(NMSettingOlpcMeshClass *klass) setting_class->verify = verify; /** - * NMSettingOlpcMesh:ssid: - * - * SSID of the mesh network to join. - **/ + * NMSettingOlpcMesh:ssid: + * + * SSID of the mesh network to join. + **/ obj_properties[PROP_SSID] = g_param_spec_boxed(NM_SETTING_OLPC_MESH_SSID, "", "", @@ -233,10 +233,10 @@ nm_setting_olpc_mesh_class_init(NMSettingOlpcMeshClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingOlpcMesh:channel: - * - * Channel on which the mesh network to join is located. - **/ + * NMSettingOlpcMesh:channel: + * + * Channel on which the mesh network to join is located. + **/ obj_properties[PROP_CHANNEL] = g_param_spec_uint(NM_SETTING_OLPC_MESH_CHANNEL, "", @@ -247,12 +247,12 @@ nm_setting_olpc_mesh_class_init(NMSettingOlpcMeshClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOlpcMesh:dhcp-anycast-address: - * - * Anycast DHCP MAC address used when requesting an IP address via DHCP. - * The specific anycast address used determines which DHCP server class - * answers the request. - **/ + * NMSettingOlpcMesh:dhcp-anycast-address: + * + * Anycast DHCP MAC address used when requesting an IP address via DHCP. + * The specific anycast address used determines which DHCP server class + * answers the request. + **/ obj_properties[PROP_DHCP_ANYCAST_ADDRESS] = g_param_spec_string(NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, "", diff --git a/libnm-core/nm-setting-ovs-bridge.c b/libnm-core/nm-setting-ovs-bridge.c index 5726962ebc..05f0126c31 100644 --- a/libnm-core/nm-setting-ovs-bridge.c +++ b/libnm-core/nm-setting-ovs-bridge.c @@ -299,12 +299,12 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass) setting_class->verify = verify; /** - * NMSettingOvsBridge:fail-mode: - * - * The bridge failure mode. One of "secure", "standalone" or empty. - * - * Since: 1.10 - **/ + * NMSettingOvsBridge:fail-mode: + * + * The bridge failure mode. One of "secure", "standalone" or empty. + * + * Since: 1.10 + **/ obj_properties[PROP_FAIL_MODE] = g_param_spec_string( NM_SETTING_OVS_BRIDGE_FAIL_MODE, "", @@ -313,12 +313,12 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsBridge:mcast-snooping-enable: - * - * Enable or disable multicast snooping. - * - * Since: 1.10 - **/ + * NMSettingOvsBridge:mcast-snooping-enable: + * + * Enable or disable multicast snooping. + * + * Since: 1.10 + **/ obj_properties[PROP_MCAST_SNOOPING_ENABLE] = g_param_spec_boolean(NM_SETTING_OVS_BRIDGE_MCAST_SNOOPING_ENABLE, "", @@ -327,12 +327,12 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsBridge:rstp-enable: - * - * Enable or disable RSTP. - * - * Since: 1.10 - **/ + * NMSettingOvsBridge:rstp-enable: + * + * Enable or disable RSTP. + * + * Since: 1.10 + **/ obj_properties[PROP_RSTP_ENABLE] = g_param_spec_boolean(NM_SETTING_OVS_BRIDGE_RSTP_ENABLE, "", @@ -341,12 +341,12 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsBridge:stp-enable: - * - * Enable or disable STP. - * - * Since: 1.10 - **/ + * NMSettingOvsBridge:stp-enable: + * + * Enable or disable STP. + * + * Since: 1.10 + **/ obj_properties[PROP_STP_ENABLE] = g_param_spec_boolean(NM_SETTING_OVS_BRIDGE_STP_ENABLE, "", @@ -355,12 +355,12 @@ nm_setting_ovs_bridge_class_init(NMSettingOvsBridgeClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsBridge:datapath-type: - * - * The data path type. One of "system", "netdev" or empty. - * - * Since: 1.20 - **/ + * NMSettingOvsBridge:datapath-type: + * + * The data path type. One of "system", "netdev" or empty. + * + * Since: 1.20 + **/ obj_properties[PROP_DATAPATH_TYPE] = g_param_spec_string( NM_SETTING_OVS_BRIDGE_DATAPATH_TYPE, "", diff --git a/libnm-core/nm-setting-ovs-dpdk.c b/libnm-core/nm-setting-ovs-dpdk.c index 394b52e966..1d6442331d 100644 --- a/libnm-core/nm-setting-ovs-dpdk.c +++ b/libnm-core/nm-setting-ovs-dpdk.c @@ -133,12 +133,12 @@ nm_setting_ovs_dpdk_class_init(NMSettingOvsDpdkClass *klass) object_class->finalize = finalize; /** - * NMSettingOvsDpdk:devargs: - * - * Open vSwitch DPDK device arguments. - * - * Since: 1.20 - **/ + * NMSettingOvsDpdk:devargs: + * + * Open vSwitch DPDK device arguments. + * + * Since: 1.20 + **/ obj_properties[PROP_DEVARGS] = g_param_spec_string( NM_SETTING_OVS_DPDK_DEVARGS, "", diff --git a/libnm-core/nm-setting-ovs-interface.c b/libnm-core/nm-setting-ovs-interface.c index de188c0188..941bfd71bd 100644 --- a/libnm-core/nm-setting-ovs-interface.c +++ b/libnm-core/nm-setting-ovs-interface.c @@ -107,13 +107,13 @@ _nm_setting_ovs_interface_verify_interface_type(NMSettingOvsInterface *self, connection_type = nm_connection_get_connection_type(connection); if (!connection_type) { /* if we have an ovs-interface, then the connection type must be either - * "ovs-interface" (for non "system" type) or anything else (for "system" type). - * - * The connection type usually can be normalized based on the presence of a - * base setting. However, in this case, if the connection type is missing, - * that is too complicate to guess what the user wanted. - * - * Require the use to be explicit and fail. */ + * "ovs-interface" (for non "system" type) or anything else (for "system" type). + * + * The connection type usually can be normalized based on the presence of a + * base setting. However, in this case, if the connection type is missing, + * that is too complicate to guess what the user wanted. + * + * Require the use to be explicit and fail. */ g_set_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -408,12 +408,12 @@ nm_setting_ovs_interface_class_init(NMSettingOvsInterfaceClass *klass) setting_class->verify = verify; /** - * NMSettingOvsInterface:type: - * - * The interface type. Either "internal", "system", "patch", "dpdk", or empty. - * - * Since: 1.10 - **/ + * NMSettingOvsInterface:type: + * + * The interface type. Either "internal", "system", "patch", "dpdk", or empty. + * + * Since: 1.10 + **/ obj_properties[PROP_TYPE] = g_param_spec_string(NM_SETTING_OVS_INTERFACE_TYPE, "", "", diff --git a/libnm-core/nm-setting-ovs-patch.c b/libnm-core/nm-setting-ovs-patch.c index 3a2236228f..7ef019e318 100644 --- a/libnm-core/nm-setting-ovs-patch.c +++ b/libnm-core/nm-setting-ovs-patch.c @@ -168,13 +168,13 @@ nm_setting_ovs_patch_class_init(NMSettingOvsPatchClass *klass) setting_class->verify = verify; /** - * NMSettingOvsPatch:peer: - * - * Specifies the name of the interface for the other side of the patch. - * The patch on the other side must also set this interface as peer. - * - * Since: 1.10 - **/ + * NMSettingOvsPatch:peer: + * + * Specifies the name of the interface for the other side of the patch. + * The patch on the other side must also set this interface as peer. + * + * Since: 1.10 + **/ obj_properties[PROP_PEER] = g_param_spec_string(NM_SETTING_OVS_PATCH_PEER, "", "", diff --git a/libnm-core/nm-setting-ovs-port.c b/libnm-core/nm-setting-ovs-port.c index b68fd32797..07735aec8b 100644 --- a/libnm-core/nm-setting-ovs-port.c +++ b/libnm-core/nm-setting-ovs-port.c @@ -371,13 +371,13 @@ nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) setting_class->verify = verify; /** - * NMSettingOvsPort:vlan-mode: - * - * The VLAN mode. One of "access", "native-tagged", "native-untagged", - * "trunk" or unset. - * - * Since: 1.10 - **/ + * NMSettingOvsPort:vlan-mode: + * + * The VLAN mode. One of "access", "native-tagged", "native-untagged", + * "trunk" or unset. + * + * Since: 1.10 + **/ obj_properties[PROP_VLAN_MODE] = g_param_spec_string( NM_SETTING_OVS_PORT_VLAN_MODE, "", @@ -386,12 +386,12 @@ nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsPort:tag: - * - * The VLAN tag in the range 0-4095. - * - * Since: 1.10 - **/ + * 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, "", @@ -402,12 +402,12 @@ nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsPort:lacp: - * - * LACP mode. One of "active", "off", or "passive". - * - * Since: 1.10 - **/ + * 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, "", "", @@ -416,12 +416,12 @@ nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingOvsPort:bond-mode: - * - * Bonding mode. One of "active-backup", "balance-slb", or "balance-tcp". - * - * Since: 1.10 - **/ + * 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, "", @@ -430,12 +430,12 @@ nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) 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 - **/ + * 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, "", @@ -446,12 +446,12 @@ nm_setting_ovs_port_class_init(NMSettingOvsPortClass *klass) 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 - **/ + * 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, "", diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c index 9504d94e1c..2aad6d0ed2 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/libnm-core/nm-setting-ppp.c @@ -529,12 +529,12 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) setting_class->verify = verify; /** - * NMSettingPpp:noauth: - * - * If %TRUE, do not require the other side (usually the PPP server) to - * authenticate itself to the client. If %FALSE, require authentication - * from the remote side. In almost all cases, this should be %TRUE. - **/ + * NMSettingPpp:noauth: + * + * If %TRUE, do not require the other side (usually the PPP server) to + * authenticate itself to the client. If %FALSE, require authentication + * from the remote side. In almost all cases, this should be %TRUE. + **/ obj_properties[PROP_NOAUTH] = g_param_spec_boolean(NM_SETTING_PPP_NOAUTH, "", "", @@ -542,10 +542,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:refuse-eap: - * - * If %TRUE, the EAP authentication method will not be used. - **/ + * NMSettingPpp:refuse-eap: + * + * If %TRUE, the EAP authentication method will not be used. + **/ obj_properties[PROP_REFUSE_EAP] = g_param_spec_boolean(NM_SETTING_PPP_REFUSE_EAP, "", @@ -554,10 +554,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:refuse-pap: - * - * If %TRUE, the PAP authentication method will not be used. - **/ + * NMSettingPpp:refuse-pap: + * + * If %TRUE, the PAP authentication method will not be used. + **/ obj_properties[PROP_REFUSE_PAP] = g_param_spec_boolean(NM_SETTING_PPP_REFUSE_PAP, "", @@ -566,10 +566,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:refuse-chap: - * - * If %TRUE, the CHAP authentication method will not be used. - **/ + * NMSettingPpp:refuse-chap: + * + * If %TRUE, the CHAP authentication method will not be used. + **/ obj_properties[PROP_REFUSE_CHAP] = g_param_spec_boolean(NM_SETTING_PPP_REFUSE_CHAP, "", @@ -578,10 +578,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:refuse-mschap: - * - * If %TRUE, the MSCHAP authentication method will not be used. - **/ + * NMSettingPpp:refuse-mschap: + * + * If %TRUE, the MSCHAP authentication method will not be used. + **/ obj_properties[PROP_REFUSE_MSCHAP] = g_param_spec_boolean(NM_SETTING_PPP_REFUSE_MSCHAP, "", @@ -590,10 +590,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:refuse-mschapv2: - * - * If %TRUE, the MSCHAPv2 authentication method will not be used. - **/ + * NMSettingPpp:refuse-mschapv2: + * + * If %TRUE, the MSCHAPv2 authentication method will not be used. + **/ obj_properties[PROP_REFUSE_MSCHAPV2] = g_param_spec_boolean(NM_SETTING_PPP_REFUSE_MSCHAPV2, "", @@ -602,10 +602,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:nobsdcomp: - * - * If %TRUE, BSD compression will not be requested. - **/ + * NMSettingPpp:nobsdcomp: + * + * If %TRUE, BSD compression will not be requested. + **/ obj_properties[PROP_NOBSDCOMP] = g_param_spec_boolean( NM_SETTING_PPP_NOBSDCOMP, "", @@ -614,10 +614,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:nodeflate: - * - * If %TRUE, "deflate" compression will not be requested. - **/ + * NMSettingPpp:nodeflate: + * + * If %TRUE, "deflate" compression will not be requested. + **/ obj_properties[PROP_NODEFLATE] = g_param_spec_boolean( NM_SETTING_PPP_NODEFLATE, "", @@ -626,10 +626,10 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:no-vj-comp: - * - * If %TRUE, Van Jacobsen TCP header compression will not be requested. - **/ + * NMSettingPpp:no-vj-comp: + * + * If %TRUE, Van Jacobsen TCP header compression will not be requested. + **/ obj_properties[PROP_NO_VJ_COMP] = g_param_spec_boolean( NM_SETTING_PPP_NO_VJ_COMP, "", @@ -638,13 +638,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:require-mppe: - * - * If %TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for - * the PPP session. If either 64-bit or 128-bit MPPE is not available the - * session will fail. Note that MPPE is not used on mobile broadband - * connections. - **/ + * NMSettingPpp:require-mppe: + * + * If %TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for + * the PPP session. If either 64-bit or 128-bit MPPE is not available the + * session will fail. Note that MPPE is not used on mobile broadband + * connections. + **/ obj_properties[PROP_REQUIRE_MPPE] = g_param_spec_boolean(NM_SETTING_PPP_REQUIRE_MPPE, "", @@ -653,12 +653,12 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:require-mppe-128: - * - * If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be - * required for the PPP session, and the "require-mppe" property must also - * be set to %TRUE. If 128-bit MPPE is not available the session will fail. - **/ + * NMSettingPpp:require-mppe-128: + * + * If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be + * required for the PPP session, and the "require-mppe" property must also + * be set to %TRUE. If 128-bit MPPE is not available the session will fail. + **/ obj_properties[PROP_REQUIRE_MPPE_128] = g_param_spec_boolean(NM_SETTING_PPP_REQUIRE_MPPE_128, "", @@ -667,11 +667,11 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:mppe-stateful: - * - * If %TRUE, stateful MPPE is used. See pppd documentation for more - * information on stateful MPPE. - **/ + * NMSettingPpp:mppe-stateful: + * + * If %TRUE, stateful MPPE is used. See pppd documentation for more + * information on stateful MPPE. + **/ obj_properties[PROP_MPPE_STATEFUL] = g_param_spec_boolean(NM_SETTING_PPP_MPPE_STATEFUL, "", @@ -680,12 +680,12 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:crtscts: - * - * If %TRUE, specify that pppd should set the serial port to use hardware - * flow control with RTS and CTS signals. This value should normally be set - * to %FALSE. - **/ + * NMSettingPpp:crtscts: + * + * If %TRUE, specify that pppd should set the serial port to use hardware + * flow control with RTS and CTS signals. This value should normally be set + * to %FALSE. + **/ obj_properties[PROP_CRTSCTS] = g_param_spec_boolean(NM_SETTING_PPP_CRTSCTS, "", "", @@ -693,12 +693,12 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:baud: - * - * If non-zero, instruct pppd to set the serial port to the specified - * baudrate. This value should normally be left as 0 to automatically - * choose the speed. - **/ + * NMSettingPpp:baud: + * + * If non-zero, instruct pppd to set the serial port to the specified + * baudrate. This value should normally be left as 0 to automatically + * choose the speed. + **/ obj_properties[PROP_BAUD] = g_param_spec_uint(NM_SETTING_PPP_BAUD, "", "", @@ -709,12 +709,12 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:mru: - * - * If non-zero, instruct pppd to request that the peer send packets no - * larger than the specified size. If non-zero, the MRU should be between - * 128 and 16384. - */ + * NMSettingPpp:mru: + * + * If non-zero, instruct pppd to request that the peer send packets no + * larger than the specified size. If non-zero, the MRU should be between + * 128 and 16384. + */ obj_properties[PROP_MRU] = g_param_spec_uint(NM_SETTING_PPP_MRU, "", "", @@ -724,11 +724,11 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:mtu: - * - * If non-zero, instruct pppd to send packets no larger than the specified - * size. - **/ + * NMSettingPpp:mtu: + * + * If non-zero, instruct pppd to send packets no larger than the specified + * size. + **/ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_PPP_MTU, "", "", @@ -739,13 +739,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:lcp-echo-failure: - * - * If non-zero, instruct pppd to presume the connection to the peer has - * failed if the specified number of LCP echo-requests go unanswered by the - * peer. The "lcp-echo-interval" property must also be set to a non-zero - * value if this property is used. - **/ + * NMSettingPpp:lcp-echo-failure: + * + * If non-zero, instruct pppd to presume the connection to the peer has + * failed if the specified number of LCP echo-requests go unanswered by the + * peer. The "lcp-echo-interval" property must also be set to a non-zero + * value if this property is used. + **/ obj_properties[PROP_LCP_ECHO_FAILURE] = g_param_spec_uint( NM_SETTING_PPP_LCP_ECHO_FAILURE, "", @@ -756,13 +756,13 @@ nm_setting_ppp_class_init(NMSettingPppClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPpp:lcp-echo-interval: - * - * If non-zero, instruct pppd to send an LCP echo-request frame to the peer - * every n seconds (where n is the specified value). Note that some PPP - * peers will respond to echo requests and some will not, and it is not - * possible to autodetect this. - **/ + * NMSettingPpp:lcp-echo-interval: + * + * If non-zero, instruct pppd to send an LCP echo-request frame to the peer + * every n seconds (where n is the specified value). Note that some PPP + * peers will respond to echo requests and some will not, and it is not + * possible to autodetect this. + **/ obj_properties[PROP_LCP_ECHO_INTERVAL] = g_param_spec_uint( NM_SETTING_PPP_LCP_ECHO_INTERVAL, "", diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c index dbdec20b8c..1d89409748 100644 --- a/libnm-core/nm-setting-pppoe.c +++ b/libnm-core/nm-setting-pppoe.c @@ -286,15 +286,15 @@ nm_setting_pppoe_class_init(NMSettingPppoeClass *klass) setting_class->need_secrets = need_secrets; /** - * NMSettingPppoe:parent: - * - * If given, specifies the parent interface name on which this PPPoE - * connection should be created. If this property is not specified, - * the connection is activated on the interface specified in - * #NMSettingConnection:interface-name of #NMSettingConnection. - * - * Since: 1.10 - **/ + * NMSettingPppoe:parent: + * + * If given, specifies the parent interface name on which this PPPoE + * connection should be created. If this property is not specified, + * the connection is activated on the interface specified in + * #NMSettingConnection:interface-name of #NMSettingConnection. + * + * Since: 1.10 + **/ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_PPPOE_PARENT, "", @@ -303,13 +303,13 @@ nm_setting_pppoe_class_init(NMSettingPppoeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPppoe:service: - * - * If specified, instruct PPPoE to only initiate sessions with access - * concentrators that provide the specified service. For most providers, - * this should be left blank. It is only required if there are multiple - * access concentrators or a specific service is known to be required. - **/ + * NMSettingPppoe:service: + * + * If specified, instruct PPPoE to only initiate sessions with access + * concentrators that provide the specified service. For most providers, + * this should be left blank. It is only required if there are multiple + * access concentrators or a specific service is known to be required. + **/ obj_properties[PROP_SERVICE] = g_param_spec_string(NM_SETTING_PPPOE_SERVICE, "", "", @@ -317,10 +317,10 @@ nm_setting_pppoe_class_init(NMSettingPppoeClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPppoe:username: - * - * Username used to authenticate with the PPPoE service. - **/ + * NMSettingPppoe:username: + * + * Username used to authenticate with the PPPoE service. + **/ obj_properties[PROP_USERNAME] = g_param_spec_string(NM_SETTING_PPPOE_USERNAME, "", "", @@ -328,10 +328,10 @@ nm_setting_pppoe_class_init(NMSettingPppoeClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingPppoe:password: - * - * Password used to authenticate with the PPPoE service. - **/ + * NMSettingPppoe:password: + * + * Password used to authenticate with the PPPoE service. + **/ obj_properties[PROP_PASSWORD] = g_param_spec_string(NM_SETTING_PPPOE_PASSWORD, "", @@ -340,10 +340,10 @@ nm_setting_pppoe_class_init(NMSettingPppoeClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingPppoe:password-flags: - * - * Flags indicating how to handle the #NMSettingPppoe:password property. - **/ + * NMSettingPppoe:password-flags: + * + * Flags indicating how to handle the #NMSettingPppoe:password property. + **/ obj_properties[PROP_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_PPPOE_PASSWORD_FLAGS, "", diff --git a/libnm-core/nm-setting-proxy.c b/libnm-core/nm-setting-proxy.c index ae13bbe367..eceb48e8e9 100644 --- a/libnm-core/nm-setting-proxy.c +++ b/libnm-core/nm-setting-proxy.c @@ -292,21 +292,21 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass) setting_class->verify = verify; /** - * NMSettingProxy:method: - * - * Method for proxy configuration, Default is %NM_SETTING_PROXY_METHOD_NONE - * - * Since: 1.6 - **/ + * NMSettingProxy:method: + * + * Method for proxy configuration, Default is %NM_SETTING_PROXY_METHOD_NONE + * + * Since: 1.6 + **/ /* ---ifcfg-rh--- - * property: method - * variable: PROXY_METHOD(+) - * default: none - * description: Method for proxy configuration. For "auto", WPAD is used for - * proxy configuration, or set the PAC file via PAC_URL or PAC_SCRIPT. - * values: none, auto - * ---end--- - */ + * property: method + * variable: PROXY_METHOD(+) + * default: none + * description: Method for proxy configuration. For "auto", WPAD is used for + * proxy configuration, or set the PAC file via PAC_URL or PAC_SCRIPT. + * values: none, auto + * ---end--- + */ obj_properties[PROP_METHOD] = g_param_spec_int(NM_SETTING_PROXY_METHOD, "", "", @@ -316,19 +316,19 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingProxy:browser-only: - * - * Whether the proxy configuration is for browser only. - * - * Since: 1.6 - **/ + * NMSettingProxy:browser-only: + * + * Whether the proxy configuration is for browser only. + * + * Since: 1.6 + **/ /* ---ifcfg-rh--- - * property: browser-only - * variable: BROWSER_ONLY(+) - * default: no - * description: Whether the proxy configuration is for browser only. - * ---end--- - */ + * property: browser-only + * variable: BROWSER_ONLY(+) + * default: no + * description: Whether the proxy configuration is for browser only. + * ---end--- + */ obj_properties[PROP_BROWSER_ONLY] = g_param_spec_boolean(NM_SETTING_PROXY_BROWSER_ONLY, "", @@ -337,19 +337,19 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingProxy:pac-url: - * - * PAC URL for obtaining PAC file. - * - * Since: 1.6 - **/ + * NMSettingProxy:pac-url: + * + * PAC URL for obtaining PAC file. + * + * Since: 1.6 + **/ /* ---ifcfg-rh--- - * property: pac-url - * variable: PAC_URL(+) - * description: URL for PAC file. - * example: PAC_URL=http://wpad.mycompany.com/wpad.dat - * ---end--- - */ + * property: pac-url + * variable: PAC_URL(+) + * description: URL for PAC file. + * example: PAC_URL=http://wpad.mycompany.com/wpad.dat + * ---end--- + */ obj_properties[PROP_PAC_URL] = g_param_spec_string(NM_SETTING_PROXY_PAC_URL, "", "", @@ -357,19 +357,19 @@ nm_setting_proxy_class_init(NMSettingProxyClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingProxy:pac-script: - * - * PAC script for the connection. - * - * Since: 1.6 - **/ + * NMSettingProxy:pac-script: + * + * PAC script for the connection. + * + * Since: 1.6 + **/ /* ---ifcfg-rh--- - * property: pac-script - * variable: PAC_SCRIPT(+) - * description: Path of the PAC script. - * example: PAC_SCRIPT=/home/joe/proxy.pac - * ---end--- - */ + * property: pac-script + * variable: PAC_SCRIPT(+) + * description: Path of the PAC script. + * example: PAC_SCRIPT=/home/joe/proxy.pac + * ---end--- + */ obj_properties[PROP_PAC_SCRIPT] = g_param_spec_string(NM_SETTING_PROXY_PAC_SCRIPT, "", diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c index 65eb52630d..ed20a20106 100644 --- a/libnm-core/nm-setting-serial.c +++ b/libnm-core/nm-setting-serial.c @@ -239,12 +239,12 @@ nm_setting_serial_class_init(NMSettingSerialClass *klass) object_class->set_property = set_property; /** - * NMSettingSerial:baud: - * - * Speed to use for communication over the serial port. Note that this - * value usually has no effect for mobile broadband modems as they generally - * ignore speed settings and use the highest available speed. - **/ + * NMSettingSerial:baud: + * + * Speed to use for communication over the serial port. Note that this + * value usually has no effect for mobile broadband modems as they generally + * ignore speed settings and use the highest available speed. + **/ obj_properties[PROP_BAUD] = g_param_spec_uint(NM_SETTING_SERIAL_BAUD, "", "", @@ -254,10 +254,10 @@ nm_setting_serial_class_init(NMSettingSerialClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingSerial:bits: - * - * Byte-width of the serial communication. The 8 in "8n1" for example. - **/ + * NMSettingSerial:bits: + * + * Byte-width of the serial communication. The 8 in "8n1" for example. + **/ obj_properties[PROP_BITS] = g_param_spec_uint(NM_SETTING_SERIAL_BITS, "", "", @@ -267,25 +267,25 @@ nm_setting_serial_class_init(NMSettingSerialClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingSerial:parity: - * - * Parity setting of the serial port. - **/ + * NMSettingSerial:parity: + * + * Parity setting of the serial port. + **/ /* ---keyfile--- - * property: parity - * format: 'e', 'o', or 'n' - * description: The connection parity; even, odd, or none. Note that older - * versions of NetworkManager stored this as an integer: 69 ('E') for even, - * 111 ('o') for odd, or 110 ('n') for none. - * example: parity=n - * ---end--- - * ---dbus--- - * property: parity - * format: byte - * description: The connection parity: 69 (ASCII 'E') for even parity, - * 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none. - * ---end--- - */ + * property: parity + * format: 'e', 'o', or 'n' + * description: The connection parity; even, odd, or none. Note that older + * versions of NetworkManager stored this as an integer: 69 ('E') for even, + * 111 ('o') for odd, or 110 ('n') for none. + * example: parity=n + * ---end--- + * ---dbus--- + * property: parity + * format: byte + * description: The connection parity: 69 (ASCII 'E') for even parity, + * 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none. + * ---end--- + */ obj_properties[PROP_PARITY] = g_param_spec_enum(NM_SETTING_SERIAL_PARITY, "", "", @@ -300,11 +300,11 @@ nm_setting_serial_class_init(NMSettingSerialClass *klass) .gprop_from_dbus_fcn = parity_from_dbus, )); /** - * NMSettingSerial:stopbits: - * - * Number of stop bits for communication on the serial port. Either 1 or 2. - * The 1 in "8n1" for example. - **/ + * NMSettingSerial:stopbits: + * + * Number of stop bits for communication on the serial port. Either 1 or 2. + * The 1 in "8n1" for example. + **/ obj_properties[PROP_STOPBITS] = g_param_spec_uint(NM_SETTING_SERIAL_STOPBITS, "", "", @@ -314,10 +314,10 @@ nm_setting_serial_class_init(NMSettingSerialClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingSerial:send-delay: - * - * Time to delay between each byte sent to the modem, in microseconds. - **/ + * NMSettingSerial:send-delay: + * + * Time to delay between each byte sent to the modem, in microseconds. + **/ obj_properties[PROP_SEND_DELAY] = g_param_spec_uint64(NM_SETTING_SERIAL_SEND_DELAY, "", diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c index a4af95cf8d..cf10104c8a 100644 --- a/libnm-core/nm-setting-sriov.c +++ b/libnm-core/nm-setting-sriov.c @@ -560,7 +560,7 @@ nm_sriov_vf_get_vlan_ids(const NMSriovVF *vf, guint *length) return NULL; /* vf is const, however, vlan_ids is a mutable field caching the - * result ("mutable" in C++ terminology) */ + * result ("mutable" in C++ terminology) */ ((NMSriovVF *) vf)->vlan_ids = g_new0(guint, num); i = 0; @@ -915,8 +915,8 @@ vfs_to_dbus(const NMSettInfoSetting * sett_info, } /* VLANs are translated into an array of maps, where each map has - * keys 'id', 'qos' and 'proto'. This guarantees enough flexibility - * to accommodate any future new option. */ + * keys 'id', 'qos' and 'proto'. This guarantees enough flexibility + * to accommodate any future new option. */ vlan_ids = nm_sriov_vf_get_vlan_ids(vf, &num_vlans); if (num_vlans) { GVariantBuilder vlans_builder; @@ -1250,25 +1250,25 @@ nm_setting_sriov_class_init(NMSettingSriovClass *klass) setting_class->verify = verify; /** - * NMSettingSriov:total-vfs - * - * The total number of virtual functions to create. - * - * Note that when the sriov setting is present NetworkManager - * enforces the number of virtual functions on the interface - * (also when it is zero) during activation and resets it - * upon deactivation. To prevent any changes to SR-IOV - * parameters don't add a sriov setting to the connection. - * - * Since: 1.14 - **/ + * NMSettingSriov:total-vfs + * + * The total number of virtual functions to create. + * + * Note that when the sriov setting is present NetworkManager + * enforces the number of virtual functions on the interface + * (also when it is zero) during activation and resets it + * upon deactivation. To prevent any changes to SR-IOV + * parameters don't add a sriov setting to the connection. + * + * Since: 1.14 + **/ /* ---ifcfg-rh--- - * property: total-vfs - * variable: SRIOV_TOTAL_VFS(+) - * description: The total number of virtual functions to create - * example: SRIOV_TOTAL_VFS=16 - * ---end--- - */ + * property: total-vfs + * variable: SRIOV_TOTAL_VFS(+) + * description: The total number of virtual functions to create + * example: SRIOV_TOTAL_VFS=16 + * ---end--- + */ obj_properties[PROP_TOTAL_VFS] = g_param_spec_uint( NM_SETTING_SRIOV_TOTAL_VFS, "", @@ -1279,44 +1279,44 @@ nm_setting_sriov_class_init(NMSettingSriovClass *klass) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingSriov:vfs: (type GPtrArray(NMSriovVF)) - * - * Array of virtual function descriptors. - * - * Each VF descriptor is a dictionary mapping attribute names - * to GVariant values. The 'index' entry is mandatory for - * each VF. - * - * When represented as string a VF is in the form: - * - * "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". - * - * for example: - * - * "2 mac=00:11:22:33:44:55 spoof-check=true". - * - * Multiple VFs can be specified using a comma as separator. - * Currently, the following attributes are supported: mac, - * spoof-check, trust, min-tx-rate, max-tx-rate, vlans. - * - * The "vlans" attribute is represented as a semicolon-separated - * list of VLAN descriptors, where each descriptor has the form - * - * "ID[.PRIORITY[.PROTO]]". - * - * PROTO can be either 'q' for 802.1Q (the default) or 'ad' for - * 802.1ad. - * - - * Since: 1.14 - **/ + * NMSettingSriov:vfs: (type GPtrArray(NMSriovVF)) + * + * Array of virtual function descriptors. + * + * Each VF descriptor is a dictionary mapping attribute names + * to GVariant values. The 'index' entry is mandatory for + * each VF. + * + * When represented as string a VF is in the form: + * + * "INDEX [ATTR=VALUE[ ATTR=VALUE]...]". + * + * for example: + * + * "2 mac=00:11:22:33:44:55 spoof-check=true". + * + * Multiple VFs can be specified using a comma as separator. + * Currently, the following attributes are supported: mac, + * spoof-check, trust, min-tx-rate, max-tx-rate, vlans. + * + * The "vlans" attribute is represented as a semicolon-separated + * list of VLAN descriptors, where each descriptor has the form + * + * "ID[.PRIORITY[.PROTO]]". + * + * PROTO can be either 'q' for 802.1Q (the default) or 'ad' for + * 802.1ad. + * + + * Since: 1.14 + **/ /* ---ifcfg-rh--- - * property: vfs - * variable: SRIOV_VF1(+), SRIOV_VF2(+), ... - * description: SR-IOV virtual function descriptors - * example: SRIOV_VF10="mac=00:11:22:33:44:55", ... - * ---end--- - */ + * property: vfs + * variable: SRIOV_VF1(+), SRIOV_VF2(+), ... + * description: SR-IOV virtual function descriptors + * example: SRIOV_VF10="mac=00:11:22:33:44:55", ... + * ---end--- + */ obj_properties[PROP_VFS] = g_param_spec_boxed(NM_SETTING_SRIOV_VFS, "", "", @@ -1330,31 +1330,31 @@ nm_setting_sriov_class_init(NMSettingSriovClass *klass) .from_dbus_fcn = vfs_from_dbus, )); /** - * NMSettingSriov:autoprobe-drivers - * - * Whether to autoprobe virtual functions by a compatible driver. - * - * If set to %NM_TERNARY_TRUE, the kernel will try to bind VFs to - * a compatible driver and if this succeeds a new network - * interface will be instantiated for each VF. - * - * If set to %NM_TERNARY_FALSE, VFs will not be claimed and no - * network interfaces will be created for them. - * - * When set to %NM_TERNARY_DEFAULT, the global default is used; in - * case the global default is unspecified it is assumed to be - * %NM_TERNARY_TRUE. - * - * Since: 1.14 - **/ + * NMSettingSriov:autoprobe-drivers + * + * Whether to autoprobe virtual functions by a compatible driver. + * + * If set to %NM_TERNARY_TRUE, the kernel will try to bind VFs to + * a compatible driver and if this succeeds a new network + * interface will be instantiated for each VF. + * + * If set to %NM_TERNARY_FALSE, VFs will not be claimed and no + * network interfaces will be created for them. + * + * When set to %NM_TERNARY_DEFAULT, the global default is used; in + * case the global default is unspecified it is assumed to be + * %NM_TERNARY_TRUE. + * + * Since: 1.14 + **/ /* ---ifcfg-rh--- - * property: autoprobe-drivers - * variable: SRIOV_AUTOPROBE_DRIVERS(+) - * default: missing variable means global default - * description: Whether to autoprobe virtual functions by a compatible driver - * example: SRIOV_AUTOPROBE_DRIVERS=0,1 - * ---end--- - */ + * property: autoprobe-drivers + * variable: SRIOV_AUTOPROBE_DRIVERS(+) + * default: missing variable means global default + * description: Whether to autoprobe virtual functions by a compatible driver + * example: SRIOV_AUTOPROBE_DRIVERS=0,1 + * ---end--- + */ obj_properties[PROP_AUTOPROBE_DRIVERS] = g_param_spec_enum( NM_SETTING_SRIOV_AUTOPROBE_DRIVERS, "", diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c index c15febdce6..c33d3622f4 100644 --- a/libnm-core/nm-setting-tc-config.c +++ b/libnm-core/nm-setting-tc-config.c @@ -824,8 +824,8 @@ _nm_tc_tfilter_hash(NMTCTfilter *tfilter) guint attr_hash; /* g_variant_hash() works only for basic types, thus - * we ignore any non-basic attribute. Actions differing - * only for non-basic attributes will collide. */ + * we ignore any non-basic attribute. Actions differing + * only for non-basic attributes will collide. */ attr_hash = g_variant_hash(variant); nm_hash_update_val(&h, attr_hash); } @@ -1807,17 +1807,17 @@ nm_setting_tc_config_class_init(NMSettingTCConfigClass *klass) setting_class->verify = verify; /** - * NMSettingTCConfig:qdiscs: (type GPtrArray(NMTCQdisc)) - * - * Array of TC queueing disciplines. - **/ + * NMSettingTCConfig:qdiscs: (type GPtrArray(NMTCQdisc)) + * + * Array of TC queueing disciplines. + **/ /* ---ifcfg-rh--- - * property: qdiscs - * variable: QDISC1(+), QDISC2(+), ... - * description: Queueing disciplines - * example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel" - * ---end--- - */ + * property: qdiscs + * variable: QDISC1(+), QDISC2(+), ... + * description: Queueing disciplines + * example: QDISC1=ingress, QDISC2="root handle 1234: fq_codel" + * ---end--- + */ obj_properties[PROP_QDISCS] = g_param_spec_boxed(NM_SETTING_TC_CONFIG_QDISCS, "", "", @@ -1831,17 +1831,17 @@ nm_setting_tc_config_class_init(NMSettingTCConfigClass *klass) .from_dbus_fcn = tc_qdiscs_set, )); /** - * NMSettingTCConfig:tfilters: (type GPtrArray(NMTCTfilter)) - * - * Array of TC traffic filters. - **/ + * NMSettingTCConfig:tfilters: (type GPtrArray(NMTCTfilter)) + * + * Array of TC traffic filters. + **/ /* ---ifcfg-rh--- - * property: qdiscs - * variable: FILTER1(+), FILTER2(+), ... - * description: Traffic filters - * example: FILTER1="parent ffff: matchall action simple sdata Input", ... - * ---end--- - */ + * property: qdiscs + * variable: FILTER1(+), FILTER2(+), ... + * description: Traffic filters + * example: FILTER1="parent ffff: matchall action simple sdata Input", ... + * ---end--- + */ obj_properties[PROP_TFILTERS] = g_param_spec_boxed( NM_SETTING_TC_CONFIG_TFILTERS, "", diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index 05d49d59f4..e56d7ad7a1 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -362,9 +362,9 @@ compare_property(const NMSettInfoSetting *sett_info, if (set_b) { if (NM_FLAGS_HAS(flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) { /* If we are trying to match a connection in order to assume it (and thus - * @flags contains INFERRABLE), use the "relaxed" matching for team - * configuration. Otherwise, for all other purposes (including connection - * comparison before an update), resort to the default string comparison. */ + * @flags contains INFERRABLE), use the "relaxed" matching for team + * configuration. Otherwise, for all other purposes (including connection + * comparison before an update), resort to the default string comparison. */ return TRUE; } @@ -535,19 +535,19 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) setting_class->init_from_dbus = init_from_dbus; /** - * NMSettingTeamPort:config: - * - * The JSON configuration for the team port. The property should contain raw - * JSON configuration data suitable for teamd, because the value is passed - * directly to teamd. If not specified, the default configuration is - * used. See man teamd.conf for the format details. - **/ + * NMSettingTeamPort:config: + * + * The JSON configuration for the team port. The property should contain raw + * JSON configuration data suitable for teamd, because the value is passed + * directly to teamd. If not specified, the default configuration is + * used. See man teamd.conf for the format details. + **/ /* ---ifcfg-rh--- - * property: config - * variable: TEAM_PORT_CONFIG - * description: Team port configuration in JSON. See man teamd.conf for details. - * ---end--- - */ + * property: config + * variable: TEAM_PORT_CONFIG + * description: Team port configuration in JSON. See man teamd.conf for details. + * ---end--- + */ obj_properties[NM_TEAM_ATTRIBUTE_CONFIG] = g_param_spec_string( NM_SETTING_TEAM_PORT_CONFIG, "", @@ -559,13 +559,13 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) &nm_sett_info_propert_type_team_s); /** - * NMSettingTeamPort:queue-id: - * - * Corresponds to the teamd ports.PORTIFNAME.queue_id. - * When set to -1 means the parameter is skipped from the json config. - * - * Since: 1.12 - **/ + * NMSettingTeamPort:queue-id: + * + * Corresponds to the teamd ports.PORTIFNAME.queue_id. + * When set to -1 means the parameter is skipped from the json config. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_PORT_QUEUE_ID] = g_param_spec_int(NM_SETTING_TEAM_PORT_QUEUE_ID, "", @@ -579,12 +579,12 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeamPort:prio: - * - * Corresponds to the teamd ports.PORTIFNAME.prio. - * - * Since: 1.12 - **/ + * NMSettingTeamPort:prio: + * + * Corresponds to the teamd ports.PORTIFNAME.prio. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_PORT_PRIO] = g_param_spec_int(NM_SETTING_TEAM_PORT_PRIO, "", @@ -598,12 +598,12 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeamPort:sticky: - * - * Corresponds to the teamd ports.PORTIFNAME.sticky. - * - * Since: 1.12 - **/ + * NMSettingTeamPort:sticky: + * + * Corresponds to the teamd ports.PORTIFNAME.sticky. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_PORT_STICKY] = g_param_spec_boolean(NM_SETTING_TEAM_PORT_STICKY, "", @@ -615,12 +615,12 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) &nm_sett_info_propert_type_team_b); /** - * NMSettingTeamPort:lacp-prio: - * - * Corresponds to the teamd ports.PORTIFNAME.lacp_prio. - * - * Since: 1.12 - **/ + * NMSettingTeamPort:lacp-prio: + * + * Corresponds to the teamd ports.PORTIFNAME.lacp_prio. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_PORT_LACP_PRIO] = g_param_spec_int(NM_SETTING_TEAM_PORT_LACP_PRIO, "", @@ -634,12 +634,12 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeamPort:lacp-key: - * - * Corresponds to the teamd ports.PORTIFNAME.lacp_key. - * - * Since: 1.12 - **/ + * NMSettingTeamPort:lacp-key: + * + * Corresponds to the teamd ports.PORTIFNAME.lacp_key. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_PORT_LACP_KEY] = g_param_spec_int(NM_SETTING_TEAM_PORT_LACP_KEY, "", @@ -653,19 +653,19 @@ nm_setting_team_port_class_init(NMSettingTeamPortClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) - * - * Link watchers configuration for the connection: each link watcher is - * defined by a dictionary, whose keys depend upon the selected link - * watcher. Available link watchers are 'ethtool', 'nsna_ping' and - * 'arp_ping' and it is specified in the dictionary with the key 'name'. - * Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; - * nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; - * arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', - * 'validate-inactive', 'send-always'. See teamd.conf man for more details. - * - * Since: 1.12 - **/ + * NMSettingTeamPort:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) + * + * Link watchers configuration for the connection: each link watcher is + * defined by a dictionary, whose keys depend upon the selected link + * watcher. Available link watchers are 'ethtool', 'nsna_ping' and + * 'arp_ping' and it is specified in the dictionary with the key 'name'. + * Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; + * nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; + * arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', + * 'validate-inactive', 'send-always'. See teamd.conf man for more details. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_LINK_WATCHERS] = g_param_spec_boxed(NM_SETTING_TEAM_PORT_LINK_WATCHERS, "", diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index c785c87836..e061175a68 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -1281,9 +1281,9 @@ compare_property(const NMSettInfoSetting *sett_info, if (set_b) { if (NM_FLAGS_HAS(flags, NM_SETTING_COMPARE_FLAG_INFERRABLE)) { /* If we are trying to match a connection in order to assume it (and thus - * @flags contains INFERRABLE), use the "relaxed" matching for team - * configuration. Otherwise, for all other purposes (including connection - * comparison before an update), resort to the default string comparison. */ + * @flags contains INFERRABLE), use the "relaxed" matching for team + * configuration. Otherwise, for all other purposes (including connection + * comparison before an update), resort to the default string comparison. */ return TRUE; } @@ -1491,19 +1491,19 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) setting_class->init_from_dbus = init_from_dbus; /** - * NMSettingTeam:config: - * - * The JSON configuration for the team network interface. The property - * should contain raw JSON configuration data suitable for teamd, because - * the value is passed directly to teamd. If not specified, the default - * configuration is used. See man teamd.conf for the format details. - **/ + * NMSettingTeam:config: + * + * The JSON configuration for the team network interface. The property + * should contain raw JSON configuration data suitable for teamd, because + * the value is passed directly to teamd. If not specified, the default + * configuration is used. See man teamd.conf for the format details. + **/ /* ---ifcfg-rh--- - * property: config - * variable: TEAM_CONFIG - * description: Team configuration in JSON. See man teamd.conf for details. - * ---end--- - */ + * property: config + * variable: TEAM_CONFIG + * description: Team configuration in JSON. See man teamd.conf for details. + * ---end--- + */ obj_properties[NM_TEAM_ATTRIBUTE_CONFIG] = g_param_spec_string( NM_SETTING_TEAM_CONFIG, "", @@ -1515,12 +1515,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_s); /** - * NMSettingTeam:notify-peers-count: - * - * Corresponds to the teamd notify_peers.count. - * - * Since: 1.12 - **/ + * NMSettingTeam:notify-peers-count: + * + * Corresponds to the teamd notify_peers.count. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_COUNT] = g_param_spec_int(NM_SETTING_TEAM_NOTIFY_PEERS_COUNT, "", @@ -1534,12 +1534,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:notify-peers-interval: - * - * Corresponds to the teamd notify_peers.interval. - * - * Since: 1.12 - **/ + * NMSettingTeam:notify-peers-interval: + * + * Corresponds to the teamd notify_peers.interval. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_NOTIFY_PEERS_INTERVAL] = g_param_spec_int(NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL, "", @@ -1553,12 +1553,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:mcast-rejoin-count: - * - * Corresponds to the teamd mcast_rejoin.count. - * - * Since: 1.12 - **/ + * NMSettingTeam:mcast-rejoin-count: + * + * Corresponds to the teamd mcast_rejoin.count. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_COUNT] = g_param_spec_int(NM_SETTING_TEAM_MCAST_REJOIN_COUNT, "", @@ -1572,12 +1572,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:mcast-rejoin-interval: - * - * Corresponds to the teamd mcast_rejoin.interval. - * - * Since: 1.12 - **/ + * NMSettingTeam:mcast-rejoin-interval: + * + * Corresponds to the teamd mcast_rejoin.interval. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_MCAST_REJOIN_INTERVAL] = g_param_spec_int(NM_SETTING_TEAM_MCAST_REJOIN_INTERVAL, "", @@ -1591,14 +1591,14 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:runner: - * - * Corresponds to the teamd runner.name. - * Permitted values are: "roundrobin", "broadcast", "activebackup", - * "loadbalance", "lacp", "random". - * - * Since: 1.12 - **/ + * NMSettingTeam:runner: + * + * Corresponds to the teamd runner.name. + * Permitted values are: "roundrobin", "broadcast", "activebackup", + * "loadbalance", "lacp", "random". + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER] = g_param_spec_string(NM_SETTING_TEAM_RUNNER, "", @@ -1610,12 +1610,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_s); /** - * NMSettingTeam:runner-hwaddr-policy: - * - * Corresponds to the teamd runner.hwaddr_policy. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-hwaddr-policy: + * + * Corresponds to the teamd runner.hwaddr_policy. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_HWADDR_POLICY] = g_param_spec_string(NM_SETTING_TEAM_RUNNER_HWADDR_POLICY, "", @@ -1627,12 +1627,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_s); /** - * NMSettingTeam:runner-tx-hash: - * - * Corresponds to the teamd runner.tx_hash. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-tx-hash: + * + * Corresponds to the teamd runner.tx_hash. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH] = g_param_spec_boxed( NM_SETTING_TEAM_RUNNER_TX_HASH, "", @@ -1644,12 +1644,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_as); /** - * NMSettingTeam:runner-tx-balancer: - * - * Corresponds to the teamd runner.tx_balancer.name. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-tx-balancer: + * + * Corresponds to the teamd runner.tx_balancer.name. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER] = g_param_spec_string(NM_SETTING_TEAM_RUNNER_TX_BALANCER, "", @@ -1661,12 +1661,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_s); /** - * NMSettingTeam:runner-tx-balancer-interval: - * - * Corresponds to the teamd runner.tx_balancer.interval. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-tx-balancer-interval: + * + * Corresponds to the teamd runner.tx_balancer.interval. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_BALANCER_INTERVAL] = g_param_spec_int(NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL, "", @@ -1681,12 +1681,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:runner-active: - * - * Corresponds to the teamd runner.active. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-active: + * + * Corresponds to the teamd runner.active. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_ACTIVE] = g_param_spec_boolean(NM_SETTING_TEAM_RUNNER_ACTIVE, "", @@ -1698,12 +1698,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_b); /** - * NMSettingTeam:runner-fast-rate: - * - * Corresponds to the teamd runner.fast_rate. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-fast-rate: + * + * Corresponds to the teamd runner.fast_rate. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_FAST_RATE] = g_param_spec_boolean(NM_SETTING_TEAM_RUNNER_FAST_RATE, "", @@ -1715,12 +1715,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_b); /** - * NMSettingTeam:runner-sys-prio: - * - * Corresponds to the teamd runner.sys_prio. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-sys-prio: + * + * Corresponds to the teamd runner.sys_prio. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_SYS_PRIO] = g_param_spec_int(NM_SETTING_TEAM_RUNNER_SYS_PRIO, "", @@ -1734,12 +1734,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:runner-min-ports: - * - * Corresponds to the teamd runner.min_ports. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-min-ports: + * + * Corresponds to the teamd runner.min_ports. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_MIN_PORTS] = g_param_spec_int(NM_SETTING_TEAM_RUNNER_MIN_PORTS, "", @@ -1753,12 +1753,12 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_i); /** - * NMSettingTeam:runner-agg-select-policy: - * - * Corresponds to the teamd runner.agg_select_policy. - * - * Since: 1.12 - **/ + * NMSettingTeam:runner-agg-select-policy: + * + * Corresponds to the teamd runner.agg_select_policy. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_MASTER_RUNNER_AGG_SELECT_POLICY] = g_param_spec_string(NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY, "", @@ -1770,19 +1770,19 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_s); /** - * NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) - * - * Link watchers configuration for the connection: each link watcher is - * defined by a dictionary, whose keys depend upon the selected link - * watcher. Available link watchers are 'ethtool', 'nsna_ping' and - * 'arp_ping' and it is specified in the dictionary with the key 'name'. - * Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; - * nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; - * arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', - * 'validate-inactive', 'send-always'. See teamd.conf man for more details. - * - * Since: 1.12 - **/ + * NMSettingTeam:link-watchers: (type GPtrArray(NMTeamLinkWatcher)) + * + * Link watchers configuration for the connection: each link watcher is + * defined by a dictionary, whose keys depend upon the selected link + * watcher. Available link watchers are 'ethtool', 'nsna_ping' and + * 'arp_ping' and it is specified in the dictionary with the key 'name'. + * Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; + * nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; + * arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', + * 'validate-inactive', 'send-always'. See teamd.conf man for more details. + * + * Since: 1.12 + **/ obj_properties[NM_TEAM_ATTRIBUTE_LINK_WATCHERS] = g_param_spec_boxed(NM_SETTING_TEAM_LINK_WATCHERS, "", @@ -1794,13 +1794,13 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) &nm_sett_info_propert_type_team_link_watchers); /* ---dbus--- - * property: interface-name - * format: string - * description: Deprecated in favor of connection.interface-name, but can - * be used for backward-compatibility with older daemons, to set the - * team's interface name. - * ---end--- - */ + * property: interface-name + * format: string + * description: Deprecated in favor of connection.interface-name, but can + * be used for backward-compatibility with older daemons, to set the + * team's interface name. + * ---end--- + */ _nm_properties_override_dbus(properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name); diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c index 85c8ba39c6..6e65d84dfd 100644 --- a/libnm-core/nm-setting-tun.c +++ b/libnm-core/nm-setting-tun.c @@ -296,15 +296,15 @@ nm_setting_tun_class_init(NMSettingTunClass *klass) setting_class->verify = verify; /** - * NMSettingTun:mode: - * - * The operating mode of the virtual device. Allowed values are - * %NM_SETTING_TUN_MODE_TUN to create a layer 3 device and - * %NM_SETTING_TUN_MODE_TAP to create an Ethernet-like layer 2 - * one. - * - * Since: 1.2 - */ + * NMSettingTun:mode: + * + * The operating mode of the virtual device. Allowed values are + * %NM_SETTING_TUN_MODE_TUN to create a layer 3 device and + * %NM_SETTING_TUN_MODE_TAP to create an Ethernet-like layer 2 + * one. + * + * Since: 1.2 + */ obj_properties[PROP_MODE] = g_param_spec_uint(NM_SETTING_TUN_MODE, "", @@ -315,13 +315,13 @@ nm_setting_tun_class_init(NMSettingTunClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingTun:owner: - * - * The user ID which will own the device. If set to %NULL everyone - * will be able to use the device. - * - * Since: 1.2 - */ + * NMSettingTun:owner: + * + * The user ID which will own the device. If set to %NULL everyone + * will be able to use the device. + * + * Since: 1.2 + */ obj_properties[PROP_OWNER] = g_param_spec_string(NM_SETTING_TUN_OWNER, "", "", @@ -330,13 +330,13 @@ nm_setting_tun_class_init(NMSettingTunClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingTun:group: - * - * The group ID which will own the device. If set to %NULL everyone - * will be able to use the device. - * - * Since: 1.2 - */ + * NMSettingTun:group: + * + * The group ID which will own the device. If set to %NULL everyone + * will be able to use the device. + * + * Since: 1.2 + */ obj_properties[PROP_GROUP] = g_param_spec_string(NM_SETTING_TUN_GROUP, "", "", @@ -345,13 +345,13 @@ nm_setting_tun_class_init(NMSettingTunClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingTun:pi: - * - * If %TRUE the interface will prepend a 4 byte header describing the - * physical interface to the packets. - * - * Since: 1.2 - */ + * NMSettingTun:pi: + * + * If %TRUE the interface will prepend a 4 byte header describing the + * physical interface to the packets. + * + * Since: 1.2 + */ obj_properties[PROP_PI] = g_param_spec_boolean(NM_SETTING_TUN_PI, "", "", @@ -360,13 +360,13 @@ nm_setting_tun_class_init(NMSettingTunClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingTun:vnet-hdr: - * - * If %TRUE the IFF_VNET_HDR the tunnel packets will include a virtio - * network header. - * - * Since: 1.2 - */ + * NMSettingTun:vnet-hdr: + * + * If %TRUE the IFF_VNET_HDR the tunnel packets will include a virtio + * network header. + * + * Since: 1.2 + */ obj_properties[PROP_VNET_HDR] = g_param_spec_boolean( NM_SETTING_TUN_VNET_HDR, "", @@ -375,15 +375,15 @@ nm_setting_tun_class_init(NMSettingTunClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingTun:multi-queue: - * - * If the property is set to %TRUE, the interface will support - * multiple file descriptors (queues) to parallelize packet - * sending or receiving. Otherwise, the interface will only - * support a single queue. - * - * Since: 1.2 - */ + * NMSettingTun:multi-queue: + * + * If the property is set to %TRUE, the interface will support + * multiple file descriptors (queues) to parallelize packet + * sending or receiving. Otherwise, the interface will only + * support a single queue. + * + * Since: 1.2 + */ obj_properties[PROP_MULTI_QUEUE] = g_param_spec_boolean( NM_SETTING_TUN_MULTI_QUEUE, "", diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c index f881c5bcfb..9a079fe2cb 100644 --- a/libnm-core/nm-setting-user.c +++ b/libnm-core/nm-setting-user.c @@ -55,7 +55,7 @@ static gboolean _key_char_is_regular(char ch) { /* allow words of printable characters, plus some - * special characters, for example to support base64 encoding. */ + * special characters, for example to support base64 encoding. */ return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || NM_IN_SET(ch, '-', '_', '+', '/', '='); } @@ -112,9 +112,9 @@ nm_setting_user_check_key(const char *key, GError **error) ch = (key++)[0]; /* Allow something that looks like a FQN, separating namespaces by a single '.' - * We want to print the keys nicely in nmcli requiring escaping. - * - * If a user really has to encode special values in the name, he may base64 encode it. */ + * We want to print the keys nicely in nmcli requiring escaping. + * + * If a user really has to encode special values in the name, he may base64 encode it. */ if (!_key_char_is_regular(ch)) break; @@ -235,7 +235,7 @@ nm_setting_user_get_keys(NMSettingUser *setting, guint *out_len) priv->keys = nm_utils_strdict_get_keys(priv->data, TRUE, out_len); /* don't return %NULL, but hijack the @keys fields as a pseudo - * empty strv array. */ + * empty strv array. */ return priv->keys ?: ((const char **) &priv->keys); } @@ -334,7 +334,7 @@ nm_setting_user_set_data(NMSettingUser *setting, const char *key, const char *va out: if (priv->data_invalid) { /* setting a value purges all invalid values that were set - * via GObject property. */ + * via GObject property. */ changed = TRUE; nm_clear_pointer(&priv->data_invalid, g_hash_table_unref); } @@ -556,26 +556,26 @@ nm_setting_user_class_init(NMSettingUserClass *klass) setting_class->verify = verify; /** - * NMSettingUser:data: (type GHashTable(utf8,utf8)) - * - * A dictionary of key/value pairs with user data. This data is ignored by NetworkManager - * and can be used at the users discretion. The keys only support a strict ascii format, - * but the values can be arbitrary UTF8 strings up to a certain length. - * - * Since: 1.8 - **/ + * NMSettingUser:data: (type GHashTable(utf8,utf8)) + * + * A dictionary of key/value pairs with user data. This data is ignored by NetworkManager + * and can be used at the users discretion. The keys only support a strict ascii format, + * but the values can be arbitrary UTF8 strings up to a certain length. + * + * Since: 1.8 + **/ /* ---ifcfg-rh--- - * property: data - * variable: NM_USER_* - * description: each key/value pair is stored as a separate variable with - * name composed by concatenating NM_USER_ with the encoded key. The key is - * encoded by substituting lowercase letters with uppercase and prepending - * uppercase letters with an underscore. A dot is encoded as a double - * underscore. Remaining characters are encoded as underscore followed by a - * 3 digit octal representation of the character. - * example: NM_USER_FOO__BAR=something - * ---end--- - */ + * property: data + * variable: NM_USER_* + * description: each key/value pair is stored as a separate variable with + * name composed by concatenating NM_USER_ with the encoded key. The key is + * encoded by substituting lowercase letters with uppercase and prepending + * uppercase letters with an underscore. A dot is encoded as a double + * underscore. Remaining characters are encoded as underscore followed by a + * 3 digit octal representation of the character. + * example: NM_USER_FOO__BAR=something + * ---end--- + */ obj_properties[PROP_DATA] = g_param_spec_boxed(NM_SETTING_USER_DATA, "", "", diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index 05e68f4263..b1607dee61 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -576,8 +576,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (priv->parent) { if (nm_utils_is_uuid(priv->parent)) { /* If we have an NMSettingConnection:master with slave-type="vlan", - * then it must be the same UUID. - */ + * then it must be the same UUID. + */ if (s_con) { const char *master = NULL, *slave_type = NULL; @@ -612,8 +612,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } } else { /* If parent is NULL, the parent must be specified via - * NMSettingWired:mac-address. - */ + * NMSettingWired:mac-address. + */ if (connection && (!s_wired || !nm_setting_wired_get_mac_address(s_wired))) { g_set_error(error, NM_CONNECTION_ERROR, @@ -647,8 +647,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) if (connection && !s_wired) { /* technically, a VLAN setting does not require an ethernet setting. However, - * the ifcfg-rh reader always adds a ethernet setting when reading a vlan setting. - * Thus, in order to be consistent, always add one via normalization. */ + * the ifcfg-rh reader always adds a ethernet setting when reading a vlan setting. + * Thus, in order to be consistent, always add one via normalization. */ g_set_error_literal(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_SETTING_NOT_FOUND, @@ -679,7 +679,7 @@ _override_flags_not_set(NMSetting * setting, GError ** error) { /* we changed the default value for FLAGS. When an older client - * doesn't serialize the property, we assume it is the old default. */ + * doesn't serialize the property, we assume it is the old default. */ g_object_set(G_OBJECT(setting), NM_SETTING_VLAN_FLAGS, (NMVlanFlags) 0, NULL); return TRUE; } @@ -835,19 +835,19 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) setting_class->verify = verify; /** - * NMSettingVlan:parent: - * - * If given, specifies the parent interface name or parent connection UUID - * from which this VLAN interface should be created. If this property is - * not specified, the connection must contain an #NMSettingWired setting - * with a #NMSettingWired:mac-address property. - **/ + * NMSettingVlan:parent: + * + * If given, specifies the parent interface name or parent connection UUID + * from which this VLAN interface should be created. If this property is + * not specified, the connection must contain an #NMSettingWired setting + * with a #NMSettingWired:mac-address property. + **/ /* ---ifcfg-rh--- - * property: parent - * variable: DEVICE or PHYSDEV - * description: Parent interface of the VLAN. - * ---end--- - */ + * property: parent + * variable: DEVICE or PHYSDEV + * description: Parent interface of the VLAN. + * ---end--- + */ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_VLAN_PARENT, "", @@ -856,17 +856,17 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVlan:id: - * - * The VLAN identifier that the interface created by this connection should - * be assigned. The valid range is from 0 to 4094, without the reserved id 4095. - **/ + * NMSettingVlan:id: + * + * The VLAN identifier that the interface created by this connection should + * be assigned. The valid range is from 0 to 4094, without the reserved id 4095. + **/ /* ---ifcfg-rh--- - * property: id - * variable: VLAN_ID or DEVICE - * description: VLAN identifier. - * ---end--- - */ + * property: id + * variable: VLAN_ID or DEVICE + * description: VLAN identifier. + * ---end--- + */ obj_properties[PROP_ID] = g_param_spec_uint(NM_SETTING_VLAN_ID, "", @@ -877,27 +877,27 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVlan:flags: - * - * One or more flags which control the behavior and features of the VLAN - * interface. Flags include %NM_VLAN_FLAG_REORDER_HEADERS (reordering of - * output packet headers), %NM_VLAN_FLAG_GVRP (use of the GVRP protocol), - * and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its - * master device's operating state). %NM_VLAN_FLAG_MVRP (use of the MVRP - * protocol). - * - * The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, - * but it used to be 0. To preserve backward compatibility, the default-value - * in the D-Bus API continues to be 0 and a missing property on D-Bus - * is still considered as 0. - **/ + * NMSettingVlan:flags: + * + * One or more flags which control the behavior and features of the VLAN + * interface. Flags include %NM_VLAN_FLAG_REORDER_HEADERS (reordering of + * output packet headers), %NM_VLAN_FLAG_GVRP (use of the GVRP protocol), + * and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its + * master device's operating state). %NM_VLAN_FLAG_MVRP (use of the MVRP + * protocol). + * + * The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, + * but it used to be 0. To preserve backward compatibility, the default-value + * in the D-Bus API continues to be 0 and a missing property on D-Bus + * is still considered as 0. + **/ /* ---ifcfg-rh--- - * property: flags - * variable: GVRP, MVRP, VLAN_FLAGS - * values: "yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS - * description: VLAN flags. - * ---end--- - */ + * property: flags + * variable: GVRP, MVRP, VLAN_FLAGS + * values: "yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS + * description: VLAN flags. + * ---end--- + */ obj_properties[PROP_FLAGS] = g_param_spec_flags(NM_SETTING_VLAN_FLAGS, "", "", @@ -913,19 +913,19 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) .missing_from_dbus_fcn = _override_flags_not_set, )); /** - * NMSettingVlan:ingress-priority-map: - * - * For incoming packets, a list of mappings from 802.1p priorities to Linux - * SKB priorities. The mapping is given in the format "from:to" where both - * "from" and "to" are unsigned integers, ie "7:3". - **/ + * NMSettingVlan:ingress-priority-map: + * + * For incoming packets, a list of mappings from 802.1p priorities to Linux + * SKB priorities. The mapping is given in the format "from:to" where both + * "from" and "to" are unsigned integers, ie "7:3". + **/ /* ---ifcfg-rh--- - * property: ingress-priority-map - * variable: VLAN_INGRESS_PRIORITY_MAP - * description: Ingress priority mapping. - * example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5 - * ---end--- - */ + * property: ingress-priority-map + * variable: VLAN_INGRESS_PRIORITY_MAP + * description: Ingress priority mapping. + * example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5 + * ---end--- + */ obj_properties[PROP_INGRESS_PRIORITY_MAP] = g_param_spec_boxed( NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", @@ -934,19 +934,19 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVlan:egress-priority-map: - * - * For outgoing packets, a list of mappings from Linux SKB priorities to - * 802.1p priorities. The mapping is given in the format "from:to" where - * both "from" and "to" are unsigned integers, ie "7:3". - **/ + * NMSettingVlan:egress-priority-map: + * + * For outgoing packets, a list of mappings from Linux SKB priorities to + * 802.1p priorities. The mapping is given in the format "from:to" where + * both "from" and "to" are unsigned integers, ie "7:3". + **/ /* ---ifcfg-rh--- - * property: egress-priority-map - * variable: VLAN_EGRESS_PRIORITY_MAP - * description: Egress priority mapping. - * example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7 - * ---end--- - */ + * property: egress-priority-map + * variable: VLAN_EGRESS_PRIORITY_MAP + * description: Egress priority mapping. + * example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7 + * ---end--- + */ obj_properties[PROP_EGRESS_PRIORITY_MAP] = g_param_spec_boxed( NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", @@ -955,21 +955,21 @@ nm_setting_vlan_class_init(NMSettingVlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /* ---ifcfg-rh--- - * property: interface-name - * variable: PHYSDEV and VLAN_ID, or DEVICE - * description: VLAN interface name. - * If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, - * but VLAN id from DEVICE takes precedence over VLAN_ID. - * example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12 - * ---end--- - * ---dbus--- - * property: interface-name - * format: string - * description: Deprecated in favor of connection.interface-name, but can - * be used for backward-compatibility with older daemons, to set the - * vlan's interface name. - * ---end--- - */ + * property: interface-name + * variable: PHYSDEV and VLAN_ID, or DEVICE + * description: VLAN interface name. + * If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, + * but VLAN id from DEVICE takes precedence over VLAN_ID. + * example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12 + * ---end--- + * ---dbus--- + * property: interface-name + * format: string + * description: Deprecated in favor of connection.interface-name, but can + * be used for backward-compatibility with older daemons, to set the + * vlan's interface name. + * ---end--- + */ _nm_properties_override_dbus(properties_override, "interface-name", &nm_sett_info_propert_type_deprecated_interface_name); diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h index 5cfd68709a..9fb202a2fb 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/libnm-core/nm-setting-vlan.h @@ -87,7 +87,7 @@ typedef enum { /*< flags >*/ /* NOTE: if adding flags update nm-setting-vlan.c::verify() */ /* NOTE: these flags must correspond to the value from the kernel - * header files. */ + * header files. */ } NMVlanFlags; #define NM_VLAN_FLAGS_ALL \ diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index b1d4e3f57b..6aba1f073f 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -42,32 +42,32 @@ typedef struct { char *service_type; /* username of the user requesting this connection, thus - * it's really only valid for user connections, and it also - * should never be saved out to persistent config. - */ + * it's really only valid for user connections, and it also + * should never be saved out to persistent config. + */ char *user_name; /* Whether the VPN stays up across link changes, until the user - * explicitly disconnects it. - */ + * explicitly disconnects it. + */ gboolean persistent; /* The hash table is created at setting object - * init time and should not be replaced. It is - * a char * -> char * mapping, and both the key - * and value are owned by the hash table, and should - * be allocated with functions whose value can be - * freed with g_free(). Should not contain secrets. - */ + * init time and should not be replaced. It is + * a char * -> char * mapping, and both the key + * and value are owned by the hash table, and should + * be allocated with functions whose value can be + * freed with g_free(). Should not contain secrets. + */ GHashTable *data; /* The hash table is created at setting object - * init time and should not be replaced. It is - * a char * -> char * mapping, and both the key - * and value are owned by the hash table, and should - * be allocated with functions whose value can be - * freed with g_free(). Should contain secrets only. - */ + * init time and should not be replaced. It is + * a char * -> char * mapping, and both the key + * and value are owned by the hash table, and should + * be allocated with functions whose value can be + * freed with g_free(). Should contain secrets only. + */ GHashTable *secrets; /* Timeout for the VPN service to establish the connection */ @@ -272,19 +272,19 @@ foreach_item_helper(NMSettingVpn *self, GHashTable **p_hash, NMVpnIterFunc func, for (i = 0; i < len; i++) { /* NOTE: note that we call the function with a clone of @key, - * not with the actual key from the dictionary. - * - * The @value on the other hand, is not cloned but retrieved before - * invoking @func(). That means, if @func() modifies the setting while - * being called, the values are as they currently are, but the - * keys (and their order) were pre-determined before starting to - * invoke the callbacks. - * - * The idea is to give some sensible, stable behavior in case the user - * modifies the settings. Whether this particular behavior is optimal - * is unclear. It's probably a bad idea to modify the settings while - * iterating the values. But at least, it's a safe thing to do and we - * do something sensible. */ + * not with the actual key from the dictionary. + * + * The @value on the other hand, is not cloned but retrieved before + * invoking @func(). That means, if @func() modifies the setting while + * being called, the values are as they currently are, but the + * keys (and their order) were pre-determined before starting to + * invoke the callbacks. + * + * The idea is to give some sensible, stable behavior in case the user + * modifies the settings. Whether this particular behavior is optimal + * is unclear. It's probably a bad idea to modify the settings while + * iterating the values. But at least, it's a safe thing to do and we + * do something sensible. */ func(keys[i], nm_g_hash_table_lookup(*p_hash, keys[i]), user_data); } } @@ -474,7 +474,7 @@ aggregate(NMSetting *setting, int type_i, gpointer arg) } /* OK, we have no secrets with system-secret flags. - * But do we have any secret-flags (without secrets) that indicate system secrets? */ + * But do we have any secret-flags (without secrets) that indicate system secrets? */ if (priv->data) { g_hash_table_iter_init(&iter, priv->data); while (g_hash_table_iter_next(&iter, (gpointer *) &key_name, NULL)) { @@ -625,10 +625,10 @@ update_one_secret(NMSetting *setting, const char *key, GVariant *value, GError * if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING)) { /* Passing the string properties individually isn't correct, and won't - * produce the correct result, but for some reason that's how it used - * to be done. So even though it's not correct, keep the code around - * for compatibility's sake. - */ + * produce the correct result, but for some reason that's how it used + * to be done. So even though it's not correct, keep the code around + * for compatibility's sake. + */ success = update_secret_string(setting, key, g_variant_get_string(value, NULL), error); } else if (g_variant_is_of_type(value, G_VARIANT_TYPE("a{ss}"))) { if (!nm_streq(key, NM_SETTING_VPN_SECRETS)) { @@ -681,7 +681,7 @@ for_each_secret(NMSetting * setting, if (!g_variant_is_of_type(val, G_VARIANT_TYPE("a{ss}"))) { /* invalid type. Silently ignore the secrets as we cannot find out the - * secret-flags. */ + * secret-flags. */ return; } @@ -692,9 +692,9 @@ for_each_secret(NMSetting * setting, NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE; /* we ignore the return value of get_secret_flags. The function may determine - * that this is not a secret, based on having not secret-flags and no secrets. - * But we have the secret at hand. We know it would be a valid secret, if we - * only add it to the VPN settings. */ + * that this is not a secret, based on having not secret-flags and no secrets. + * But we have the secret at hand. We know it would be a valid secret, if we + * only add it to the VPN settings. */ nm_setting_get_secret_flags(setting, vpn_secret_name, &secret_flags, NULL); if (callback(secret_flags, callback_data)) @@ -736,7 +736,7 @@ get_secret_flags(NMSetting * setting, NM_SET_OUT(out_flags, NM_SETTING_SECRET_FLAG_NONE); /* having no secret flag for the secret is fine, as long as there - * is the secret itself... */ + * is the secret itself... */ if (!nm_g_hash_table_lookup(priv->secrets, secret_name)) { g_set_error_literal(error, NM_CONNECTION_ERROR, @@ -751,10 +751,10 @@ get_secret_flags(NMSetting * setting, i64 = _nm_utils_ascii_str_to_int64(flags_val, 10, 0, NM_SETTING_SECRET_FLAG_ALL, -1); if (i64 == -1 || !_nm_setting_secret_flags_valid(i64)) { /* The flags keys is set to an unexpected value. That is a configuration - * error. Note that keys named "*-flags" are reserved for secrets. The user - * must not use this for anything but secret flags. Hence, we cannot fail - * to read the secret, we pretend that the secret flag is set to the default - * NM_SETTING_SECRET_FLAG_NONE. */ + * error. Note that keys named "*-flags" are reserved for secrets. The user + * must not use this for anything but secret flags. Hence, we cannot fail + * to read the secret, we pretend that the secret flag is set to the default + * NM_SETTING_SECRET_FLAG_NONE. */ NM_SET_OUT(out_flags, NM_SETTING_SECRET_FLAG_NONE); return TRUE; } @@ -1032,9 +1032,9 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer *) &val)) { if (!key || !key[0] || !val) { /* NULL keys/values and empty key are not allowed. Usually, we would reject them in verify(), but - * then our nm_setting_vpn_remove_data_item() also doesn't allow empty keys. So, if we failed - * it in verify(), it would be only fixable by setting PROP_DATA again. Instead, - * silently ignore them. */ + * then our nm_setting_vpn_remove_data_item() also doesn't allow empty keys. So, if we failed + * it in verify(), it would be only fixable by setting PROP_DATA again. Instead, + * silently ignore them. */ continue; } g_hash_table_insert(_ensure_strdict(p_hash, is_secrets), @@ -1110,12 +1110,12 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass) setting_class->aggregate = aggregate; /** - * NMSettingVpn:service-type: - * - * D-Bus service name of the VPN plugin that this setting uses to connect to - * its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc - * plugin. - **/ + * NMSettingVpn:service-type: + * + * D-Bus service name of the VPN plugin that this setting uses to connect to + * its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc + * plugin. + **/ obj_properties[PROP_SERVICE_TYPE] = g_param_spec_string(NM_SETTING_VPN_SERVICE_TYPE, "", @@ -1124,15 +1124,15 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVpn:user-name: - * - * If the VPN connection requires a user name for authentication, that name - * should be provided here. If the connection is available to more than one - * user, and the VPN requires each user to supply a different name, then - * leave this property empty. If this property is empty, NetworkManager - * will automatically supply the username of the user which requested the - * VPN connection. - **/ + * NMSettingVpn:user-name: + * + * If the VPN connection requires a user name for authentication, that name + * should be provided here. If the connection is available to more than one + * user, and the VPN requires each user to supply a different name, then + * leave this property empty. If this property is empty, NetworkManager + * will automatically supply the username of the user which requested the + * VPN connection. + **/ obj_properties[PROP_USER_NAME] = g_param_spec_string(NM_SETTING_VPN_USER_NAME, "", @@ -1141,12 +1141,12 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVpn:persistent: - * - * If the VPN service supports persistence, and this property is %TRUE, - * the VPN will attempt to stay connected across link changes and outages, - * until explicitly disconnected. - **/ + * NMSettingVpn:persistent: + * + * If the VPN service supports persistence, and this property is %TRUE, + * the VPN will attempt to stay connected across link changes and outages, + * until explicitly disconnected. + **/ obj_properties[PROP_PERSISTENT] = g_param_spec_boolean(NM_SETTING_VPN_PERSISTENT, "", @@ -1155,19 +1155,19 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVpn:data: (type GHashTable(utf8,utf8)): - * - * Dictionary of key/value pairs of VPN plugin specific data. Both keys and - * values must be strings. - **/ + * NMSettingVpn:data: (type GHashTable(utf8,utf8)): + * + * Dictionary of key/value pairs of VPN plugin specific data. Both keys and + * values must be strings. + **/ /* ---keyfile--- - * property: data - * variable: separate variables named after keys of the dictionary - * description: The keys of the data dictionary are used as variable names directly - * under [vpn] section. - * example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe - * ---end--- - */ + * property: data + * variable: separate variables named after keys of the dictionary + * description: The keys of the data dictionary are used as variable names directly + * under [vpn] section. + * example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe + * ---end--- + */ obj_properties[PROP_DATA] = g_param_spec_boxed(NM_SETTING_VPN_DATA, "", "", @@ -1178,19 +1178,19 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass) &nm_sett_info_propert_type_strdict); /** - * NMSettingVpn:secrets: (type GHashTable(utf8,utf8)): - * - * Dictionary of key/value pairs of VPN plugin specific secrets like - * passwords or private keys. Both keys and values must be strings. - **/ + * NMSettingVpn:secrets: (type GHashTable(utf8,utf8)): + * + * Dictionary of key/value pairs of VPN plugin specific secrets like + * passwords or private keys. Both keys and values must be strings. + **/ /* ---keyfile--- - * property: secrets - * variable: separate variables named after keys of the dictionary - * description: The keys of the secrets dictionary are used as variable names directly - * under [vpn-secrets] section. - * example: password=Popocatepetl - * ---end--- - */ + * property: secrets + * variable: separate variables named after keys of the dictionary + * description: The keys of the secrets dictionary are used as variable names directly + * under [vpn-secrets] section. + * example: password=Popocatepetl + * ---end--- + */ obj_properties[PROP_SECRETS] = g_param_spec_boxed(NM_SETTING_VPN_SECRETS, "", @@ -1206,16 +1206,16 @@ nm_setting_vpn_class_init(NMSettingVpnClass *klass) .from_dbus_fcn = vpn_secrets_from_dbus, )); /** - * NMSettingVpn:timeout: - * - * Timeout for the VPN service to establish the connection. Some services - * may take quite a long time to connect. - * Value of 0 means a default timeout, which is 60 seconds (unless overridden - * by vpn.timeout in configuration file). Values greater than zero mean - * timeout in seconds. - * - * Since: 1.2 - **/ + * NMSettingVpn:timeout: + * + * Timeout for the VPN service to establish the connection. Some services + * may take quite a long time to connect. + * Value of 0 means a default timeout, which is 60 seconds (unless overridden + * by vpn.timeout in configuration file). Values greater than zero mean + * timeout in seconds. + * + * Since: 1.2 + **/ obj_properties[PROP_TIMEOUT] = g_param_spec_uint(NM_SETTING_VPN_TIMEOUT, "", "", diff --git a/libnm-core/nm-setting-vrf.c b/libnm-core/nm-setting-vrf.c index bb4757fe7d..198b9d718a 100644 --- a/libnm-core/nm-setting-vrf.c +++ b/libnm-core/nm-setting-vrf.c @@ -143,12 +143,12 @@ nm_setting_vrf_class_init(NMSettingVrfClass *klass) setting_class->verify = verify; /** - * NMSettingVrf:table: - * - * The routing table for this VRF. - * - * Since: 1.24 - **/ + * NMSettingVrf:table: + * + * The routing table for this VRF. + * + * Since: 1.24 + **/ obj_properties[PROP_TABLE] = g_param_spec_uint(NM_SETTING_VRF_TABLE, "", diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c index b3bae13bf5..38bd6e2c15 100644 --- a/libnm-core/nm-setting-vxlan.c +++ b/libnm-core/nm-setting-vxlan.c @@ -562,12 +562,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) setting_class->verify = verify; /** - * NMSettingVxlan:parent: - * - * If given, specifies the parent interface name or parent connection UUID. - * - * Since: 1.2 - **/ + * NMSettingVxlan:parent: + * + * If given, specifies the parent interface name or parent connection UUID. + * + * Since: 1.2 + **/ obj_properties[PROP_PARENT] = g_param_spec_string( NM_SETTING_VXLAN_PARENT, "", @@ -575,13 +575,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) NULL, G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:id: - * - * Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to - * use. - * - * Since: 1.2 - **/ + * NMSettingVxlan:id: + * + * Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to + * use. + * + * Since: 1.2 + **/ obj_properties[PROP_ID] = g_param_spec_uint(NM_SETTING_VXLAN_ID, "", @@ -592,12 +592,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:local: - * - * If given, specifies the source IP address to use in outgoing packets. - * - * Since: 1.2 - **/ + * NMSettingVxlan:local: + * + * If given, specifies the source IP address to use in outgoing packets. + * + * Since: 1.2 + **/ obj_properties[PROP_LOCAL] = g_param_spec_string(NM_SETTING_VXLAN_LOCAL, "", "", @@ -606,14 +606,14 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:remote: - * - * Specifies the unicast destination IP address to use in outgoing packets - * when the destination link layer address is not known in the VXLAN device - * forwarding database, or the multicast IP address to join. - * - * Since: 1.2 - **/ + * NMSettingVxlan:remote: + * + * Specifies the unicast destination IP address to use in outgoing packets + * when the destination link layer address is not known in the VXLAN device + * forwarding database, or the multicast IP address to join. + * + * Since: 1.2 + **/ obj_properties[PROP_REMOTE] = g_param_spec_string( NM_SETTING_VXLAN_REMOTE, "", @@ -622,13 +622,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:source-port-min: - * - * Specifies the minimum UDP source port to communicate to the remote VXLAN - * tunnel endpoint. - * - * Since: 1.2 - **/ + * NMSettingVxlan:source-port-min: + * + * Specifies the minimum UDP source port to communicate to the remote VXLAN + * tunnel endpoint. + * + * Since: 1.2 + **/ obj_properties[PROP_SOURCE_PORT_MIN] = g_param_spec_uint(NM_SETTING_VXLAN_SOURCE_PORT_MIN, "", @@ -639,13 +639,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:source-port-max: - * - * Specifies the maximum UDP source port to communicate to the remote VXLAN - * tunnel endpoint. - * - * Since: 1.2 - **/ + * NMSettingVxlan:source-port-max: + * + * Specifies the maximum UDP source port to communicate to the remote VXLAN + * tunnel endpoint. + * + * Since: 1.2 + **/ obj_properties[PROP_SOURCE_PORT_MAX] = g_param_spec_uint(NM_SETTING_VXLAN_SOURCE_PORT_MAX, "", @@ -656,13 +656,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:destination-port: - * - * Specifies the UDP destination port to communicate to the remote VXLAN - * tunnel endpoint. - * - * Since: 1.2 - **/ + * NMSettingVxlan:destination-port: + * + * Specifies the UDP destination port to communicate to the remote VXLAN + * tunnel endpoint. + * + * Since: 1.2 + **/ obj_properties[PROP_DESTINATION_PORT] = g_param_spec_uint(NM_SETTING_VXLAN_DESTINATION_PORT, "", @@ -673,12 +673,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:ageing: - * - * Specifies the lifetime in seconds of FDB entries learnt by the kernel. - * - * Since: 1.2 - **/ + * NMSettingVxlan:ageing: + * + * Specifies the lifetime in seconds of FDB entries learnt by the kernel. + * + * Since: 1.2 + **/ obj_properties[PROP_AGEING] = g_param_spec_uint(NM_SETTING_VXLAN_AGEING, "", @@ -689,13 +689,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:limit: - * - * Specifies the maximum number of FDB entries. A value of zero means that - * the kernel will store unlimited entries. - * - * Since: 1.2 - **/ + * NMSettingVxlan:limit: + * + * Specifies the maximum number of FDB entries. A value of zero means that + * the kernel will store unlimited entries. + * + * Since: 1.2 + **/ obj_properties[PROP_LIMIT] = g_param_spec_uint(NM_SETTING_VXLAN_LIMIT, "", @@ -706,12 +706,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:tos: - * - * Specifies the TOS value to use in outgoing packets. - * - * Since: 1.2 - **/ + * NMSettingVxlan:tos: + * + * Specifies the TOS value to use in outgoing packets. + * + * Since: 1.2 + **/ obj_properties[PROP_TOS] = g_param_spec_uint(NM_SETTING_VXLAN_TOS, "", @@ -722,12 +722,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:ttl: - * - * Specifies the time-to-live value to use in outgoing packets. - * - * Since: 1.2 - **/ + * NMSettingVxlan:ttl: + * + * Specifies the time-to-live value to use in outgoing packets. + * + * Since: 1.2 + **/ obj_properties[PROP_TTL] = g_param_spec_uint(NM_SETTING_VXLAN_TTL, "", @@ -738,12 +738,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:proxy: - * - * Specifies whether ARP proxy is turned on. - * - * Since: 1.2 - **/ + * NMSettingVxlan:proxy: + * + * Specifies whether ARP proxy is turned on. + * + * Since: 1.2 + **/ obj_properties[PROP_PROXY] = g_param_spec_boolean( NM_SETTING_VXLAN_PROXY, "", @@ -752,13 +752,13 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:learning: - * - * Specifies whether unknown source link layer addresses and IP addresses - * are entered into the VXLAN device forwarding database. - * - * Since: 1.2 - **/ + * NMSettingVxlan:learning: + * + * Specifies whether unknown source link layer addresses and IP addresses + * are entered into the VXLAN device forwarding database. + * + * Since: 1.2 + **/ obj_properties[PROP_LEARNING] = g_param_spec_boolean( NM_SETTING_VXLAN_LEARNING, "", @@ -766,12 +766,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) TRUE, G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:rsc: - * - * Specifies whether route short circuit is turned on. - * - * Since: 1.2 - **/ + * NMSettingVxlan:rsc: + * + * Specifies whether route short circuit is turned on. + * + * Since: 1.2 + **/ obj_properties[PROP_RSC] = g_param_spec_boolean(NM_SETTING_VXLAN_RSC, "", "", @@ -779,12 +779,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:l2-miss: - * - * Specifies whether netlink LL ADDR miss notifications are generated. - * - * Since: 1.2 - **/ + * NMSettingVxlan:l2-miss: + * + * Specifies whether netlink LL ADDR miss notifications are generated. + * + * Since: 1.2 + **/ obj_properties[PROP_L2_MISS] = g_param_spec_boolean( NM_SETTING_VXLAN_L2_MISS, "", @@ -793,12 +793,12 @@ nm_setting_vxlan_class_init(NMSettingVxlanClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingVxlan:l3-miss: - * - * Specifies whether netlink IP ADDR miss notifications are generated. - * - * Since: 1.2 - **/ + * NMSettingVxlan:l3-miss: + * + * Specifies whether netlink IP ADDR miss notifications are generated. + * + * Since: 1.2 + **/ obj_properties[PROP_L3_MISS] = g_param_spec_boolean( NM_SETTING_VXLAN_L3_MISS, "", diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c index 23c2b7cb42..2a0b72a11b 100644 --- a/libnm-core/nm-setting-wifi-p2p.c +++ b/libnm-core/nm-setting-wifi-p2p.c @@ -239,21 +239,21 @@ nm_setting_wifi_p2p_class_init(NMSettingWifiP2PClass *setting_wifi_p2p_class) setting_class->verify = verify; /** - * NMSettingWifiP2P:peer: - * - * The P2P device that should be connected to. Currently, this is the only - * way to create or join a group. - * - * Since: 1.16 - */ + * NMSettingWifiP2P:peer: + * + * The P2P device that should be connected to. Currently, this is the only + * way to create or join a group. + * + * Since: 1.16 + */ /* ---keyfile--- - * property: peer - * format: usual hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;162). - * ---end--- - */ + * property: peer + * format: usual hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;162). + * ---end--- + */ obj_properties[PROP_PEER] = g_param_spec_string(NM_SETTING_WIFI_P2P_PEER, "", "", @@ -261,15 +261,15 @@ nm_setting_wifi_p2p_class_init(NMSettingWifiP2PClass *setting_wifi_p2p_class) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWifiP2P:wps-method: - * - * Flags indicating which mode of WPS is to be used. - * - * There's little point in changing the default setting as NetworkManager will - * automatically determine the best method to use. - * - * Since: 1.16 - */ + * NMSettingWifiP2P:wps-method: + * + * Flags indicating which mode of WPS is to be used. + * + * There's little point in changing the default setting as NetworkManager will + * automatically determine the best method to use. + * + * Since: 1.16 + */ obj_properties[PROP_WPS_METHOD] = g_param_spec_uint( NM_SETTING_WIFI_P2P_WPS_METHOD, "", @@ -280,17 +280,17 @@ nm_setting_wifi_p2p_class_init(NMSettingWifiP2PClass *setting_wifi_p2p_class) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWifiP2P:wfd-ies: - * - * The Wi-Fi Display (WFD) Information Elements (IEs) to set. - * - * Wi-Fi Display requires a protocol specific information element to be - * set in certain Wi-Fi frames. These can be specified here for the - * purpose of establishing a connection. - * This setting is only useful when implementing a Wi-Fi Display client. - * - * Since: 1.16 - */ + * NMSettingWifiP2P:wfd-ies: + * + * The Wi-Fi Display (WFD) Information Elements (IEs) to set. + * + * Wi-Fi Display requires a protocol specific information element to be + * set in certain Wi-Fi frames. These can be specified here for the + * purpose of establishing a connection. + * This setting is only useful when implementing a Wi-Fi Display client. + * + * Since: 1.16 + */ obj_properties[PROP_WFD_IES] = g_param_spec_boxed( NM_SETTING_WIFI_P2P_WFD_IES, "", diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c index a9ebc32f0f..9c7ed74154 100644 --- a/libnm-core/nm-setting-wimax.c +++ b/libnm-core/nm-setting-wimax.c @@ -213,13 +213,13 @@ nm_setting_wimax_class_init(NMSettingWimaxClass *klass) setting_class->verify = verify; /** - * NMSettingWimax:network-name: - * - * Network Service Provider (NSP) name of the WiMAX network this connection - * should use. - * - * Deprecated: 1.2: WiMAX is no longer supported. - **/ + * NMSettingWimax:network-name: + * + * Network Service Provider (NSP) name of the WiMAX network this connection + * should use. + * + * Deprecated: 1.2: WiMAX is no longer supported. + **/ obj_properties[PROP_NETWORK_NAME] = g_param_spec_string(NM_SETTING_WIMAX_NETWORK_NAME, "", @@ -228,14 +228,14 @@ nm_setting_wimax_class_init(NMSettingWimaxClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWimax:mac-address: - * - * If specified, this connection will only apply to the WiMAX device whose - * MAC address matches. This property does not change the MAC address of the - * device (known as MAC spoofing). - * - * Deprecated: 1.2: WiMAX is no longer supported. - **/ + * NMSettingWimax:mac-address: + * + * If specified, this connection will only apply to the WiMAX device whose + * MAC address matches. This property does not change the MAC address of the + * device (known as MAC spoofing). + * + * Deprecated: 1.2: WiMAX is no longer supported. + **/ obj_properties[PROP_MAC_ADDRESS] = g_param_spec_string(NM_SETTING_WIMAX_MAC_ADDRESS, "", diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index d74bc2a187..376138361e 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -492,9 +492,9 @@ nm_setting_wired_get_s390_option(NMSettingWired *setting, NMSettingWiredPrivate *priv; /* with LTO and optimization, the compiler complains that the - * output variables are not initialized. In practice, the function - * only sets the output on success. But make the compiler happy. - */ + * output variables are not initialized. In practice, the function + * only sets the output on success. But make the compiler happy. + */ NM_SET_OUT(out_key, NULL); NM_SET_OUT(out_value, NULL); @@ -840,8 +840,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } /* generate-mac-address-mask only makes sense with cloned-mac-address "random" or - * "stable". Still, let's not be so strict about that and accept the value - * even if it is unused. */ + * "stable". Still, let's not be so strict about that and accept the value + * even if it is unused. */ if (!_nm_utils_generate_mac_address_mask_parse(priv->generate_mac_address_mask, NULL, NULL, @@ -898,8 +898,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } /* Normalizable properties - just return NM_SETTING_VERIFY_NORMALIZABLE for compatibility - * with legacy nm-connection-editor which used to save "full" duplex connection as default - */ + * with legacy nm-connection-editor which used to save "full" duplex connection as default + */ if (((priv->speed) && (!priv->duplex)) || ((!priv->speed) && (priv->duplex))) { g_set_error_literal( @@ -1116,10 +1116,10 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps NULL, NULL); /* prune duplicate keys. This is only possible if @hash does not use - * g_str_equal() as compare function (which would be a bug). - * Still, handle this, because we use later binary sort and rely - * on unique names. One bug here, should not bork the remainder - * of the program. */ + * g_str_equal() as compare function (which would be a bug). + * Still, handle this, because we use later binary sort and rely + * on unique names. One bug here, should not bork the remainder + * of the program. */ j = 1; for (i = 1; i < priv->s390_options.len; i++) { if (nm_streq(priv->s390_options.arr[j - 1].name, @@ -1218,19 +1218,19 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) setting_class->compare_property = compare_property; /** - * NMSettingWired:port: - * - * Specific port type to use if the device supports multiple - * attachment methods. One of "tp" (Twisted Pair), "aui" (Attachment Unit - * Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface). - * If the device supports only one port type, this setting is ignored. - **/ + * NMSettingWired:port: + * + * Specific port type to use if the device supports multiple + * attachment methods. One of "tp" (Twisted Pair), "aui" (Attachment Unit + * Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface). + * If the device supports only one port type, this setting is ignored. + **/ /* ---ifcfg-rh--- - * property: port - * variable: (none) - * description: The property is not saved by the plugin. - * ---end--- - */ + * property: port + * variable: (none) + * description: The property is not saved by the plugin. + * ---end--- + */ obj_properties[PROP_PORT] = g_param_spec_string(NM_SETTING_WIRED_PORT, "", "", @@ -1238,29 +1238,29 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:speed: - * - * When a value greater than 0 is set, configures the device to use - * the specified speed. If "auto-negotiate" is "yes" the specified - * speed will be the only one advertised during link negotiation: - * this works only for BASE-T 802.3 specifications and is useful for - * enforcing gigabit speeds, as in this case link negotiation is - * mandatory. - * If the value is unset (0, the default), the link configuration will be - * either skipped (if "auto-negotiate" is "no", the default) or will - * be auto-negotiated (if "auto-negotiate" is "yes") and the local device - * will advertise all the supported speeds. - * In Mbit/s, ie 100 == 100Mbit/s. - * Must be set together with the "duplex" property when non-zero. - * Before specifying a speed value be sure your device supports it. - **/ + * NMSettingWired:speed: + * + * When a value greater than 0 is set, configures the device to use + * the specified speed. If "auto-negotiate" is "yes" the specified + * speed will be the only one advertised during link negotiation: + * this works only for BASE-T 802.3 specifications and is useful for + * enforcing gigabit speeds, as in this case link negotiation is + * mandatory. + * If the value is unset (0, the default), the link configuration will be + * either skipped (if "auto-negotiate" is "no", the default) or will + * be auto-negotiated (if "auto-negotiate" is "yes") and the local device + * will advertise all the supported speeds. + * In Mbit/s, ie 100 == 100Mbit/s. + * Must be set together with the "duplex" property when non-zero. + * Before specifying a speed value be sure your device supports it. + **/ /* ---ifcfg-rh--- - * property: speed - * variable: ETHTOOL_OPTS - * description: Fixed speed for the ethernet link. It is added as "speed" - * parameter in the ETHTOOL_OPTS variable. - * ---end--- - */ + * property: speed + * variable: ETHTOOL_OPTS + * description: Fixed speed for the ethernet link. It is added as "speed" + * parameter in the ETHTOOL_OPTS variable. + * ---end--- + */ obj_properties[PROP_SPEED] = g_param_spec_uint(NM_SETTING_WIRED_SPEED, "", "", @@ -1270,28 +1270,28 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:duplex: - * - * When a value is set, either "half" or "full", configures the device - * to use the specified duplex mode. If "auto-negotiate" is "yes" the - * specified duplex mode will be the only one advertised during link - * negotiation: this works only for BASE-T 802.3 specifications and is - * useful for enforcing gigabits modes, as in these cases link negotiation - * is mandatory. - * If the value is unset (the default), the link configuration will be - * either skipped (if "auto-negotiate" is "no", the default) or will - * be auto-negotiated (if "auto-negotiate" is "yes") and the local device - * will advertise all the supported duplex modes. - * Must be set together with the "speed" property if specified. - * Before specifying a duplex mode be sure your device supports it. - **/ + * NMSettingWired:duplex: + * + * When a value is set, either "half" or "full", configures the device + * to use the specified duplex mode. If "auto-negotiate" is "yes" the + * specified duplex mode will be the only one advertised during link + * negotiation: this works only for BASE-T 802.3 specifications and is + * useful for enforcing gigabits modes, as in these cases link negotiation + * is mandatory. + * If the value is unset (the default), the link configuration will be + * either skipped (if "auto-negotiate" is "no", the default) or will + * be auto-negotiated (if "auto-negotiate" is "yes") and the local device + * will advertise all the supported duplex modes. + * Must be set together with the "speed" property if specified. + * Before specifying a duplex mode be sure your device supports it. + **/ /* ---ifcfg-rh--- - * property: duplex - * variable: ETHTOOL_OPTS - * description: Fixed duplex mode for the ethernet link. It is added as - * "duplex" parameter in the ETHOOL_OPTS variable. - * ---end--- - */ + * property: duplex + * variable: ETHTOOL_OPTS + * description: Fixed duplex mode for the ethernet link. It is added as + * "duplex" parameter in the ETHOOL_OPTS variable. + * ---end--- + */ obj_properties[PROP_DUPLEX] = g_param_spec_string(NM_SETTING_WIRED_DUPLEX, "", "", @@ -1299,25 +1299,25 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:auto-negotiate: - * - * When %TRUE, enforce auto-negotiation of speed and duplex mode. - * If "speed" and "duplex" properties are both specified, only that - * single mode will be advertised and accepted during the link - * auto-negotiation process: this works only for BASE-T 802.3 specifications - * and is useful for enforcing gigabits modes, as in these cases link - * negotiation is mandatory. - * When %FALSE, "speed" and "duplex" properties should be both set or - * link configuration will be skipped. - **/ + * NMSettingWired:auto-negotiate: + * + * When %TRUE, enforce auto-negotiation of speed and duplex mode. + * If "speed" and "duplex" properties are both specified, only that + * single mode will be advertised and accepted during the link + * auto-negotiation process: this works only for BASE-T 802.3 specifications + * and is useful for enforcing gigabits modes, as in these cases link + * negotiation is mandatory. + * When %FALSE, "speed" and "duplex" properties should be both set or + * link configuration will be skipped. + **/ /* ---ifcfg-rh--- - * property: auto-negotiate - * variable: ETHTOOL_OPTS - * description: Whether link speed and duplex autonegotiation is enabled. - * It is not saved only if disabled and no values are provided for the - * "speed" and "duplex" parameters (skips link configuration). - * ---end--- - */ + * property: auto-negotiate + * variable: ETHTOOL_OPTS + * description: Whether link speed and duplex autonegotiation is enabled. + * It is not saved only if disabled and no values are provided for the + * "speed" and "duplex" parameters (skips link configuration). + * ---end--- + */ obj_properties[PROP_AUTO_NEGOTIATE] = g_param_spec_boolean(NM_SETTING_WIRED_AUTO_NEGOTIATE, "", @@ -1330,29 +1330,29 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) .to_dbus_fcn = _override_autoneg_get, )); /** - * NMSettingWired:mac-address: - * - * If specified, this connection will only apply to the Ethernet device - * whose permanent MAC address matches. This property does not change the - * MAC address of the device (i.e. MAC spoofing). - **/ + * NMSettingWired:mac-address: + * + * If specified, this connection will only apply to the Ethernet device + * whose permanent MAC address matches. This property does not change the + * MAC address of the device (i.e. MAC spoofing). + **/ /* ---keyfile--- - * property: mac-address - * format: usual hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;162) - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: HWADDR - * description: Hardware address of the device in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:05). - * Note that for initscripts this is the current MAC address of the device as found - * during ifup. For NetworkManager this is the permanent MAC address. Or in case no - * permanent MAC address exists, the MAC address initially configured on the device. - * ---end--- - */ + * property: mac-address + * format: usual hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;162) + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: HWADDR + * description: Hardware address of the device in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:05). + * Note that for initscripts this is the current MAC address of the device as found + * during ifup. For NetworkManager this is the permanent MAC address. Or in case no + * permanent MAC address exists, the MAC address initially configured on the device. + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS] = g_param_spec_string( NM_SETTING_WIRED_MAC_ADDRESS, "", @@ -1364,48 +1364,48 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingWired:cloned-mac-address: - * - * If specified, request that the device use this MAC address instead. - * This is known as MAC cloning or spoofing. - * - * Beside explicitly specifying a MAC address, the special values "preserve", "permanent", - * "random" and "stable" are supported. - * "preserve" means not to touch the MAC address on activation. - * "permanent" means to use the permanent hardware address if the device - * has one (otherwise this is treated as "preserve"). - * "random" creates a random MAC address on each connect. - * "stable" creates a hashed MAC address based on connection.stable-id and a - * machine dependent key. - * - * If unspecified, the value can be overwritten via global defaults, see manual - * of NetworkManager.conf. If still unspecified, it defaults to "preserve" - * (older versions of NetworkManager may use a different default value). - * - * On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated - * "cloned-mac-address". - **/ + * NMSettingWired:cloned-mac-address: + * + * If specified, request that the device use this MAC address instead. + * This is known as MAC cloning or spoofing. + * + * Beside explicitly specifying a MAC address, the special values "preserve", "permanent", + * "random" and "stable" are supported. + * "preserve" means not to touch the MAC address on activation. + * "permanent" means to use the permanent hardware address if the device + * has one (otherwise this is treated as "preserve"). + * "random" creates a random MAC address on each connect. + * "stable" creates a hashed MAC address based on connection.stable-id and a + * machine dependent key. + * + * If unspecified, the value can be overwritten via global defaults, see manual + * of NetworkManager.conf. If still unspecified, it defaults to "preserve" + * (older versions of NetworkManager may use a different default value). + * + * On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated + * "cloned-mac-address". + **/ /* ---keyfile--- - * property: cloned-mac-address - * format: usual hex-digits-and-colons notation - * description: Cloned MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;178). - * ---end--- - * ---ifcfg-rh--- - * property: cloned-mac-address - * variable: MACADDR - * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:99). - * ---end--- - * ---dbus--- - * property: cloned-mac-address - * format: byte array - * description: This D-Bus field is deprecated in favor of "assigned-mac-address" - * which is more flexible and allows specifying special variants like "random". - * For libnm and nmcli, this field is called "cloned-mac-address". - * ---end--- - */ + * property: cloned-mac-address + * format: usual hex-digits-and-colons notation + * description: Cloned MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;178). + * ---end--- + * ---ifcfg-rh--- + * property: cloned-mac-address + * variable: MACADDR + * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:99). + * ---end--- + * ---dbus--- + * property: cloned-mac-address + * format: byte array + * description: This D-Bus field is deprecated in favor of "assigned-mac-address" + * which is more flexible and allows specifying special variants like "random". + * For libnm and nmcli, this field is called "cloned-mac-address". + * ---end--- + */ obj_properties[PROP_CLONED_MAC_ADDRESS] = g_param_spec_string( NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", @@ -1417,60 +1417,60 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) &nm_sett_info_propert_type_cloned_mac_address); /* ---dbus--- - * property: assigned-mac-address - * format: string - * description: The new field for the cloned MAC address. It can be either - * a hardware address in ASCII representation, or one of the special values - * "preserve", "permanent", "random" or "stable". - * This field replaces the deprecated "cloned-mac-address" on D-Bus, which - * can only contain explicit hardware addresses. Note that this property - * only exists in D-Bus API. libnm and nmcli continue to call this property - * "cloned-mac-address". - * ---end--- - */ + * property: assigned-mac-address + * format: string + * description: The new field for the cloned MAC address. It can be either + * a hardware address in ASCII representation, or one of the special values + * "preserve", "permanent", "random" or "stable". + * This field replaces the deprecated "cloned-mac-address" on D-Bus, which + * can only contain explicit hardware addresses. Note that this property + * only exists in D-Bus API. libnm and nmcli continue to call this property + * "cloned-mac-address". + * ---end--- + */ _nm_properties_override_dbus(properties_override, "assigned-mac-address", &nm_sett_info_propert_type_assigned_mac_address); /** - * NMSettingWired:generate-mac-address-mask: - * - * With #NMSettingWired:cloned-mac-address setting "random" or "stable", - * by default all bits of the MAC address are scrambled and a locally-administered, - * unicast MAC address is created. This property allows to specify that certain bits - * are fixed. Note that the least significant bit of the first MAC address will - * always be unset to create a unicast MAC address. - * - * If the property is %NULL, it is eligible to be overwritten by a default - * connection setting. If the value is still %NULL or an empty string, the - * default is to create a locally-administered, unicast MAC address. - * - * If the value contains one MAC address, this address is used as mask. The set - * bits of the mask are to be filled with the current MAC address of the device, - * while the unset bits are subject to randomization. - * Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address - * and only randomize the lower 3 bytes using the "random" or "stable" algorithm. - * - * If the value contains one additional MAC address after the mask, - * this address is used instead of the current MAC address to fill the bits - * that shall not be randomized. For example, a value of - * "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address - * to 68:F7:28, while the lower bits are randomized. A value of - * "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled - * globally-administered, burned-in MAC address. - * - * If the value contains more than one additional MAC addresses, one of - * them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" - * will create a fully scrambled MAC address, randomly locally or globally - * administered. - **/ + * NMSettingWired:generate-mac-address-mask: + * + * With #NMSettingWired:cloned-mac-address setting "random" or "stable", + * by default all bits of the MAC address are scrambled and a locally-administered, + * unicast MAC address is created. This property allows to specify that certain bits + * are fixed. Note that the least significant bit of the first MAC address will + * always be unset to create a unicast MAC address. + * + * If the property is %NULL, it is eligible to be overwritten by a default + * connection setting. If the value is still %NULL or an empty string, the + * default is to create a locally-administered, unicast MAC address. + * + * If the value contains one MAC address, this address is used as mask. The set + * bits of the mask are to be filled with the current MAC address of the device, + * while the unset bits are subject to randomization. + * Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address + * and only randomize the lower 3 bytes using the "random" or "stable" algorithm. + * + * If the value contains one additional MAC address after the mask, + * this address is used instead of the current MAC address to fill the bits + * that shall not be randomized. For example, a value of + * "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address + * to 68:F7:28, while the lower bits are randomized. A value of + * "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled + * globally-administered, burned-in MAC address. + * + * If the value contains more than one additional MAC addresses, one of + * them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" + * will create a fully scrambled MAC address, randomly locally or globally + * administered. + **/ /* ---ifcfg-rh--- - * property: generate-mac-address-mask - * variable: GENERATE_MAC_ADDRESS_MASK(+) - * description: the MAC address mask for generating randomized and stable - * cloned-mac-address. - * ---end--- - */ + * property: generate-mac-address-mask + * variable: GENERATE_MAC_ADDRESS_MASK(+) + * description: the MAC address mask for generating randomized and stable + * cloned-mac-address. + * ---end--- + */ obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] = g_param_spec_string( NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, "", @@ -1479,27 +1479,27 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:mac-address-blacklist: - * - * If specified, this connection will never apply to the Ethernet device - * whose permanent MAC address matches an address in the list. Each MAC - * address is in the standard hex-digits-and-colons notation - * (00:11:22:33:44:55). - **/ + * NMSettingWired:mac-address-blacklist: + * + * If specified, this connection will never apply to the Ethernet device + * whose permanent MAC address matches an address in the list. Each MAC + * address is in the standard hex-digits-and-colons notation + * (00:11:22:33:44:55). + **/ /* ---keyfile--- - * property: mac-address-blacklist - * format: list of MACs (separated with semicolons) - * description: MAC address blacklist. - * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 - * ---end--- - * ---ifcfg-rh--- - * property: mac-address-blacklist - * variable: HWADDR_BLACKLIST(+) - * description: It denies usage of the connection for any device whose address - * is listed. - * example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55" - * ---end--- - */ + * property: mac-address-blacklist + * format: list of MACs (separated with semicolons) + * description: MAC address blacklist. + * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 + * ---end--- + * ---ifcfg-rh--- + * property: mac-address-blacklist + * variable: HWADDR_BLACKLIST(+) + * description: It denies usage of the connection for any device whose address + * is listed. + * example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55" + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS_BLACKLIST] = g_param_spec_boxed( NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", @@ -1508,17 +1508,17 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple Ethernet frames. - **/ + * NMSettingWired:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple Ethernet frames. + **/ /* ---ifcfg-rh--- - * property: mtu - * variable: MTU - * description: MTU of the interface. - * ---end--- - */ + * property: mtu + * variable: MTU + * description: MTU of the interface. + * ---end--- + */ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_WIRED_MTU, "", "", @@ -1529,23 +1529,23 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:s390-subchannels: - * - * Identifies specific subchannels that this network device uses for - * communication with z/VM or s390 host. Like the - * #NMSettingWired:mac-address property for non-z/VM devices, this property - * can be used to ensure this connection only applies to the network device - * that uses these subchannels. The list should contain exactly 3 strings, - * and each string may only be composed of hexadecimal characters and the - * period (.) character. - **/ + * NMSettingWired:s390-subchannels: + * + * Identifies specific subchannels that this network device uses for + * communication with z/VM or s390 host. Like the + * #NMSettingWired:mac-address property for non-z/VM devices, this property + * can be used to ensure this connection only applies to the network device + * that uses these subchannels. The list should contain exactly 3 strings, + * and each string may only be composed of hexadecimal characters and the + * period (.) character. + **/ /* ---ifcfg-rh--- - * property: s390-subchannels - * variable: SUBCHANNELS - * description: Subchannels for IBM S390 hosts. - * example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c - * ---end--- - */ + * property: s390-subchannels + * variable: SUBCHANNELS + * description: Subchannels for IBM S390 hosts. + * example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c + * ---end--- + */ obj_properties[PROP_S390_SUBCHANNELS] = g_param_spec_boxed( NM_SETTING_WIRED_S390_SUBCHANNELS, "", @@ -1554,19 +1554,19 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:s390-nettype: - * - * s390 network device type; one of "qeth", "lcs", or "ctc", representing - * the different types of virtual network devices available on s390 systems. - **/ + * NMSettingWired:s390-nettype: + * + * s390 network device type; one of "qeth", "lcs", or "ctc", representing + * the different types of virtual network devices available on s390 systems. + **/ /* ---ifcfg-rh--- - * property: s390-nettype - * variable: NETTYPE - * values: "qeth", "lcs" or "ctc" - * description: Network type of the S390 host. - * example: NETTYPE=qeth - * ---end--- - */ + * property: s390-nettype + * variable: NETTYPE + * values: "qeth", "lcs" or "ctc" + * description: Network type of the S390 host. + * example: NETTYPE=qeth + * ---end--- + */ obj_properties[PROP_S390_NETTYPE] = g_param_spec_string( NM_SETTING_WIRED_S390_NETTYPE, "", @@ -1575,20 +1575,20 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)): - * - * Dictionary of key/value pairs of s390-specific device options. Both keys - * and values must be strings. Allowed keys include "portno", "layer2", - * "portname", "protocol", among others. Key names must contain only - * alphanumeric characters (ie, [a-zA-Z0-9]). - **/ + * NMSettingWired:s390-options: (type GHashTable(utf8,utf8)): + * + * Dictionary of key/value pairs of s390-specific device options. Both keys + * and values must be strings. Allowed keys include "portno", "layer2", + * "portname", "protocol", among others. Key names must contain only + * alphanumeric characters (ie, [a-zA-Z0-9]). + **/ /* ---ifcfg-rh--- - * property: s390-options - * variable: OPTIONS and PORTNAME, CTCPROTO, - * description: S390 device options. All options go to OPTIONS, except for - * "portname" and "ctcprot" that have their own variables. - * ---end--- - */ + * property: s390-options + * variable: OPTIONS and PORTNAME, CTCPROTO, + * description: S390 device options. All options go to OPTIONS, except for + * "portname" and "ctcprot" that have their own variables. + * ---end--- + */ obj_properties[PROP_S390_OPTIONS] = g_param_spec_boxed( NM_SETTING_WIRED_S390_OPTIONS, "", @@ -1600,19 +1600,19 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) &nm_sett_info_propert_type_strdict); /** - * NMSettingWired:wake-on-lan: - * - * The #NMSettingWiredWakeOnLan options to enable. Not all devices support all options. - * May be any combination of %NM_SETTING_WIRED_WAKE_ON_LAN_PHY, - * %NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST, %NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST, - * %NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST, %NM_SETTING_WIRED_WAKE_ON_LAN_ARP, - * %NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC or the special values - * %NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (to use global settings) and - * %NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (to disable management of Wake-on-LAN in - * NetworkManager). - * - * Since: 1.2 - **/ + * NMSettingWired:wake-on-lan: + * + * The #NMSettingWiredWakeOnLan options to enable. Not all devices support all options. + * May be any combination of %NM_SETTING_WIRED_WAKE_ON_LAN_PHY, + * %NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST, %NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST, + * %NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST, %NM_SETTING_WIRED_WAKE_ON_LAN_ARP, + * %NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC or the special values + * %NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (to use global settings) and + * %NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (to disable management of Wake-on-LAN in + * NetworkManager). + * + * Since: 1.2 + **/ obj_properties[PROP_WAKE_ON_LAN] = g_param_spec_uint(NM_SETTING_WIRED_WAKE_ON_LAN, "", @@ -1623,14 +1623,14 @@ nm_setting_wired_class_init(NMSettingWiredClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWired:wake-on-lan-password: - * - * If specified, the password used with magic-packet-based - * Wake-on-LAN, represented as an Ethernet MAC address. If %NULL, - * no password will be required. - * - * Since: 1.2 - **/ + * NMSettingWired:wake-on-lan-password: + * + * If specified, the password used with magic-packet-based + * Wake-on-LAN, represented as an Ethernet MAC address. If %NULL, + * no password will be required. + * + * Since: 1.2 + **/ obj_properties[PROP_WAKE_ON_LAN_PASSWORD] = g_param_spec_string(NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, "", diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c index 0d2ce04d7b..23d4538189 100644 --- a/libnm-core/nm-setting-wireguard.c +++ b/libnm-core/nm-setting-wireguard.c @@ -578,8 +578,8 @@ nm_wireguard_peer_get_allowed_ip(const NMWireGuardPeer *self, guint idx, gboolea const char *s; /* With LTO, the compiler might warn about the g_return_val_if_fail() - * code path not initializing the output argument. Workaround that by - * always setting the out argument. */ + * code path not initializing the output argument. Workaround that by + * always setting the out argument. */ NM_SET_OUT(out_is_valid, FALSE); g_return_val_if_fail(NM_IS_WIREGUARD_PEER(self, TRUE), NULL); @@ -624,7 +624,7 @@ _peer_append_allowed_ip(NMWireGuardPeer *self, const char *allowed_ip, gboolean nm_assert(allowed_ip); /* normalize the address (if it is valid. Otherwise, take it - * as-is (it will render the instance invalid). */ + * as-is (it will render the instance invalid). */ if (!nm_utils_parse_inaddr_prefix_bin(AF_UNSPEC, allowed_ip, &addr_family, &addrbin, &prefix)) { if (!accept_invalid) return FALSE; @@ -831,7 +831,7 @@ nm_wireguard_peer_cmp(const NMWireGuardPeer *a, NM_CMP_SELF(a, b); /* regardless of the @compare_flags, the public-key is the ID of the peer. It must - * always be compared. */ + * always be compared. */ NM_CMP_FIELD_BOOL(a, b, public_key_valid); NM_CMP_FIELD_STR0(a, b, public_key); @@ -1665,8 +1665,8 @@ _peers_dbus_only_set(NMSetting * setting, } /* we could easily reject duplicate peers (by public-key) or duplicate GVariant attributes. - * However, don't do that. In case of duplicate values, the latter peer overwrite the earlier - * and GVariant attributes are ignored by g_variant_lookup() above. */ + * However, don't do that. In case of duplicate values, the latter peer overwrite the earlier + * and GVariant attributes are ignored by g_variant_lookup() above. */ if (_peers_append(NM_SETTING_WIREGUARD_GET_PRIVATE(setting), peer, TRUE)) peers_changed = TRUE; } @@ -1717,8 +1717,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) const char * method; /* WireGuard is Layer 3 only. For the moment, we only support a restricted set of - * IP methods. We may relax that later, once we fix the implementations so they - * actually work. */ + * IP methods. We may relax that later, once we fix the implementations so they + * actually work. */ if ((s_ip4 = nm_connection_get_setting_ip4_config(connection)) && (method = nm_setting_ip_config_get_method(s_ip4)) @@ -1957,8 +1957,8 @@ update_one_secret(NMSetting *setting, const char *key, GVariant *value, GError * if (!g_variant_lookup(peer_var, NM_WIREGUARD_PEER_ATTR_PRESHARED_KEY, "&s", &cstr)) { /* no preshared-key. Ignore the rest. - * - * In particular, we don't reject all unknown fields. */ + * + * In particular, we don't reject all unknown fields. */ continue; } @@ -2032,7 +2032,7 @@ duplicate_copy_properties(const NMSettInfoSetting *sett_info, NMSetting *src, NM ->duplicate_copy_properties(sett_info, src, dst); /* We don't bother comparing the existing peers with what we are about to set. - * Always reset all. */ + * Always reset all. */ if (_peers_clear(priv_dst) > 0) peers_changed = TRUE; for (i = 0; i < priv_src->peers_arr->len; i++) { @@ -2203,7 +2203,7 @@ for_each_secret(NMSetting * setting, if (!g_variant_is_of_type(data_val, G_VARIANT_TYPE("aa{sv}"))) { /* invalid type. Silently ignore content as we cannot find secret-keys - * here. */ + * here. */ return; } @@ -2242,7 +2242,7 @@ for_each_secret(NMSetting * setting, if (pd && preshared_key) { /* without specifying a public-key of an existing peer, the secret is - * ignored. */ + * ignored. */ secret_flags = nm_wireguard_peer_get_preshared_key_flags(pd->peer); if (callback(secret_flags, callback_data)) g_variant_builder_add(&peer_builder, @@ -2415,12 +2415,12 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) setting_class->for_each_secret = for_each_secret; /** - * NMSettingWireGuard:private-key: - * - * The 256 bit private-key in base64 encoding. - * - * Since: 1.16 - **/ + * NMSettingWireGuard:private-key: + * + * The 256 bit private-key in base64 encoding. + * + * Since: 1.16 + **/ obj_properties[PROP_PRIVATE_KEY] = g_param_spec_string(NM_SETTING_WIREGUARD_PRIVATE_KEY, "", @@ -2429,13 +2429,13 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:private-key-flags: - * - * Flags indicating how to handle the #NMSettingWirelessSecurity:private-key - * property. - * - * Since: 1.16 - **/ + * NMSettingWireGuard:private-key-flags: + * + * Flags indicating how to handle the #NMSettingWirelessSecurity:private-key + * property. + * + * Since: 1.16 + **/ obj_properties[PROP_PRIVATE_KEY_FLAGS] = g_param_spec_flags(NM_SETTING_WIREGUARD_PRIVATE_KEY_FLAGS, "", @@ -2445,16 +2445,16 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:fwmark: - * - * The use of fwmark is optional and is by default off. Setting it to 0 - * disables it. Otherwise, it is a 32-bit fwmark for outgoing packets. - * - * Note that "ip4-auto-default-route" or "ip6-auto-default-route" enabled, - * implies to automatically choose a fwmark. - * - * Since: 1.16 - **/ + * NMSettingWireGuard:fwmark: + * + * The use of fwmark is optional and is by default off. Setting it to 0 + * disables it. Otherwise, it is a 32-bit fwmark for outgoing packets. + * + * Note that "ip4-auto-default-route" or "ip6-auto-default-route" enabled, + * implies to automatically choose a fwmark. + * + * Since: 1.16 + **/ obj_properties[PROP_FWMARK] = g_param_spec_uint(NM_SETTING_WIREGUARD_FWMARK, "", @@ -2465,13 +2465,13 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:listen-port: - * - * The listen-port. If listen-port is not specified, the port will be chosen - * randomly when the interface comes up. - * - * Since: 1.16 - **/ + * NMSettingWireGuard:listen-port: + * + * The listen-port. If listen-port is not specified, the port will be chosen + * randomly when the interface comes up. + * + * Since: 1.16 + **/ obj_properties[PROP_LISTEN_PORT] = g_param_spec_uint(NM_SETTING_WIREGUARD_LISTEN_PORT, "", @@ -2482,22 +2482,22 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:peer-routes: - * - * Whether to automatically add routes for the AllowedIPs ranges - * of the peers. If %TRUE (the default), NetworkManager will automatically - * add routes in the routing tables according to ipv4.route-table and - * ipv6.route-table. Usually you want this automatism enabled. - * If %FALSE, no such routes are added automatically. In this case, the - * user may want to configure static routes in ipv4.routes and ipv6.routes, - * respectively. - * - * Note that if the peer's AllowedIPs is "0.0.0.0/0" or "::/0" and the profile's - * ipv4.never-default or ipv6.never-default setting is enabled, the peer route for - * this peer won't be added automatically. - * - * Since: 1.16 - **/ + * NMSettingWireGuard:peer-routes: + * + * Whether to automatically add routes for the AllowedIPs ranges + * of the peers. If %TRUE (the default), NetworkManager will automatically + * add routes in the routing tables according to ipv4.route-table and + * ipv6.route-table. Usually you want this automatism enabled. + * If %FALSE, no such routes are added automatically. In this case, the + * user may want to configure static routes in ipv4.routes and ipv6.routes, + * respectively. + * + * Note that if the peer's AllowedIPs is "0.0.0.0/0" or "::/0" and the profile's + * ipv4.never-default or ipv6.never-default setting is enabled, the peer route for + * this peer won't be added automatically. + * + * Since: 1.16 + **/ obj_properties[PROP_PEER_ROUTES] = g_param_spec_boolean( NM_SETTING_WIREGUARD_PEER_ROUTES, "", @@ -2506,17 +2506,17 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple fragments. - * - * If zero a default MTU is used. Note that contrary to wg-quick's MTU - * setting, this does not take into account the current routes at the - * time of activation. - * - * Since: 1.16 - **/ + * NMSettingWireGuard:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple fragments. + * + * If zero a default MTU is used. Note that contrary to wg-quick's MTU + * setting, this does not take into account the current routes at the + * time of activation. + * + * Since: 1.16 + **/ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_WIREGUARD_MTU, "", @@ -2527,25 +2527,25 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:ip4-auto-default-route: - * - * Whether to enable special handling of the IPv4 default route. - * If enabled, the IPv4 default route from wireguard.peer-routes - * will be placed to a dedicated routing-table and two policy routing rules - * will be added. The fwmark number is also used as routing-table for the default-route, - * and if fwmark is zero, an unused fwmark/table is chosen automatically. - * This corresponds to what wg-quick does with Table=auto and what WireGuard - * calls "Improved Rule-based Routing". - * - * Note that for this automatism to work, you usually don't want to set - * ipv4.gateway, because that will result in a conflicting default route. - * - * Leaving this at the default will enable this option automatically - * if ipv4.never-default is not set and there are any peers that use - * a default-route as allowed-ips. - * - * Since: 1.20 - **/ + * NMSettingWireGuard:ip4-auto-default-route: + * + * Whether to enable special handling of the IPv4 default route. + * If enabled, the IPv4 default route from wireguard.peer-routes + * will be placed to a dedicated routing-table and two policy routing rules + * will be added. The fwmark number is also used as routing-table for the default-route, + * and if fwmark is zero, an unused fwmark/table is chosen automatically. + * This corresponds to what wg-quick does with Table=auto and what WireGuard + * calls "Improved Rule-based Routing". + * + * Note that for this automatism to work, you usually don't want to set + * ipv4.gateway, because that will result in a conflicting default route. + * + * Leaving this at the default will enable this option automatically + * if ipv4.never-default is not set and there are any peers that use + * a default-route as allowed-ips. + * + * Since: 1.20 + **/ obj_properties[PROP_IP4_AUTO_DEFAULT_ROUTE] = g_param_spec_enum( NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE, "", @@ -2555,12 +2555,12 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireGuard:ip6-auto-default-route: - * - * Like ip4-auto-default-route, but for the IPv6 default route. - * - * Since: 1.20 - **/ + * NMSettingWireGuard:ip6-auto-default-route: + * + * Like ip4-auto-default-route, but for the IPv6 default route. + * + * Since: 1.20 + **/ obj_properties[PROP_IP6_AUTO_DEFAULT_ROUTE] = g_param_spec_enum( NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE, "", @@ -2570,11 +2570,11 @@ nm_setting_wireguard_class_init(NMSettingWireGuardClass *klass) NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /* ---dbus--- - * property: peers - * format: array of 'a{sv}' - * description: Array of dictionaries for the WireGuard peers. - * ---end--- - */ + * property: peers + * format: array of 'a{sv}' + * description: Array of dictionaries for the WireGuard peers. + * ---end--- + */ _nm_properties_override_dbus( properties_override, NM_SETTING_WIREGUARD_PEERS, diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index 87f669fa4d..0e1acf9a81 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -1206,7 +1206,7 @@ get_secret_flags(NMSetting * setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3)) { /* There's only one 'flags' property for WEP keys, so alias all the WEP key - * property names to that flags property. */ + * property names to that flags property. */ nm_assert(_nm_setting_property_is_regular_secret(setting, secret_name)); nm_assert(_nm_setting_property_is_regular_secret_flags( setting, @@ -1233,7 +1233,7 @@ set_secret_flags(NMSetting * setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, NM_SETTING_WIRELESS_SECURITY_WEP_KEY3)) { /* There's only one 'flags' property for WEP keys, so alias all the WEP key - * property names to that flags property. */ + * property names to that flags property. */ nm_assert(_nm_setting_property_is_regular_secret(setting, secret_name)); nm_assert(_nm_setting_property_is_regular_secret_flags( setting, @@ -1491,21 +1491,21 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) setting_class->set_secret_flags = set_secret_flags; /** - * NMSettingWirelessSecurity:key-mgmt: - * - * Key management used for the connection. One of "none" (WEP), - * "ieee8021x" (Dynamic WEP), "wpa-psk" (infrastructure WPA-PSK), "sae" - * (SAE), "owe" (Opportunistic Wireless Encryption) or "wpa-eap" - * (WPA-Enterprise). This property must be set for - * any Wi-Fi connection that uses security. - **/ + * NMSettingWirelessSecurity:key-mgmt: + * + * Key management used for the connection. One of "none" (WEP), + * "ieee8021x" (Dynamic WEP), "wpa-psk" (infrastructure WPA-PSK), "sae" + * (SAE), "owe" (Opportunistic Wireless Encryption) or "wpa-eap" + * (WPA-Enterprise). This property must be set for + * any Wi-Fi connection that uses security. + **/ /* ---ifcfg-rh--- - * property: key-mgmt - * variable: KEY_MGMT(+) - * values: IEEE8021X, WPA-PSK, WPA-EAP - * description: Key management menthod. - * ---end--- - */ + * property: key-mgmt + * variable: KEY_MGMT(+) + * values: IEEE8021X, WPA-PSK, WPA-EAP + * description: Key management menthod. + * ---end--- + */ obj_properties[PROP_KEY_MGMT] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", @@ -1514,21 +1514,21 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_REQUIRED | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-tx-keyidx: - * - * When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key - * index is used by the AP, put that WEP key index here. Valid values are 0 - * (default key) through 3. Note that some consumer access points (like the - * Linksys WRT54G) number the keys 1 - 4. - **/ + * NMSettingWirelessSecurity:wep-tx-keyidx: + * + * When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key + * index is used by the AP, put that WEP key index here. Valid values are 0 + * (default key) through 3. Note that some consumer access points (like the + * Linksys WRT54G) number the keys 1 - 4. + **/ /* ---ifcfg-rh--- - * property: wep-tx-keyidx - * variable: DEFAULTKEY - * values: 1, 2, 3, 4 - * default: 1 - * description: Index of active WEP key. - * ---end--- - */ + * property: wep-tx-keyidx + * variable: DEFAULTKEY + * values: 1, 2, 3, 4 + * default: 1 + * description: Index of active WEP key. + * ---end--- + */ obj_properties[PROP_WEP_TX_KEYIDX] = g_param_spec_uint(NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", @@ -1539,21 +1539,21 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:auth-alg: - * - * When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the - * 802.11 authentication algorithm required by the AP here. One of "open" - * for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP. When - * using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the - * "leap-username" and "leap-password" properties must be specified. - **/ + * NMSettingWirelessSecurity:auth-alg: + * + * When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the + * 802.11 authentication algorithm required by the AP here. One of "open" + * for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP. When + * using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the + * "leap-username" and "leap-password" properties must be specified. + **/ /* ---ifcfg-rh--- - * property: auth-alg - * variable: SECURITYMODE(+) - * values: restricted, open, leap - * description: Authentication algorithm for WEP. - * ---end--- - */ + * property: auth-alg + * variable: SECURITYMODE(+) + * values: restricted, open, leap + * description: Authentication algorithm for WEP. + * ---end--- + */ obj_properties[PROP_AUTH_ALG] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "", @@ -1561,20 +1561,20 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:proto: - * - * List of strings specifying the allowed WPA protocol versions to use. - * Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN). If - * not specified, both WPA and RSN connections are allowed. - **/ + * NMSettingWirelessSecurity:proto: + * + * List of strings specifying the allowed WPA protocol versions to use. + * Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN). If + * not specified, both WPA and RSN connections are allowed. + **/ /* ---ifcfg-rh--- - * property: proto - * variable: WPA_ALLOW_WPA(+), WPA_ALLOW_WPA2(+) - * values: yes, no - * default: no - * description: Allowed WPA protocols, WPA and WPA2 (RSN). - * ---end--- - */ + * property: proto + * variable: WPA_ALLOW_WPA(+), WPA_ALLOW_WPA2(+) + * values: yes, no + * default: no + * description: Allowed WPA protocols, WPA and WPA2 (RSN). + * ---end--- + */ obj_properties[PROP_PROTO] = g_param_spec_boxed(NM_SETTING_WIRELESS_SECURITY_PROTO, "", "", @@ -1582,21 +1582,21 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:pairwise: - * - * A list of pairwise encryption algorithms which prevents connections to - * Wi-Fi networks that do not utilize one of the algorithms in the list. - * For maximum compatibility leave this property empty. Each list element - * may be one of "tkip" or "ccmp". - **/ + * NMSettingWirelessSecurity:pairwise: + * + * A list of pairwise encryption algorithms which prevents connections to + * Wi-Fi networks that do not utilize one of the algorithms in the list. + * For maximum compatibility leave this property empty. Each list element + * may be one of "tkip" or "ccmp". + **/ /* ---ifcfg-rh--- - * property: pairwise - * variable: CIPHER_PAIRWISE(+) - * values: CCMP, TKIP - * description: Restrict pairwise encryption algorithms, specified as a space - * separated list. - * ---end--- - */ + * property: pairwise + * variable: CIPHER_PAIRWISE(+) + * values: CCMP, TKIP + * description: Restrict pairwise encryption algorithms, specified as a space + * separated list. + * ---end--- + */ obj_properties[PROP_PAIRWISE] = g_param_spec_boxed(NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "", @@ -1604,21 +1604,21 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:group: - * - * A list of group/broadcast encryption algorithms which prevents - * connections to Wi-Fi networks that do not utilize one of the algorithms - * in the list. For maximum compatibility leave this property empty. Each - * list element may be one of "wep40", "wep104", "tkip", or "ccmp". - **/ + * NMSettingWirelessSecurity:group: + * + * A list of group/broadcast encryption algorithms which prevents + * connections to Wi-Fi networks that do not utilize one of the algorithms + * in the list. For maximum compatibility leave this property empty. Each + * list element may be one of "wep40", "wep104", "tkip", or "ccmp". + **/ /* ---ifcfg-rh--- - * property: group - * variable: CIPHER_GROUP(+) - * values: CCMP, TKIP, WEP40, WEP104 - * description: Restrict group/broadcast encryption algorithms, specified as a space - * separated list. - * ---end--- - */ + * property: group + * variable: CIPHER_GROUP(+) + * values: CCMP, TKIP, WEP40, WEP104 + * description: Restrict group/broadcast encryption algorithms, specified as a space + * separated list. + * ---end--- + */ obj_properties[PROP_GROUP] = g_param_spec_boxed(NM_SETTING_WIRELESS_SECURITY_GROUP, "", "", @@ -1626,27 +1626,27 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:pmf: - * - * Indicates whether Protected Management Frames (802.11w) must be enabled - * for the connection. One of %NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT - * (use global default value), %NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE - * (disable PMF), %NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (enable PMF if - * the supplicant and the access point support it) or - * %NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (enable PMF and fail if not - * supported). When set to %NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT and no - * global default is set, PMF will be optionally enabled. - * - * Since: 1.10 - **/ + * NMSettingWirelessSecurity:pmf: + * + * Indicates whether Protected Management Frames (802.11w) must be enabled + * for the connection. One of %NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT + * (use global default value), %NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE + * (disable PMF), %NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL (enable PMF if + * the supplicant and the access point support it) or + * %NM_SETTING_WIRELESS_SECURITY_PMF_REQUIRED (enable PMF and fail if not + * supported). When set to %NM_SETTING_WIRELESS_SECURITY_PMF_DEFAULT and no + * global default is set, PMF will be optionally enabled. + * + * Since: 1.10 + **/ /* ---ifcfg-rh--- - * property: pmf - * variable: PMF(+) - * values: default, disable, optional, required - * description: Enables or disables PMF (802.11w) - * example: PMF=required - * ---end--- - */ + * property: pmf + * variable: PMF(+) + * values: default, disable, optional, required + * description: Enables or disables PMF (802.11w) + * example: PMF=required + * ---end--- + */ obj_properties[PROP_PMF] = g_param_spec_int(NM_SETTING_WIRELESS_SECURITY_PMF, "", "", @@ -1657,17 +1657,17 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:leap-username: - * - * The login username for legacy LEAP connections (ie, key-mgmt = - * "ieee8021x" and auth-alg = "leap"). - **/ + * NMSettingWirelessSecurity:leap-username: + * + * The login username for legacy LEAP connections (ie, key-mgmt = + * "ieee8021x" and auth-alg = "leap"). + **/ /* ---ifcfg-rh--- - * property: leap-username - * variable: IEEE_8021X_IDENTITY(+) - * description: Login name for LEAP. - * ---end--- - */ + * property: leap-username + * variable: IEEE_8021X_IDENTITY(+) + * description: Login name for LEAP. + * ---end--- + */ obj_properties[PROP_LEAP_USERNAME] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", @@ -1676,17 +1676,17 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-key0: - * - * Index 0 WEP key. This is the WEP key used in most networks. See the - * "wep-key-type" property for a description of how this key is interpreted. - **/ + * NMSettingWirelessSecurity:wep-key0: + * + * Index 0 WEP key. This is the WEP key used in most networks. See the + * "wep-key-type" property for a description of how this key is interpreted. + **/ /* ---ifcfg-rh--- - * property: wep-key0 - * variable: KEY1, KEY_PASSPHRASE1(+) - * description: The first WEP key (used in most networks). See also DEFAULTKEY for key index. - * ---end--- - */ + * property: wep-key0 + * variable: KEY1, KEY_PASSPHRASE1(+) + * description: The first WEP key (used in most networks). See also DEFAULTKEY for key index. + * ---end--- + */ obj_properties[PROP_WEP_KEY0] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", @@ -1695,17 +1695,17 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-key1: - * - * Index 1 WEP key. This WEP index is not used by most networks. See the - * "wep-key-type" property for a description of how this key is interpreted. - **/ + * NMSettingWirelessSecurity:wep-key1: + * + * Index 1 WEP key. This WEP index is not used by most networks. See the + * "wep-key-type" property for a description of how this key is interpreted. + **/ /* ---ifcfg-rh--- - * property: wep-key1 - * variable: KEY2, KEY_PASSPHRASE2(+) - * description: WEP key with index 1. See also DEFAULTKEY for key index. - * ---end--- - */ + * property: wep-key1 + * variable: KEY2, KEY_PASSPHRASE2(+) + * description: WEP key with index 1. See also DEFAULTKEY for key index. + * ---end--- + */ obj_properties[PROP_WEP_KEY1] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", @@ -1714,17 +1714,17 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-key2: - * - * Index 2 WEP key. This WEP index is not used by most networks. See the - * "wep-key-type" property for a description of how this key is interpreted. - **/ + * NMSettingWirelessSecurity:wep-key2: + * + * Index 2 WEP key. This WEP index is not used by most networks. See the + * "wep-key-type" property for a description of how this key is interpreted. + **/ /* ---ifcfg-rh--- - * property: wep-key2 - * variable: KEY3, KEY_PASSPHRASE3(+) - * description: WEP key with index 2. See also DEFAULTKEY for key index. - * ---end--- - */ + * property: wep-key2 + * variable: KEY3, KEY_PASSPHRASE3(+) + * description: WEP key with index 2. See also DEFAULTKEY for key index. + * ---end--- + */ obj_properties[PROP_WEP_KEY2] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", @@ -1733,17 +1733,17 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-key3: - * - * Index 3 WEP key. This WEP index is not used by most networks. See the - * "wep-key-type" property for a description of how this key is interpreted. - **/ + * NMSettingWirelessSecurity:wep-key3: + * + * Index 3 WEP key. This WEP index is not used by most networks. See the + * "wep-key-type" property for a description of how this key is interpreted. + **/ /* ---ifcfg-rh--- - * property: wep-key3 - * variable: KEY4, KEY_PASSPHRASE4(+) - * description: WEP key with index 3. See also DEFAULTKEY for key index. - * ---end--- - */ + * property: wep-key3 + * variable: KEY4, KEY_PASSPHRASE4(+) + * description: WEP key with index 3. See also DEFAULTKEY for key index. + * ---end--- + */ obj_properties[PROP_WEP_KEY3] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", @@ -1752,19 +1752,19 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-key-flags: - * - * Flags indicating how to handle the #NMSettingWirelessSecurity:wep-key0, - * #NMSettingWirelessSecurity:wep-key1, #NMSettingWirelessSecurity:wep-key2, - * and #NMSettingWirelessSecurity:wep-key3 properties. - **/ + * NMSettingWirelessSecurity:wep-key-flags: + * + * Flags indicating how to handle the #NMSettingWirelessSecurity:wep-key0, + * #NMSettingWirelessSecurity:wep-key1, #NMSettingWirelessSecurity:wep-key2, + * and #NMSettingWirelessSecurity:wep-key3 properties. + **/ /* ---ifcfg-rh--- - * property: wep-key-flags - * variable: WEP_KEY_FLAGS(+) - * format: NMSettingSecretFlags - * description: Password flags for KEY<i>, KEY_PASSPHRASE<i> password. - * ---end--- - */ + * property: wep-key-flags + * variable: WEP_KEY_FLAGS(+) + * format: NMSettingSecretFlags + * description: Password flags for KEY<i>, KEY_PASSPHRASE<i> password. + * ---end--- + */ obj_properties[PROP_WEP_KEY_FLAGS] = g_param_spec_flags(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", @@ -1774,20 +1774,20 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:psk: - * - * Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII - * passphrase of 8 to 63 characters that is (as specified in the 802.11i - * standard) hashed to derive the actual key, or the key in form of 64 - * hexadecimal character. The WPA3-Personal networks use a passphrase - * of any length for SAE authentication. - **/ + * NMSettingWirelessSecurity:psk: + * + * Pre-Shared-Key for WPA networks. For WPA-PSK, it's either an ASCII + * passphrase of 8 to 63 characters that is (as specified in the 802.11i + * standard) hashed to derive the actual key, or the key in form of 64 + * hexadecimal character. The WPA3-Personal networks use a passphrase + * of any length for SAE authentication. + **/ /* ---ifcfg-rh--- - * property: psk - * variable: WPA_PSK - * description: Pre-Shared-Key for WPA networks. - * ---end--- - */ + * property: psk + * variable: WPA_PSK + * description: Pre-Shared-Key for WPA networks. + * ---end--- + */ obj_properties[PROP_PSK] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_PSK, "", @@ -1796,19 +1796,19 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:psk-flags: - * - * Flags indicating how to handle the #NMSettingWirelessSecurity:psk - * property. - **/ + * NMSettingWirelessSecurity:psk-flags: + * + * Flags indicating how to handle the #NMSettingWirelessSecurity:psk + * property. + **/ /* ---ifcfg-rh--- - * property: psk-flags - * variable: WPA_PSK_FLAGS(+) - * format: NMSettingSecretFlags - * description: Password flags for WPA_PSK_FLAGS. - * example: WPA_PSK_FLAGS=user - * ---end--- - */ + * property: psk-flags + * variable: WPA_PSK_FLAGS(+) + * format: NMSettingSecretFlags + * description: Password flags for WPA_PSK_FLAGS. + * example: WPA_PSK_FLAGS=user + * ---end--- + */ obj_properties[PROP_PSK_FLAGS] = g_param_spec_flags(NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "", @@ -1817,18 +1817,18 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:leap-password: - * - * The login password for legacy LEAP connections (ie, key-mgmt = - * "ieee8021x" and auth-alg = "leap"). - **/ + * NMSettingWirelessSecurity:leap-password: + * + * The login password for legacy LEAP connections (ie, key-mgmt = + * "ieee8021x" and auth-alg = "leap"). + **/ /* ---ifcfg-rh--- - * property: leap-password - * variable: IEEE_8021X_PASSWORD(+) - * description: Password for LEAP. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ + * property: leap-password + * variable: IEEE_8021X_PASSWORD(+) + * description: Password for LEAP. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ obj_properties[PROP_LEAP_PASSWORD] = g_param_spec_string(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", @@ -1837,18 +1837,18 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_SECRET | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:leap-password-flags: - * - * Flags indicating how to handle the - * #NMSettingWirelessSecurity:leap-password property. - **/ + * NMSettingWirelessSecurity:leap-password-flags: + * + * Flags indicating how to handle the + * #NMSettingWirelessSecurity:leap-password property. + **/ /* ---ifcfg-rh--- - * property: leap-password-flags - * variable: IEEE_8021X_PASSWORD_FLAGS(+) - * format: NMSettingSecretFlags - * description: Password flags for IEEE_8021X_PASSWORD_FLAGS. - * ---end--- - */ + * property: leap-password-flags + * variable: IEEE_8021X_PASSWORD_FLAGS(+) + * format: NMSettingSecretFlags + * description: Password flags for IEEE_8021X_PASSWORD_FLAGS. + * ---end--- + */ obj_properties[PROP_LEAP_PASSWORD_FLAGS] = g_param_spec_flags(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", @@ -1858,25 +1858,25 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:wep-key-type: - * - * Controls the interpretation of WEP keys. Allowed values are - * %NM_WEP_KEY_TYPE_KEY, in which case the key is either a 10- or - * 26-character hexadecimal string, or a 5- or 13-character ASCII password; - * or %NM_WEP_KEY_TYPE_PASSPHRASE, in which case the passphrase is provided - * as a string and will be hashed using the de-facto MD5 method to derive - * the actual WEP key. - **/ + * NMSettingWirelessSecurity:wep-key-type: + * + * Controls the interpretation of WEP keys. Allowed values are + * %NM_WEP_KEY_TYPE_KEY, in which case the key is either a 10- or + * 26-character hexadecimal string, or a 5- or 13-character ASCII password; + * or %NM_WEP_KEY_TYPE_PASSPHRASE, in which case the passphrase is provided + * as a string and will be hashed using the de-facto MD5 method to derive + * the actual WEP key. + **/ /* ---ifcfg-rh--- - * property: wep-key-type - * variable: KEY<i> or KEY_PASSPHRASE<i>(+); KEY_TYPE(+) - * description: KEY is used for "key" type (10 or 26 hexadecimal characters, - * or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used - * for WEP passphrases. KEY_TYPE specifies the key type and can be either - * 'key' or 'passphrase'. KEY_TYPE is redundant and can be omitted. - * example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey - * ---end--- - */ + * property: wep-key-type + * variable: KEY<i> or KEY_PASSPHRASE<i>(+); KEY_TYPE(+) + * description: KEY is used for "key" type (10 or 26 hexadecimal characters, + * or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used + * for WEP passphrases. KEY_TYPE specifies the key type and can be either + * 'key' or 'passphrase'. KEY_TYPE is redundant and can be omitted. + * example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey + * ---end--- + */ obj_properties[PROP_WEP_KEY_TYPE] = g_param_spec_enum(NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", @@ -1891,27 +1891,27 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) .gprop_to_dbus_fcn = wep_key_type_to_dbus, )); /** - * NMSettingWirelessSecurity:wps-method: - * - * Flags indicating which mode of WPS is to be used if any. - * - * There's little point in changing the default setting as NetworkManager will - * automatically determine whether it's feasible to start WPS enrollment from - * the Access Point capabilities. - * - * WPS can be disabled by setting this property to a value of 1. - * - * Since: 1.10 - **/ + * NMSettingWirelessSecurity:wps-method: + * + * Flags indicating which mode of WPS is to be used if any. + * + * There's little point in changing the default setting as NetworkManager will + * automatically determine whether it's feasible to start WPS enrollment from + * the Access Point capabilities. + * + * WPS can be disabled by setting this property to a value of 1. + * + * Since: 1.10 + **/ /* ---ifcfg-rh--- - * property: wps-method - * variable: WPS_METHOD - * description: Used to control the WPS methods to be used - * Valid values are "default", "auto", "disabled", "pin" and "pbc". - * If omitted, whatver the AP announces is used. - * example: WPS_METHOD=disabled, WPS_METHOD="pin pbc" - * ---end--- - */ + * property: wps-method + * variable: WPS_METHOD + * description: Used to control the WPS methods to be used + * Valid values are "default", "auto", "disabled", "pin" and "pbc". + * If omitted, whatver the AP announces is used. + * example: WPS_METHOD=disabled, WPS_METHOD="pin pbc" + * ---end--- + */ obj_properties[PROP_WPS_METHOD] = g_param_spec_uint( NM_SETTING_WIRELESS_SECURITY_WPS_METHOD, "", @@ -1922,27 +1922,27 @@ nm_setting_wireless_security_class_init(NMSettingWirelessSecurityClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWirelessSecurity:fils: - * - * Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for - * the connection. One of %NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (use - * global default value), %NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE - * (disable FILS), %NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (enable FILS - * if the supplicant and the access point support it) or - * %NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (enable FILS and fail if not - * supported). When set to %NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT and - * no global default is set, FILS will be optionally enabled. - * - * Since: 1.12 - **/ + * NMSettingWirelessSecurity:fils: + * + * Indicates whether Fast Initial Link Setup (802.11ai) must be enabled for + * the connection. One of %NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT (use + * global default value), %NM_SETTING_WIRELESS_SECURITY_FILS_DISABLE + * (disable FILS), %NM_SETTING_WIRELESS_SECURITY_FILS_OPTIONAL (enable FILS + * if the supplicant and the access point support it) or + * %NM_SETTING_WIRELESS_SECURITY_FILS_REQUIRED (enable FILS and fail if not + * supported). When set to %NM_SETTING_WIRELESS_SECURITY_FILS_DEFAULT and + * no global default is set, FILS will be optionally enabled. + * + * Since: 1.12 + **/ /* ---ifcfg-rh--- - * property: fils - * variable: FILS(+) - * values: default, disable, optional, required - * description: Enables or disables FILS (802.11ai) - * example: FILS=required - * ---end--- - */ + * property: fils + * variable: FILS(+) + * values: default, disable, optional, required + * description: Enables or disables FILS (802.11ai) + * example: FILS=required + * ---end--- + */ obj_properties[PROP_FILS] = g_param_spec_int(NM_SETTING_WIRELESS_SECURITY_FILS, "", "", diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index 384a6f2871..2c56bf209c 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -166,15 +166,15 @@ nm_setting_wireless_ap_security_compatible(NMSettingWireless * s_wireless return FALSE; /* quick check; can't use AP if it doesn't support at least one - * WEP cipher in both pairwise and group suites. - */ + * WEP cipher in both pairwise and group suites. + */ if (!(ap_wpa & (NM_802_11_AP_SEC_PAIR_WEP40 | NM_802_11_AP_SEC_PAIR_WEP104)) || !(ap_wpa & (NM_802_11_AP_SEC_GROUP_WEP40 | NM_802_11_AP_SEC_GROUP_WEP104))) return FALSE; /* Match at least one pairwise cipher with AP's capability if the - * wireless-security setting explicitly lists pairwise ciphers - */ + * wireless-security setting explicitly lists pairwise ciphers + */ num = nm_setting_wireless_security_get_num_pairwise(s_wireless_sec); for (i = 0, found = FALSE; i < num; i++) { cipher = nm_setting_wireless_security_get_pairwise(s_wireless_sec, i); @@ -195,8 +195,8 @@ nm_setting_wireless_ap_security_compatible(NMSettingWireless * s_wireless return FALSE; /* Match at least one group cipher with AP's capability if the - * wireless-security setting explicitly lists group ciphers - */ + * wireless-security setting explicitly lists group ciphers + */ num = nm_setting_wireless_security_get_num_groups(s_wireless_sec); for (i = 0, found = FALSE; i < num; i++) { cipher = nm_setting_wireless_security_get_group(s_wireless_sec, i); @@ -247,8 +247,8 @@ nm_setting_wireless_ap_security_compatible(NMSettingWireless * s_wireless // the AP's RSN IE instead /* Match at least one pairwise cipher with AP's capability if the - * wireless-security setting explicitly lists pairwise ciphers - */ + * wireless-security setting explicitly lists pairwise ciphers + */ num = nm_setting_wireless_security_get_num_pairwise(s_wireless_sec); for (i = 0, found = FALSE; i < num; i++) { cipher = nm_setting_wireless_security_get_pairwise(s_wireless_sec, i); @@ -261,8 +261,8 @@ nm_setting_wireless_ap_security_compatible(NMSettingWireless * s_wireless return FALSE; /* Match at least one group cipher with AP's capability if the - * wireless-security setting explicitly lists group ciphers - */ + * wireless-security setting explicitly lists group ciphers + */ num = nm_setting_wireless_security_get_num_groups(s_wireless_sec); for (i = 0, found = FALSE; i < num; i++) { cipher = nm_setting_wireless_security_get_group(s_wireless_sec, i); @@ -915,8 +915,8 @@ verify(NMSetting *setting, NMConnection *connection, GError **error) } /* generate-mac-address-mask only makes sense with cloned-mac-address "random" or - * "stable". Still, let's not be so strict about that and accept the value - * even if it is unused. */ + * "stable". Still, let's not be so strict about that and accept the value + * even if it is unused. */ if (!_nm_utils_generate_mac_address_mask_parse(priv->generate_mac_address_mask, NULL, NULL, @@ -1236,7 +1236,7 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps _nm_utils_hwaddr_canonical_or_invalid(g_value_get_string(value), ETH_ALEN); if (bool_val && !priv->cloned_mac_address) { /* cloned-mac-address was set before but was now explicitly cleared. - * In this case, we also clear mac-address-randomization flag */ + * In this case, we also clear mac-address-randomization flag */ if (priv->mac_address_randomization != NM_SETTING_MAC_RANDOMIZATION_DEFAULT) { priv->mac_address_randomization = NM_SETTING_MAC_RANDOMIZATION_DEFAULT; _notify(NM_SETTING_WIRELESS(object), PROP_MAC_ADDRESS_RANDOMIZATION); @@ -1366,23 +1366,23 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) setting_class->compare_property = compare_property; /** - * NMSettingWireless:ssid: - * - * SSID of the Wi-Fi network. Must be specified. - **/ + * NMSettingWireless:ssid: + * + * SSID of the Wi-Fi network. Must be specified. + **/ /* ---keyfile--- - * property: ssid - * format: string (or decimal-byte list - obsolete) - * description: SSID of Wi-Fi network. - * example: ssid=Quick Net - * ---end--- - * ---ifcfg-rh--- - * property: ssid - * variable: ESSID - * description: SSID of Wi-Fi network. - * example: ESSID="Quick Net" - * ---end--- - */ + * property: ssid + * format: string (or decimal-byte list - obsolete) + * description: SSID of Wi-Fi network. + * example: ssid=Quick Net + * ---end--- + * ---ifcfg-rh--- + * property: ssid + * variable: ESSID + * description: SSID of Wi-Fi network. + * example: ESSID="Quick Net" + * ---end--- + */ obj_properties[PROP_SSID] = g_param_spec_boxed(NM_SETTING_WIRELESS_SSID, "", "", @@ -1390,18 +1390,18 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:mode: - * - * Wi-Fi network mode; one of "infrastructure", "mesh", "adhoc" or "ap". If blank, - * infrastructure is assumed. - **/ + * NMSettingWireless:mode: + * + * Wi-Fi network mode; one of "infrastructure", "mesh", "adhoc" or "ap". If blank, + * infrastructure is assumed. + **/ /* ---ifcfg-rh--- - * property: mode - * variable: MODE - * values: Ad-Hoc, Managed (Auto) [case insensitive] - * description: Wi-Fi network mode. - * ---end--- - */ + * property: mode + * variable: MODE + * values: Ad-Hoc, Managed (Auto) [case insensitive] + * description: Wi-Fi network mode. + * ---end--- + */ obj_properties[PROP_MODE] = g_param_spec_string(NM_SETTING_WIRELESS_MODE, "", "", @@ -1409,24 +1409,24 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:band: - * - * 802.11 frequency band of the network. One of "a" for 5GHz 802.11a or - * "bg" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network - * to the specific band, i.e. if "a" is specified, the device will not - * associate with the same network in the 2.4GHz band even if the network's - * settings are compatible. This setting depends on specific driver - * capability and may not work with all drivers. - **/ + * NMSettingWireless:band: + * + * 802.11 frequency band of the network. One of "a" for 5GHz 802.11a or + * "bg" for 2.4GHz 802.11. This will lock associations to the Wi-Fi network + * to the specific band, i.e. if "a" is specified, the device will not + * associate with the same network in the 2.4GHz band even if the network's + * settings are compatible. This setting depends on specific driver + * capability and may not work with all drivers. + **/ /* ---ifcfg-rh--- - * property: band - * variable: BAND(+) - * values: a, bg - * description: BAND alone is honored, but CHANNEL overrides BAND since it - * implies a band. - * example: BAND=bg - * ---end--- - */ + * property: band + * variable: BAND(+) + * values: a, bg + * description: BAND alone is honored, but CHANNEL overrides BAND since it + * implies a band. + * example: BAND=bg + * ---end--- + */ obj_properties[PROP_BAND] = g_param_spec_string(NM_SETTING_WIRELESS_BAND, "", "", @@ -1434,22 +1434,22 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:channel: - * - * Wireless channel to use for the Wi-Fi connection. The device will only - * join (or create for Ad-Hoc networks) a Wi-Fi network on the specified - * channel. Because channel numbers overlap between bands, this property - * also requires the "band" property to be set. - **/ + * NMSettingWireless:channel: + * + * Wireless channel to use for the Wi-Fi connection. The device will only + * join (or create for Ad-Hoc networks) a Wi-Fi network on the specified + * channel. Because channel numbers overlap between bands, this property + * also requires the "band" property to be set. + **/ /* ---ifcfg-rh--- - * property: channel - * variable: CHANNEL - * description: Channel used for the Wi-Fi communication. - * Channels greater than 14 mean "a" band, otherwise the - * band is "bg". - * example: CHANNEL=6 - * ---end--- - */ + * property: channel + * variable: CHANNEL + * description: Channel used for the Wi-Fi communication. + * Channels greater than 14 mean "a" band, otherwise the + * band is "bg". + * example: CHANNEL=6 + * ---end--- + */ obj_properties[PROP_CHANNEL] = g_param_spec_uint(NM_SETTING_WIRELESS_CHANNEL, "", "", @@ -1459,20 +1459,20 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:bssid: - * - * If specified, directs the device to only associate with the given access - * point. This capability is highly driver dependent and not supported by - * all devices. Note: this property does not control the BSSID used when - * creating an Ad-Hoc network and is unlikely to in the future. - **/ + * NMSettingWireless:bssid: + * + * If specified, directs the device to only associate with the given access + * point. This capability is highly driver dependent and not supported by + * all devices. Note: this property does not control the BSSID used when + * creating an Ad-Hoc network and is unlikely to in the future. + **/ /* ---ifcfg-rh--- - * property: bssid - * variable: BSSID(+) - * description: Restricts association only to a single AP. - * example: BSSID=00:1E:BD:64:83:21 - * ---end--- - */ + * property: bssid + * variable: BSSID(+) + * description: Restricts association only to a single AP. + * example: BSSID=00:1E:BD:64:83:21 + * ---end--- + */ obj_properties[PROP_BSSID] = g_param_spec_string(NM_SETTING_WIRELESS_BSSID, "", "", @@ -1483,19 +1483,19 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingWireless:rate: - * - * If non-zero, directs the device to only use the specified bitrate for - * communication with the access point. Units are in Kb/s, ie 5500 = 5.5 - * Mbit/s. This property is highly driver dependent and not all devices - * support setting a static bitrate. - **/ + * NMSettingWireless:rate: + * + * If non-zero, directs the device to only use the specified bitrate for + * communication with the access point. Units are in Kb/s, ie 5500 = 5.5 + * Mbit/s. This property is highly driver dependent and not all devices + * support setting a static bitrate. + **/ /* ---ifcfg-rh--- - * property: rate - * variable: (none) - * description: This property is not handled by ifcfg-rh plugin. - * ---end--- - */ + * property: rate + * variable: (none) + * description: This property is not handled by ifcfg-rh plugin. + * ---end--- + */ obj_properties[PROP_RATE] = g_param_spec_uint(NM_SETTING_WIRELESS_RATE, "", "", @@ -1506,18 +1506,18 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:tx-power: - * - * If non-zero, directs the device to use the specified transmit power. - * Units are dBm. This property is highly driver dependent and not all - * devices support setting a static transmit power. - **/ + * NMSettingWireless:tx-power: + * + * If non-zero, directs the device to use the specified transmit power. + * Units are dBm. This property is highly driver dependent and not all + * devices support setting a static transmit power. + **/ /* ---ifcfg-rh--- - * property: tx-power - * variable: (none) - * description: This property is not handled by ifcfg-rh plugin. - * ---end--- - */ + * property: tx-power + * variable: (none) + * description: This property is not handled by ifcfg-rh plugin. + * ---end--- + */ obj_properties[PROP_TX_POWER] = g_param_spec_uint( NM_SETTING_WIRELESS_TX_POWER, "", @@ -1528,29 +1528,29 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:mac-address: - * - * If specified, this connection will only apply to the Wi-Fi device whose - * permanent MAC address matches. This property does not change the MAC - * address of the device (i.e. MAC spoofing). - **/ + * NMSettingWireless:mac-address: + * + * If specified, this connection will only apply to the Wi-Fi device whose + * permanent MAC address matches. This property does not change the MAC + * address of the device (i.e. MAC spoofing). + **/ /* ---keyfile--- - * property: mac-address - * format: usual hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;162). - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: HWADDR - * description: Hardware address of the device in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:05). - * Note that for initscripts this is the current MAC address of the device as found - * during ifup. For NetworkManager this is the permanent MAC address. Or in case no - * permanent MAC address exists, the MAC address initially configured on the device. - * ---end--- - */ + * property: mac-address + * format: usual hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;162). + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: HWADDR + * description: Hardware address of the device in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:05). + * Note that for initscripts this is the current MAC address of the device as found + * during ifup. For NetworkManager this is the permanent MAC address. Or in case no + * permanent MAC address exists, the MAC address initially configured on the device. + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS] = g_param_spec_string(NM_SETTING_WIRELESS_MAC_ADDRESS, "", @@ -1562,47 +1562,47 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) &nm_sett_info_propert_type_mac_address); /** - * NMSettingWireless:cloned-mac-address: - * - * If specified, request that the device use this MAC address instead. - * This is known as MAC cloning or spoofing. - * - * Beside explicitly specifying a MAC address, the special values "preserve", "permanent", - * "random" and "stable" are supported. - * "preserve" means not to touch the MAC address on activation. - * "permanent" means to use the permanent hardware address of the device. - * "random" creates a random MAC address on each connect. - * "stable" creates a hashed MAC address based on connection.stable-id and a - * machine dependent key. - * - * If unspecified, the value can be overwritten via global defaults, see manual - * of NetworkManager.conf. If still unspecified, it defaults to "preserve" - * (older versions of NetworkManager may use a different default value). - * - * On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated - * "cloned-mac-address". - **/ + * NMSettingWireless:cloned-mac-address: + * + * If specified, request that the device use this MAC address instead. + * This is known as MAC cloning or spoofing. + * + * Beside explicitly specifying a MAC address, the special values "preserve", "permanent", + * "random" and "stable" are supported. + * "preserve" means not to touch the MAC address on activation. + * "permanent" means to use the permanent hardware address of the device. + * "random" creates a random MAC address on each connect. + * "stable" creates a hashed MAC address based on connection.stable-id and a + * machine dependent key. + * + * If unspecified, the value can be overwritten via global defaults, see manual + * of NetworkManager.conf. If still unspecified, it defaults to "preserve" + * (older versions of NetworkManager may use a different default value). + * + * On D-Bus, this field is expressed as "assigned-mac-address" or the deprecated + * "cloned-mac-address". + **/ /* ---keyfile--- - * property: cloned-mac-address - * format: usual hex-digits-and-colons notation - * description: Cloned MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;178). - * ---end--- - * ---ifcfg-rh--- - * property: cloned-mac-address - * variable: MACADDR - * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:99). - * ---end--- - * ---dbus--- - * property: cloned-mac-address - * format: byte array - * description: This D-Bus field is deprecated in favor of "assigned-mac-address" - * which is more flexible and allows specifying special variants like "random". - * For libnm and nmcli, this field is called "cloned-mac-address". - * ---end--- - */ + * property: cloned-mac-address + * format: usual hex-digits-and-colons notation + * description: Cloned MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;178). + * ---end--- + * ---ifcfg-rh--- + * property: cloned-mac-address + * variable: MACADDR + * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:99). + * ---end--- + * ---dbus--- + * property: cloned-mac-address + * format: byte array + * description: This D-Bus field is deprecated in favor of "assigned-mac-address" + * which is more flexible and allows specifying special variants like "random". + * For libnm and nmcli, this field is called "cloned-mac-address". + * ---end--- + */ obj_properties[PROP_CLONED_MAC_ADDRESS] = g_param_spec_string( NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", @@ -1614,60 +1614,60 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) &nm_sett_info_propert_type_cloned_mac_address); /* ---dbus--- - * property: assigned-mac-address - * format: string - * description: The new field for the cloned MAC address. It can be either - * a hardware address in ASCII representation, or one of the special values - * "preserve", "permanent", "random" or "stable". - * This field replaces the deprecated "cloned-mac-address" on D-Bus, which - * can only contain explicit hardware addresses. Note that this property - * only exists in D-Bus API. libnm and nmcli continue to call this property - * "cloned-mac-address". - * ---end--- - */ + * property: assigned-mac-address + * format: string + * description: The new field for the cloned MAC address. It can be either + * a hardware address in ASCII representation, or one of the special values + * "preserve", "permanent", "random" or "stable". + * This field replaces the deprecated "cloned-mac-address" on D-Bus, which + * can only contain explicit hardware addresses. Note that this property + * only exists in D-Bus API. libnm and nmcli continue to call this property + * "cloned-mac-address". + * ---end--- + */ _nm_properties_override_dbus(properties_override, "assigned-mac-address", &nm_sett_info_propert_type_assigned_mac_address); /** - * NMSettingWireless:generate-mac-address-mask: - * - * With #NMSettingWireless:cloned-mac-address setting "random" or "stable", - * by default all bits of the MAC address are scrambled and a locally-administered, - * unicast MAC address is created. This property allows to specify that certain bits - * are fixed. Note that the least significant bit of the first MAC address will - * always be unset to create a unicast MAC address. - * - * If the property is %NULL, it is eligible to be overwritten by a default - * connection setting. If the value is still %NULL or an empty string, the - * default is to create a locally-administered, unicast MAC address. - * - * If the value contains one MAC address, this address is used as mask. The set - * bits of the mask are to be filled with the current MAC address of the device, - * while the unset bits are subject to randomization. - * Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address - * and only randomize the lower 3 bytes using the "random" or "stable" algorithm. - * - * If the value contains one additional MAC address after the mask, - * this address is used instead of the current MAC address to fill the bits - * that shall not be randomized. For example, a value of - * "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address - * to 68:F7:28, while the lower bits are randomized. A value of - * "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled - * globally-administered, burned-in MAC address. - * - * If the value contains more than one additional MAC addresses, one of - * them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" - * will create a fully scrambled MAC address, randomly locally or globally - * administered. - **/ + * NMSettingWireless:generate-mac-address-mask: + * + * With #NMSettingWireless:cloned-mac-address setting "random" or "stable", + * by default all bits of the MAC address are scrambled and a locally-administered, + * unicast MAC address is created. This property allows to specify that certain bits + * are fixed. Note that the least significant bit of the first MAC address will + * always be unset to create a unicast MAC address. + * + * If the property is %NULL, it is eligible to be overwritten by a default + * connection setting. If the value is still %NULL or an empty string, the + * default is to create a locally-administered, unicast MAC address. + * + * If the value contains one MAC address, this address is used as mask. The set + * bits of the mask are to be filled with the current MAC address of the device, + * while the unset bits are subject to randomization. + * Setting "FE:FF:FF:00:00:00" means to preserve the OUI of the current MAC address + * and only randomize the lower 3 bytes using the "random" or "stable" algorithm. + * + * If the value contains one additional MAC address after the mask, + * this address is used instead of the current MAC address to fill the bits + * that shall not be randomized. For example, a value of + * "FE:FF:FF:00:00:00 68:F7:28:00:00:00" will set the OUI of the MAC address + * to 68:F7:28, while the lower bits are randomized. A value of + * "02:00:00:00:00:00 00:00:00:00:00:00" will create a fully scrambled + * globally-administered, burned-in MAC address. + * + * If the value contains more than one additional MAC addresses, one of + * them is chosen randomly. For example, "02:00:00:00:00:00 00:00:00:00:00:00 02:00:00:00:00:00" + * will create a fully scrambled MAC address, randomly locally or globally + * administered. + **/ /* ---ifcfg-rh--- - * property: generate-mac-address-mask - * variable: GENERATE_MAC_ADDRESS_MASK(+) - * description: the MAC address mask for generating randomized and stable - * cloned-mac-address. - * ---end--- - */ + * property: generate-mac-address-mask + * variable: GENERATE_MAC_ADDRESS_MASK(+) + * description: the MAC address mask for generating randomized and stable + * cloned-mac-address. + * ---end--- + */ obj_properties[PROP_GENERATE_MAC_ADDRESS_MASK] = g_param_spec_string( NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, "", @@ -1676,25 +1676,25 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:mac-address-blacklist: - * - * A list of permanent MAC addresses of Wi-Fi devices to which this - * connection should never apply. Each MAC address should be given in the - * standard hex-digits-and-colons notation (eg "00:11:22:33:44:55"). - **/ + * NMSettingWireless:mac-address-blacklist: + * + * A list of permanent MAC addresses of Wi-Fi devices to which this + * connection should never apply. Each MAC address should be given in the + * standard hex-digits-and-colons notation (eg "00:11:22:33:44:55"). + **/ /* ---keyfile--- - * property: mac-address-blacklist - * format: list of MACs (separated with semicolons) - * description: MAC address blacklist. - * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 - * ---end--- - * ---ifcfg-rh--- - * property: mac-address-blacklist - * variable: HWADDR_BLACKLIST(+) - * description: It denies usage of the connection for any device whose address - * is listed. - * ---end--- - */ + * property: mac-address-blacklist + * format: list of MACs (separated with semicolons) + * description: MAC address blacklist. + * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 + * ---end--- + * ---ifcfg-rh--- + * property: mac-address-blacklist + * variable: HWADDR_BLACKLIST(+) + * description: It denies usage of the connection for any device whose address + * is listed. + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS_BLACKLIST] = g_param_spec_boxed( NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", @@ -1703,21 +1703,21 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:seen-bssids: - * - * A list of BSSIDs (each BSSID formatted as a MAC address like - * "00:11:22:33:44:55") that have been detected as part of the Wi-Fi - * network. NetworkManager internally tracks previously seen BSSIDs. The - * property is only meant for reading and reflects the BSSID list of - * NetworkManager. The changes you make to this property will not be - * preserved. - **/ + * NMSettingWireless:seen-bssids: + * + * A list of BSSIDs (each BSSID formatted as a MAC address like + * "00:11:22:33:44:55") that have been detected as part of the Wi-Fi + * network. NetworkManager internally tracks previously seen BSSIDs. The + * property is only meant for reading and reflects the BSSID list of + * NetworkManager. The changes you make to this property will not be + * preserved. + **/ /* ---ifcfg-rh--- - * property: seen-bssids - * variable: (none) - * description: This property is not handled by ifcfg-rh plugin. - * ---end--- - */ + * property: seen-bssids + * variable: (none) + * description: This property is not handled by ifcfg-rh plugin. + * ---end--- + */ obj_properties[PROP_SEEN_BSSIDS] = g_param_spec_boxed( NM_SETTING_WIRELESS_SEEN_BSSIDS, "", @@ -1731,17 +1731,17 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) .to_dbus_fcn = _to_dbus_fcn_seen_bssids, )); /** - * NMSettingWireless:mtu: - * - * If non-zero, only transmit packets of the specified size or smaller, - * breaking larger packets up into multiple Ethernet frames. - **/ + * NMSettingWireless:mtu: + * + * If non-zero, only transmit packets of the specified size or smaller, + * breaking larger packets up into multiple Ethernet frames. + **/ /* ---ifcfg-rh--- - * property: mtu - * variable: MTU - * description: MTU of the wireless interface. - * ---end--- - */ + * property: mtu + * variable: MTU + * description: MTU of the wireless interface. + * ---end--- + */ obj_properties[PROP_MTU] = g_param_spec_uint(NM_SETTING_WIRELESS_MTU, "", "", @@ -1752,29 +1752,29 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:hidden: - * - * If %TRUE, indicates that the network is a non-broadcasting network that - * hides its SSID. This works both in infrastructure and AP mode. - * - * In infrastructure mode, various workarounds are used for a more reliable - * discovery of hidden networks, such as probe-scanning the SSID. However, - * these workarounds expose inherent insecurities with hidden SSID networks, - * and thus hidden SSID networks should be used with caution. - * - * In AP mode, the created network does not broadcast its SSID. - * - * Note that marking the network as hidden may be a privacy issue for you - * (in infrastructure mode) or client stations (in AP mode), as the explicit - * probe-scans are distinctly recognizable on the air. - * - **/ + * NMSettingWireless:hidden: + * + * If %TRUE, indicates that the network is a non-broadcasting network that + * hides its SSID. This works both in infrastructure and AP mode. + * + * In infrastructure mode, various workarounds are used for a more reliable + * discovery of hidden networks, such as probe-scanning the SSID. However, + * these workarounds expose inherent insecurities with hidden SSID networks, + * and thus hidden SSID networks should be used with caution. + * + * In AP mode, the created network does not broadcast its SSID. + * + * Note that marking the network as hidden may be a privacy issue for you + * (in infrastructure mode) or client stations (in AP mode), as the explicit + * probe-scans are distinctly recognizable on the air. + * + **/ /* ---ifcfg-rh--- - * property: hidden - * variable: SSID_HIDDEN(+) - * description: Whether the network hides the SSID. - * ---end--- - */ + * property: hidden + * variable: SSID_HIDDEN(+) + * description: Whether the network hides the SSID. + * ---end--- + */ obj_properties[PROP_HIDDEN] = g_param_spec_boolean(NM_SETTING_WIRELESS_HIDDEN, "", "", @@ -1782,24 +1782,24 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:powersave: - * - * One of %NM_SETTING_WIRELESS_POWERSAVE_DISABLE (disable Wi-Fi power - * saving), %NM_SETTING_WIRELESS_POWERSAVE_ENABLE (enable Wi-Fi power - * saving), %NM_SETTING_WIRELESS_POWERSAVE_IGNORE (don't touch currently - * configure setting) or %NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (use the - * globally configured value). All other values are reserved. - * - * Since: 1.2 - **/ + * NMSettingWireless:powersave: + * + * One of %NM_SETTING_WIRELESS_POWERSAVE_DISABLE (disable Wi-Fi power + * saving), %NM_SETTING_WIRELESS_POWERSAVE_ENABLE (enable Wi-Fi power + * saving), %NM_SETTING_WIRELESS_POWERSAVE_IGNORE (don't touch currently + * configure setting) or %NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (use the + * globally configured value). All other values are reserved. + * + * Since: 1.2 + **/ /* ---ifcfg-rh--- - * property: powersave - * variable: POWERSAVE(+) - * values: default, ignore, enable, disable - * description: Enables or disables Wi-Fi power saving. - * example: POWERSAVE=enable - * ---end--- - */ + * property: powersave + * variable: POWERSAVE(+) + * values: default, ignore, enable, disable + * description: Enables or disables Wi-Fi power saving. + * example: POWERSAVE=enable + * ---end--- + */ obj_properties[PROP_POWERSAVE] = g_param_spec_uint(NM_SETTING_WIRELESS_POWERSAVE, "", "", @@ -1809,26 +1809,26 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:mac-address-randomization: - * - * One of %NM_SETTING_MAC_RANDOMIZATION_DEFAULT (never randomize unless - * the user has set a global default to randomize and the supplicant - * supports randomization), %NM_SETTING_MAC_RANDOMIZATION_NEVER (never - * randomize the MAC address), or %NM_SETTING_MAC_RANDOMIZATION_ALWAYS - * (always randomize the MAC address). This property is deprecated for - * 'cloned-mac-address'. - * - * Since: 1.2 - * Deprecated: 1.4: Deprecated by NMSettingWireless:cloned-mac-address property. - **/ + * NMSettingWireless:mac-address-randomization: + * + * One of %NM_SETTING_MAC_RANDOMIZATION_DEFAULT (never randomize unless + * the user has set a global default to randomize and the supplicant + * supports randomization), %NM_SETTING_MAC_RANDOMIZATION_NEVER (never + * randomize the MAC address), or %NM_SETTING_MAC_RANDOMIZATION_ALWAYS + * (always randomize the MAC address). This property is deprecated for + * 'cloned-mac-address'. + * + * Since: 1.2 + * Deprecated: 1.4: Deprecated by NMSettingWireless:cloned-mac-address property. + **/ /* ---ifcfg-rh--- - * property: mac-address-randomization - * variable: MAC_ADDRESS_RANDOMIZATION(+) - * values: default, never, always - * description: Enables or disables Wi-Fi MAC address randomization. - * example: MAC_ADDRESS_RANDOMIZATION=always - * ---end--- - */ + * property: mac-address-randomization + * variable: MAC_ADDRESS_RANDOMIZATION(+) + * values: default, never, always + * description: Enables or disables Wi-Fi MAC address randomization. + * example: MAC_ADDRESS_RANDOMIZATION=always + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS_RANDOMIZATION] = g_param_spec_uint(NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, "", @@ -1840,18 +1840,18 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) /* Compatibility for deprecated property */ /* ---ifcfg-rh--- - * property: security - * variable: (none) - * description: This property is deprecated and not handled by ifcfg-rh-plugin. - * ---end--- - * ---dbus--- - * property: security - * description: This property is deprecated, but can be set to the value - * '802-11-wireless-security' when a wireless security setting is also - * present in the connection dictionary, for compatibility with very old - * NetworkManager daemons. - * ---end--- - */ + * property: security + * variable: (none) + * description: This property is deprecated and not handled by ifcfg-rh-plugin. + * ---end--- + * ---dbus--- + * property: security + * description: This property is deprecated, but can be set to the value + * '802-11-wireless-security' when a wireless security setting is also + * present in the connection dictionary, for compatibility with very old + * NetworkManager daemons. + * ---end--- + */ _nm_properties_override_dbus( properties_override, "security", @@ -1859,23 +1859,23 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) .to_dbus_fcn = nm_setting_wireless_get_security, )); /** - * NMSettingWireless:wake-on-wlan: - * - * The #NMSettingWirelessWakeOnWLan options to enable. Not all devices support all options. - * May be any combination of %NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE, - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP or the special values - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (to use global settings) and - * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (to disable management of Wake-on-LAN in - * NetworkManager). - * - * Since: 1.12 - **/ + * NMSettingWireless:wake-on-wlan: + * + * The #NMSettingWirelessWakeOnWLan options to enable. Not all devices support all options. + * May be any combination of %NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_MAGIC, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_GTK_REKEY_FAILURE, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_EAP_IDENTITY_REQUEST, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_4WAY_HANDSHAKE, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_RFKILL_RELEASE, + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_TCP or the special values + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_DEFAULT (to use global settings) and + * %NM_SETTING_WIRELESS_WAKE_ON_WLAN_IGNORE (to disable management of Wake-on-LAN in + * NetworkManager). + * + * Since: 1.12 + **/ obj_properties[PROP_WAKE_ON_WLAN] = g_param_spec_uint(NM_SETTING_WIRELESS_WAKE_ON_WLAN, "", @@ -1886,35 +1886,35 @@ nm_setting_wireless_class_init(NMSettingWirelessClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWireless:ap-isolation - * - * Configures AP isolation, which prevents communication between - * wireless devices connected to this AP. This property can be set - * to a value different from %NM_TERNARY_DEFAULT only when the - * interface is configured in AP mode. - * - * If set to %NM_TERNARY_TRUE, devices are not able to communicate - * with each other. This increases security because it protects - * devices against attacks from other clients in the network. At - * the same time, it prevents devices to access resources on the - * same wireless networks as file shares, printers, etc. - * - * If set to %NM_TERNARY_FALSE, devices can talk to each other. - * - * When set to %NM_TERNARY_DEFAULT, the global default is used; in - * case the global default is unspecified it is assumed to be - * %NM_TERNARY_FALSE. - * - * Since: 1.28 - **/ + * NMSettingWireless:ap-isolation + * + * Configures AP isolation, which prevents communication between + * wireless devices connected to this AP. This property can be set + * to a value different from %NM_TERNARY_DEFAULT only when the + * interface is configured in AP mode. + * + * If set to %NM_TERNARY_TRUE, devices are not able to communicate + * with each other. This increases security because it protects + * devices against attacks from other clients in the network. At + * the same time, it prevents devices to access resources on the + * same wireless networks as file shares, printers, etc. + * + * If set to %NM_TERNARY_FALSE, devices can talk to each other. + * + * When set to %NM_TERNARY_DEFAULT, the global default is used; in + * case the global default is unspecified it is assumed to be + * %NM_TERNARY_FALSE. + * + * Since: 1.28 + **/ /* ---ifcfg-rh--- - * property: ap-isolation - * variable: AP_ISOLATION(+) - * values: "yes", "no" - * default: missing variable means global default - * description: Whether AP isolation is enabled - * ---end--- - */ + * property: ap-isolation + * variable: AP_ISOLATION(+) + * values: "yes", "no" + * default: missing variable means global default + * description: Whether AP isolation is enabled + * ---end--- + */ obj_properties[PROP_AP_ISOLATION] = g_param_spec_enum( NM_SETTING_WIRELESS_AP_ISOLATION, "", diff --git a/libnm-core/nm-setting-wpan.c b/libnm-core/nm-setting-wpan.c index 6eb52b8f72..89de910cd6 100644 --- a/libnm-core/nm-setting-wpan.c +++ b/libnm-core/nm-setting-wpan.c @@ -309,18 +309,18 @@ nm_setting_wpan_class_init(NMSettingWpanClass *klass) setting_class->verify = verify; /** - * NMSettingWpan:mac-address: - * - * If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) - * MAC layer device whose permanent MAC address matches. - **/ + * NMSettingWpan:mac-address: + * + * If specified, this connection will only apply to the IEEE 802.15.4 (WPAN) + * MAC layer device whose permanent MAC address matches. + **/ /* ---keyfile--- - * property: mac-address - * format: usual hex-digits-and-colons notation - * description: MAC address in hex-digits-and-colons notation - * (e.g. 76:d8:9b:87:66:60:84:ee). - * ---end--- - */ + * property: mac-address + * format: usual hex-digits-and-colons notation + * description: MAC address in hex-digits-and-colons notation + * (e.g. 76:d8:9b:87:66:60:84:ee). + * ---end--- + */ obj_properties[PROP_MAC_ADDRESS] = g_param_spec_string(NM_SETTING_WPAN_MAC_ADDRESS, "", @@ -329,10 +329,10 @@ nm_setting_wpan_class_init(NMSettingWpanClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWpan:pan-id: - * - * IEEE 802.15.4 Personal Area Network (PAN) identifier. - **/ + * NMSettingWpan:pan-id: + * + * IEEE 802.15.4 Personal Area Network (PAN) identifier. + **/ obj_properties[PROP_PAN_ID] = g_param_spec_uint(NM_SETTING_WPAN_PAN_ID, "", "", @@ -342,10 +342,10 @@ nm_setting_wpan_class_init(NMSettingWpanClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWpan:short-address: - * - * Short IEEE 802.15.4 address to be used within a restricted environment. - **/ + * NMSettingWpan:short-address: + * + * Short IEEE 802.15.4 address to be used within a restricted environment. + **/ obj_properties[PROP_SHORT_ADDRESS] = g_param_spec_uint(NM_SETTING_WPAN_SHORT_ADDRESS, "", @@ -356,13 +356,13 @@ nm_setting_wpan_class_init(NMSettingWpanClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWpan:page: - * - * IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not - * set, use whatever the device is already set to". - * - * Since: 1.16 - **/ + * NMSettingWpan:page: + * + * IEEE 802.15.4 channel page. A positive integer or -1, meaning "do not + * set, use whatever the device is already set to". + * + * Since: 1.16 + **/ obj_properties[PROP_PAGE] = g_param_spec_int(NM_SETTING_WPAN_PAGE, "", "", @@ -372,13 +372,13 @@ nm_setting_wpan_class_init(NMSettingWpanClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); /** - * NMSettingWpan:channel: - * - * IEEE 802.15.4 channel. A positive integer or -1, meaning "do not - * set, use whatever the device is already set to". - * - * Since: 1.16 - **/ + * NMSettingWpan:channel: + * + * IEEE 802.15.4 channel. A positive integer or -1, meaning "do not + * set, use whatever the device is already set to". + * + * Since: 1.16 + **/ obj_properties[PROP_CHANNEL] = g_param_spec_int(NM_SETTING_WPAN_CHANNEL, "", "", diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index c9975e4eb9..bde3330daa 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -61,10 +61,10 @@ static NMSettingPriority _get_base_type_priority(const NMMetaSettingInfo *setting_info, GType gtype) { /* Historical oddity: PPPoE is a base-type even though it's not - * priority 1. It needs to be sorted *after* lower-level stuff like - * Wi-Fi security or 802.1x for secrets, but it's still allowed as a - * base type. - */ + * priority 1. It needs to be sorted *after* lower-level stuff like + * Wi-Fi security or 802.1x for secrets, but it's still allowed as a + * base type. + */ if (setting_info) { if (NM_IN_SET(setting_info->setting_priority, @@ -298,7 +298,7 @@ _property_infos_sort(const NMSettInfoProperty *property_infos, return NULL; if (G_TYPE_FROM_CLASS(setting_class) != NM_TYPE_SETTING_CONNECTION) { /* we only do something special for certain setting types. This one, - * has just alphabetical sorting. */ + * has just alphabetical sorting. */ return NULL; } @@ -514,26 +514,26 @@ void _nm_setting_emit_property_changed(NMSetting *setting) { /* Some settings have "properties" that are not implemented as GObject properties. - * - * For example: - * - * - gendata-base settings like NMSettingEthtool. Here properties are just - * GVariant values in the gendata hash. - * - * - NMSettingWireGuard's peers are not backed by a GObject property. Instead - * there is C-API to access/modify peers. - * - * We still want to emit property-changed notifications for such properties, - * in particular because NMConnection registers to such signals to re-emit - * it as NM_CONNECTION_CHANGED signal. In fact, there are unlikely any other - * uses of such a property-changed signal, because generally it doesn't make - * too much sense. - * - * So, instead of adding yet another (artificial) signal "setting-changed", - * hijack the "notify" signal and just notify about changes of the "name". - * Of course, the "name" doesn't really ever change, because it's tied to - * the GObject's type. - */ + * + * For example: + * + * - gendata-base settings like NMSettingEthtool. Here properties are just + * GVariant values in the gendata hash. + * + * - NMSettingWireGuard's peers are not backed by a GObject property. Instead + * there is C-API to access/modify peers. + * + * We still want to emit property-changed notifications for such properties, + * in particular because NMConnection registers to such signals to re-emit + * it as NM_CONNECTION_CHANGED signal. In fact, there are unlikely any other + * uses of such a property-changed signal, because generally it doesn't make + * too much sense. + * + * So, instead of adding yet another (artificial) signal "setting-changed", + * hijack the "notify" signal and just notify about changes of the "name". + * Of course, the "name" doesn't really ever change, because it's tied to + * the GObject's type. + */ _notify(setting, PROP_NAME); } @@ -786,17 +786,17 @@ _nm_setting_new_from_dbus(GType setting_type, NM_SETTING_PARSE_FLAGS_STRICT | NM_SETTING_PARSE_FLAGS_BEST_EFFORT)); /* connection_dict is not technically optional, but some tests in test-general - * don't bother with it in cases where they know it's not needed. - */ + * don't bother with it in cases where they know it's not needed. + */ if (connection_dict) g_return_val_if_fail(g_variant_is_of_type(connection_dict, NM_VARIANT_TYPE_CONNECTION), NULL); /* Build the setting object from the properties we know about; we assume - * that any propreties in @setting_dict that we don't know about can - * either be ignored or else has a backward-compatibility equivalent - * that we do know about. - */ + * that any propreties in @setting_dict that we don't know about can + * either be ignored or else has a backward-compatibility equivalent + * that we do know about. + */ setting = (NMSetting *) g_object_new(setting_type, NULL); if (NM_FLAGS_HAS(parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) { @@ -884,12 +884,12 @@ init_from_dbus(NMSetting * setting, _nm_setting_option_notify(setting, TRUE); /* Currently, only NMSettingEthtool supports gendata based options, and - * that one has no other properties (except "name"). That means, we - * consumed all options above. - * - * In the future it may be interesting to have settings that are both - * based on gendata and regular properties. In that case, we would need - * to handle this case differently. */ + * that one has no other properties (except "name"). That means, we + * consumed all options above. + * + * In the future it may be interesting to have settings that are both + * based on gendata and regular properties. In that case, we would need + * to handle this case differently. */ nm_assert(nm_streq(G_OBJECT_TYPE_NAME(setting), "NMSettingEthtool")); nm_assert(sett_info->property_infos_len == 1); @@ -1294,25 +1294,25 @@ _nm_setting_should_compare_secret_property(NMSetting * setting, if (other) { if (!nm_setting_get_secret_flags(other, secret_name, &b_secret_flags, NULL)) { /* secret-name may not be a valid secret for @other. That is fine, we ignore that - * and treat @b_secret_flags as NM_SETTING_SECRET_FLAG_NONE. - * - * This can happen with VPN secrets, where the caller knows that @secret_name - * is a secret for setting, but it may not be a secret for @other. Accept that. - * - * Mark @other as missing. */ + * and treat @b_secret_flags as NM_SETTING_SECRET_FLAG_NONE. + * + * This can happen with VPN secrets, where the caller knows that @secret_name + * is a secret for setting, but it may not be a secret for @other. Accept that. + * + * Mark @other as missing. */ other = NULL; } } /* when @setting has the secret-flags that should be ignored, - * we skip the comparison if: - * - * - @other is not present, - * - @other does not have a secret named @secret_name - * - @other also has the secret flat to be ignored. - * - * This makes the check symmetric (aside the fact that @setting must - * have the secret while @other may not -- which is asymmetric). */ + * we skip the comparison if: + * + * - @other is not present, + * - @other does not have a secret named @secret_name + * - @other also has the secret flat to be ignored. + * + * This makes the check symmetric (aside the fact that @setting must + * have the secret while @other may not -- which is asymmetric). */ if (NM_FLAGS_HAS(flags, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS) && NM_FLAGS_HAS(a_secret_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED) && (!other || NM_FLAGS_HAS(b_secret_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED))) @@ -1582,14 +1582,14 @@ _nm_setting_diff(NMConnection * con_a, } /* If the caller is calling this function in a pattern like this to get - * complete diffs: - * - * nm_setting_diff (A, B, FALSE, &results); - * nm_setting_diff (B, A, TRUE, &results); - * - * and wants us to invert the results so that the second invocation comes - * out correctly, do that here. - */ + * complete diffs: + * + * nm_setting_diff (A, B, FALSE, &results); + * nm_setting_diff (B, A, TRUE, &results); + * + * and wants us to invert the results so that the second invocation comes + * out correctly, do that here. + */ if (invert_results) { a_result = NM_SETTING_DIFF_RESULT_IN_B; b_result = NM_SETTING_DIFF_RESULT_IN_A; @@ -1658,18 +1658,18 @@ _nm_setting_diff(NMConnection * con_a, | NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS) && b && compare_result == NM_TERNARY_FALSE) { /* we have setting @b and the property is not the same. But we also are instructed - * to ignore secrets based on the flags. - * - * Note that compare_property() called with two settings will ignore secrets - * based on the flags, but it will do so if *both* settings have the flag we - * look for. So that is symmetric behavior and good. - * - * But for the purpose of diff(), we do a asymmetric comparison because and - * we want to skip testing the property if setting @a alone indicates to do - * so. - * - * We need to double-check whether the property should be ignored by - * looking at @a alone. */ + * to ignore secrets based on the flags. + * + * Note that compare_property() called with two settings will ignore secrets + * based on the flags, but it will do so if *both* settings have the flag we + * look for. So that is symmetric behavior and good. + * + * But for the purpose of diff(), we do a asymmetric comparison because and + * we want to skip testing the property if setting @a alone indicates to do + * so. + * + * We need to double-check whether the property should be ignored by + * looking at @a alone. */ if (_compare_property(sett_info, i, con_a, a, NULL, NULL, flags) == NM_TERNARY_DEFAULT) continue; @@ -1741,14 +1741,14 @@ _nm_setting_diff(NMConnection * con_a, if (!compared_any && !b) { /* special case: the setting has no properties, and the opposite - * setting @b is not given. The settings differ, and we signal that - * by returning an empty results hash. */ + * setting @b is not given. The settings differ, and we signal that + * by returning an empty results hash. */ diff_found = TRUE; } if (diff_found) { /* if there is a difference, we always return FALSE. It also means, we might - * have allocated a new @results hash, and return it to the caller. */ + * have allocated a new @results hash, and return it to the caller. */ return FALSE; } else { if (results_created) { @@ -1757,7 +1757,7 @@ _nm_setting_diff(NMConnection * con_a, *results = NULL; } else { /* we found no diff, and return false. However, the input - * @result is returned unmodified. */ + * @result is returned unmodified. */ } return TRUE; } @@ -1809,8 +1809,8 @@ nm_setting_enumerate_values(NMSetting *setting, NMSettingValueIterFn func, gpoin guint n_properties; /* the properties of this setting are not real GObject properties. - * Hence, this API makes little sense (or does it?). Still, call - * @func with each value. */ + * Hence, this API makes little sense (or does it?). Still, call + * @func with each value. */ n_properties = _nm_setting_option_get_all(setting, &names, NULL); if (n_properties > 0) { gs_strfreev char **keys = g_strdupv((char **) names); @@ -1828,7 +1828,7 @@ nm_setting_enumerate_values(NMSetting *setting, NMSettingValueIterFn func, gpoin g_value_init(&value, G_TYPE_VARIANT); g_value_set_variant(&value, val); /* call it will GParamFlags 0. It shall indicate that this - * is not a "real" GObject property. */ + * is not a "real" GObject property. */ func(setting, keys[i], &value, 0, user_data); g_value_unset(&value); } @@ -2051,9 +2051,9 @@ update_one_secret(NMSetting *setting, const char *key, GVariant *value, GError * if (g_variant_is_of_type(value, G_VARIANT_TYPE_STRING) && G_IS_PARAM_SPEC_STRING(prop_spec)) { /* String is expected to be a common case. Handle it specially and check - * whether the value is already set. Otherwise, we just reset the - * property and assume the value got modified. - */ + * whether the value is already set. Otherwise, we just reset the + * property and assume the value got modified. + */ char *v; g_object_get(G_OBJECT(setting), prop_spec->name, &v, NULL); @@ -2419,23 +2419,23 @@ _nm_setting_option_notify(NMSetting *setting, gboolean names_changed) if (names_changed) { /* if only the values changed, it's sufficient to invalidate the - * values cache. Otherwise, the names cache must be invalidated too. */ + * values cache. Otherwise, the names cache must be invalidated too. */ nm_clear_g_free(&gendata->names); } /* Note, currently there is no way to notify the subclass when gendata changed. - * gendata is only changed in two situations: - * 1) from within NMSetting itself, for example when creating a NMSetting instance - * from keyfile or a D-Bus GVariant. - * 2) actively from the subclass itself - * For 2), we don't need the notification, because the subclass knows that something - * changed. - * For 1), we currently don't need the notification either, because all that the subclass - * currently would do, is emit a g_object_notify() signal. However, 1) only happens when - * the setting instance is newly created, at that point, nobody listens to the signal. - * - * If we ever need it, then we would need to call a virtual function to notify the subclass - * that gendata changed. */ + * gendata is only changed in two situations: + * 1) from within NMSetting itself, for example when creating a NMSetting instance + * from keyfile or a D-Bus GVariant. + * 2) actively from the subclass itself + * For 2), we don't need the notification, because the subclass knows that something + * changed. + * For 1), we currently don't need the notification either, because all that the subclass + * currently would do, is emit a g_object_notify() signal. However, 1) only happens when + * the setting instance is newly created, at that point, nobody listens to the signal. + * + * If we ever need it, then we would need to call a virtual function to notify the subclass + * that gendata changed. */ out: _nm_setting_emit_property_changed(setting); @@ -2683,17 +2683,17 @@ nm_setting_option_set(NMSetting *setting, const char *opt_name, GVariant *varian } /* Currently, it is a bug setting any option, unless the setting type supports it. - * And currently, only NMSettingEthtool supports it. - * - * In the future, more setting types may support it. Or we may relax this so - * that options can be attached to all setting types (to indicate "unsupported" - * settings for forward compatibility). - * - * As it is today, internal code will only add gendata options to NMSettingEthtool, - * and there exists not public API to add such options. Still, it is permissible - * to call get(), clear() and set(variant=NULL) also on settings that don't support - * it, as these operations don't add options. - */ + * And currently, only NMSettingEthtool supports it. + * + * In the future, more setting types may support it. Or we may relax this so + * that options can be attached to all setting types (to indicate "unsupported" + * settings for forward compatibility). + * + * As it is today, internal code will only add gendata options to NMSettingEthtool, + * and there exists not public API to add such options. Still, it is permissible + * to call get(), clear() and set(variant=NULL) also on settings that don't support + * it, as these operations don't add options. + */ g_return_if_fail( _nm_setting_class_get_sett_info(NM_SETTING_GET_CLASS(setting))->detail.gendata_info); @@ -2703,9 +2703,9 @@ nm_setting_option_set(NMSetting *setting, const char *opt_name, GVariant *varian changed_value = changed_name || !g_variant_equal(old_variant, variant); /* We always want to replace the variant, even if it has - * the same value according to g_variant_equal(). The reason - * is that we want to take a reference on @variant, because - * that is what the user might expect. */ + * the same value according to g_variant_equal(). The reason + * is that we want to take a reference on @variant, because + * that is what the user might expect. */ g_hash_table_insert(hash, g_strdup(opt_name), g_variant_ref_sink(variant)); if (changed_value) @@ -2844,12 +2844,12 @@ nm_setting_class_init(NMSettingClass *setting_class) setting_class->init_from_dbus = init_from_dbus; /** - * NMSetting:name: - * - * The setting's name, which uniquely identifies the setting within the - * connection. Each setting type has a name unique to that type, for - * example "ppp" or "802-11-wireless" or "802-3-ethernet". - **/ + * NMSetting:name: + * + * The setting's name, which uniquely identifies the setting within the + * connection. Each setting type has a name unique to that type, for + * example "ppp" or "802-11-wireless" or "802-3-ethernet". + **/ obj_properties[PROP_NAME] = g_param_spec_string(NM_SETTING_NAME, "", "", diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index 43c9dedb67..db35c23a9d 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -205,11 +205,11 @@ typedef struct { gpointer user_data); /* compare_property() returns a ternary, where DEFAULT means that the property should not - * be compared due to the compare @flags. A TRUE/FALSE result means that the property is - * equal/not-equal. - * - * @other may be %NULL, in which case the function only determines whether - * the setting should be compared (TRUE) or not (DEFAULT). */ + * be compared due to the compare @flags. A TRUE/FALSE result means that the property is + * equal/not-equal. + * + * @other may be %NULL, in which case the function only determines whether + * the setting should be compared (TRUE) or not (DEFAULT). */ /*< private >*/ NMTernary (*compare_property)(const struct _NMSettInfoSetting *sett_info, guint property_idx, diff --git a/libnm-core/nm-team-utils.c b/libnm-core/nm-team-utils.c index b338f16c88..c490a1a510 100644 --- a/libnm-core/nm-team-utils.c +++ b/libnm-core/nm-team-utils.c @@ -23,12 +23,12 @@ typedef enum { SET_FIELD_MODE_SET = 1, /* Sets the field as set, unless the field is at the default. - * This is the case for API that is called from NMSettingTeam/NMSettingTeamPort. - * This means, using libnm API to reset the value of a NMSetting to the default, - * will mark the field as unset. - * This is different from initializing the field when parsing JSON/GVariant. In - * that case an explicitly set field (even set to the default value) will be remembered - * to be set. */ + * This is the case for API that is called from NMSettingTeam/NMSettingTeamPort. + * This means, using libnm API to reset the value of a NMSetting to the default, + * will mark the field as unset. + * This is different from initializing the field when parsing JSON/GVariant. In + * that case an explicitly set field (even set to the default value) will be remembered + * to be set. */ SET_FIELD_MODE_SET_UNLESS_DEFAULT = 2, } SetFieldModeEnum; @@ -762,14 +762,14 @@ _team_setting_attribute_changed(NMTeamSetting * self, if (!changed) { /* a regular attribute was set, but the value did not change. - * - * If we previously were in non-strict mode, then - * - * - switch to strict-mode. Clearly the user set a regular attribute - * and hence now we want to validate the setting. - * - * - clear the JSON string. We need to regenerate it. - */ + * + * If we previously were in non-strict mode, then + * + * - switch to strict-mode. Clearly the user set a regular attribute + * and hence now we want to validate the setting. + * + * - clear the JSON string. We need to regenerate it. + */ if (self->_data_priv.strict_validated) return 0; changed_flags = nm_team_attribute_to_flags(NM_TEAM_ATTRIBUTE_CONFIG); @@ -1744,7 +1744,7 @@ nm_team_setting_config_get(const NMTeamSetting *self) if (_team_setting_check_default(self) == 0) { /* the default is set. We signal this as a NULL JSON string. - * Nothing to do. */ + * Nothing to do. */ js_str = NULL; } else { gboolean list_is_empty = TRUE; @@ -1892,7 +1892,7 @@ nm_team_setting_config_get(const NMTeamSetting *self) } /* mutate the constant object. In C++ speak, these fields are "mutable". - * That is because we construct the JSON string lazily/on-demand. */ + * That is because we construct the JSON string lazily/on-demand. */ *((char **) &self->_data_priv._js_str) = js_str; *((bool *) &self->_data_priv._js_str_need_synthetize) = FALSE; @@ -2091,7 +2091,7 @@ _js_parse_unpack(const NMJsonVt *vt, <= 0 || !v_string || v_string[0] == '\0') { /* we remember that there was some invalid content, but parts of the - * list could still be parsed. */ + * list could still be parsed. */ *out_unrecognized_content = TRUE; continue; } @@ -2364,7 +2364,7 @@ _team_setting_verify_config(const NMTeamSetting *self, GError **error) const char *js_str; /* we always materialize the JSON string. That is because we want to validate the - * string length of the resulting JSON. */ + * string length of the resulting JSON. */ js_str = nm_team_setting_config_get(self); if (js_str) { @@ -2534,7 +2534,7 @@ nm_team_setting_reset_from_dbus(NMTeamSetting * self, attr_data = _team_attr_data_find_for_property_name(self->d.is_port, v_key); if (!attr_data) { /* _nm_setting_new_from_dbus() already checks for unknown keys. Don't - * do that here. */ + * do that here. */ continue; } @@ -2567,7 +2567,7 @@ nm_team_setting_reset_from_dbus(NMTeamSetting * self, } /* _nm_setting_new_from_dbus() already checks for duplicate keys. Don't - * do that here. */ + * do that here. */ nm_g_variant_unref(variants[attr_data->team_attr]); variants[attr_data->team_attr] = g_steal_pointer(&v_val_free); } @@ -2578,17 +2578,17 @@ nm_team_setting_reset_from_dbus(NMTeamSetting * self, if (variants[NM_TEAM_ATTRIBUTE_CONFIG] && vt && !NM_FLAGS_HAS(parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) { /* we don't require the content of the "link-watchers" and we also - * don't perform strict validation. No need to parse it. */ + * don't perform strict validation. No need to parse it. */ } else { gs_free_error GError *local = NULL; /* We might need the parsed v_link_watchers array below (because there is no JSON - * "config" present or because we don't have json support). - * - * Or we might run with NM_SETTING_PARSE_FLAGS_STRICT. In that mode, we may not necessarily - * require that the entire setting as a whole validates (if a JSON config is present and - * we are not "strict_validated") , but we require that we can at least parse the link watchers - * on their own. */ + * "config" present or because we don't have json support). + * + * Or we might run with NM_SETTING_PARSE_FLAGS_STRICT. In that mode, we may not necessarily + * require that the entire setting as a whole validates (if a JSON config is present and + * we are not "strict_validated") , but we require that we can at least parse the link watchers + * on their own. */ v_link_watchers = _nm_utils_team_link_watchers_from_variant( variants[NM_TEAM_ATTRIBUTE_LINK_WATCHERS], NM_FLAGS_HAS(parse_flags, NM_SETTING_PARSE_FLAGS_STRICT), @@ -2616,8 +2616,8 @@ nm_team_setting_reset_from_dbus(NMTeamSetting * self, if (vt && variants[NM_TEAM_ATTRIBUTE_CONFIG]) { /* for team settings, the JSON must be able to express all possible options. That means, - * if the GVariant contains both the JSON "config" and other options, then the other options - * are silently ignored. */ + * if the GVariant contains both the JSON "config" and other options, then the other options + * are silently ignored. */ } else { guint32 extra_changed = 0u; @@ -2670,7 +2670,7 @@ nm_team_setting_reset_from_dbus(NMTeamSetting * self, if (!variants[NM_TEAM_ATTRIBUTE_CONFIG]) { /* clear the JSON string so it can be regenerated. But only if we didn't set - * it above. */ + * it above. */ self->_data_priv.strict_validated = TRUE; self->_data_priv._js_str_need_synthetize = TRUE; } @@ -2748,10 +2748,10 @@ _nm_team_settings_property_to_dbus(const NMSettInfoSetting * sett_ if (self->d.strict_validated && !_nm_utils_is_manager_process) { /* if we are in strict validating mode on the client side, the JSON is generated - * artificially. In this case, don't send the config via D-Bus to the server. - * - * This also will cause NetworkManager to strictly validate the settings. - * If a JSON "config" is present, strict validation won't be performed. */ + * artificially. In this case, don't send the config via D-Bus to the server. + * + * This also will cause NetworkManager to strictly validate the settings. + * If a JSON "config" is present, strict validation won't be performed. */ return NULL; } diff --git a/libnm-core/nm-team-utils.h b/libnm-core/nm-team-utils.h index 09ba42e062..0cfb397804 100644 --- a/libnm-core/nm-team-utils.h +++ b/libnm-core/nm-team-utils.h @@ -68,16 +68,16 @@ struct _NMTeamSettingData { const GPtrArray *link_watchers; /* this means that @_js_str is unset and needs to be created by - * converting the properties to JSON. This flag indicates that - * we need to re-generate the JSON string on-demand (lazily). */ + * converting the properties to JSON. This flag indicates that + * we need to re-generate the JSON string on-demand (lazily). */ bool _js_str_need_synthetize; bool strict_validated : 1; /* indicates tha the JSON is invalid. Usually, we do a very relaxed validation of - * the JSON config, in case !@strict_validated and accept all unknown fields. This - * flag indicates that the JSON value is not even parsable as JSON. nm_connection_verify() - * would reject such a setting. */ + * the JSON config, in case !@strict_validated and accept all unknown fields. This + * flag indicates that the JSON value is not even parsable as JSON. nm_connection_verify() + * would reject such a setting. */ bool js_str_invalid : 1; bool is_port : 1; diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index b420f9fbf2..d6314bf69e 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -81,9 +81,9 @@ _parse_endpoint(char *str, guint16 *out_port) gint16 port; /* Like - * - https://git.zx2c4.com/WireGuard/tree/src/tools/config.c?id=5e99a6d43fe2351adf36c786f5ea2086a8fe7ab8#n192 - * - https://github.com/systemd/systemd/blob/911649fdd43f3a9158b847947724a772a5a45c34/src/network/netdev/wireguard.c#L614 - */ + * - https://git.zx2c4.com/WireGuard/tree/src/tools/config.c?id=5e99a6d43fe2351adf36c786f5ea2086a8fe7ab8#n192 + * - https://github.com/systemd/systemd/blob/911649fdd43f3a9158b847947724a772a5a45c34/src/network/netdev/wireguard.c#L614 + */ g_strstrip(str); @@ -272,12 +272,12 @@ nm_sock_addr_endpoint_get_fixed_sockaddr(NMSockAddrEndpoint *self, gpointer sock goto good; /* See if there is an IPv6 scope-id... - * - * Note that it does not make sense to persist connection profiles to disk, - * that refenrence a scope-id (because the interface's ifindex changes on - * reboot). However, we also support runtime only changes like `nmcli device modify` - * where nothing is persisted to disk. At least in that case, passing a scope-id - * might be reasonable. So, parse that too. */ + * + * Note that it does not make sense to persist connection profiles to disk, + * that refenrence a scope-id (because the interface's ifindex changes on + * reboot). However, we also support runtime only changes like `nmcli device modify` + * where nothing is persisted to disk. At least in that case, passing a scope-id + * might be reasonable. So, parse that too. */ s = strchr(self->host, '%'); if (!s) return FALSE; @@ -500,11 +500,11 @@ static void __attribute__((constructor)) _nm_utils_init(void) return; /* we don't expect this code to run multiple times, nor on multiple threads. - * - * In practice, it would not be a problem if two threads concurrently try to - * run the initialization code below, all code below itself is thread-safe, - * Hence, a poor-man guard "initialized" above is more than sufficient, - * although it does not guarantee that the code is not run concurrently. */ + * + * In practice, it would not be a problem if two threads concurrently try to + * run the initialization code below, all code below itself is thread-safe, + * Hence, a poor-man guard "initialized" above is more than sufficient, + * although it does not guarantee that the code is not run concurrently. */ bindtextdomain(GETTEXT_PACKAGE, NMLOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); @@ -585,9 +585,9 @@ nm_utils_ssid_to_utf8(const guint8 *ssid, gsize len) if (!converted) { /* If there is still no converted string, the SSID probably - * contains characters not valid in the current locale. Convert - * the string to ASCII instead. - */ + * contains characters not valid in the current locale. Convert + * the string to ASCII instead. + */ /* Use the printable range of 0x20-0x7E */ char *valid_chars = " !\"#$%&'()*+,-./0123456789:;<=>?@" @@ -1070,8 +1070,8 @@ nm_utils_ap_mode_security_valid(NMUtilsSecurityType type, NMDeviceWifiCapabiliti return FALSE; /* Return TRUE for any security that wpa_supplicant's lightweight AP - * mode can handle: which is open, WEP, and WPA/WPA2 PSK. - */ + * mode can handle: which is open, WEP, and WPA/WPA2 PSK. + */ switch (type) { case NMU_SEC_NONE: case NMU_SEC_STATIC_WEP: @@ -2327,12 +2327,12 @@ static const NMVariantAttributeSpec *const tc_qdisc_fq_codel_spec[] = { NM_VARIANT_ATTRIBUTE_SPEC_DEFINE("quantum", G_VARIANT_TYPE_UINT32, ), /* 0x83126E97u is not a valid value (it means "disabled"). We should reject that - * value. Or alternatively, reject all values >= MAX_INT(32). */ + * value. Or alternatively, reject all values >= MAX_INT(32). */ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE("ce_threshold", G_VARIANT_TYPE_UINT32, ), /* kernel clamps the value at 2^31. Possibly such values should be rejected from configuration - * as they cannot be configured. Leaving the attribute unspecified causes kernel to choose - * a default (currently 32MB). */ + * as they cannot be configured. Leaving the attribute unspecified causes kernel to choose + * a default (currently 32MB). */ NM_VARIANT_ATTRIBUTE_SPEC_DEFINE("memory_limit", G_VARIANT_TYPE_UINT32, ), NM_VARIANT_ATTRIBUTE_SPEC_DEFINE("ecn", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ), @@ -2946,10 +2946,10 @@ _nm_sriov_vf_parse_vlans(NMSriovVF *vf, const char *str, GError **error) gint64 qos = -1; /* we accept leading/trailing whitespace around vlans[1]. Hence - * the nm_str_skip_leading_spaces() and g_strchomp() below. - * - * However, we don't accept any whitespace inside the specifier. - * Hence the NM_STRCHAR_ALL() checks. */ + * the nm_str_skip_leading_spaces() and g_strchomp() below. + * + * However, we don't accept any whitespace inside the specifier. + * Hence the NM_STRCHAR_ALL() checks. */ params = g_strsplit(nm_str_skip_leading_spaces(vlans[i]), ".", 3); if (!params || !params[0] || *params[0] == '\0') { @@ -3123,7 +3123,7 @@ _nm_utils_uuid_unparse(const NMUuid *uuid, char *out_str /*[37]*/) if (!out_str) { /* for convenience, allow %NULL to indicate that a new - * string should be allocated. */ + * string should be allocated. */ out_str = g_malloc(37); } uuid_unparse_lower(uuid->uuid, out_str); @@ -3454,7 +3454,7 @@ _nm_utils_check_file(const char * filename, } /* with check_owner enabled, check that the file belongs to the - * owner or root. */ + * owner or root. */ if (check_owner >= 0 && (out_st->st_uid != 0 && (gint64) out_st->st_uid != check_owner)) { g_set_error(error, NM_VPN_PLUGIN_ERROR, @@ -3466,7 +3466,7 @@ _nm_utils_check_file(const char * filename, } /* with check_owner enabled, check that the file cannot be modified - * by other users (except root). */ + * by other users (except root). */ if (check_owner >= 0 && NM_FLAGS_ANY(out_st->st_mode, S_IWGRP | S_IWOTH | S_ISUID)) { g_set_error(error, NM_VPN_PLUGIN_ERROR, @@ -3507,11 +3507,11 @@ _nm_utils_check_module_file(const char * name, } /* Set special error code if the file doesn't exist. - * The VPN package might be split into separate packages, - * so it could be correct that the plugin file is missing. - * - * Note that nm-applet checks for this error code to fail - * gracefully. */ + * The VPN package might be split into separate packages, + * so it could be correct that the plugin file is missing. + * + * Note that nm-applet checks for this error code to fail + * gracefully. */ if (!g_file_test(name, G_FILE_TEST_EXISTS)) { g_set_error(error, G_FILE_ERROR, @@ -3532,7 +3532,7 @@ _nm_utils_check_module_file(const char * name, if (g_str_has_suffix(name, ".la")) { /* g_module_open() treats files that end with .la special. - * We don't want to parse the libtool archive. Just error out. */ + * We don't want to parse the libtool archive. Just error out. */ g_set_error(error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, @@ -3582,7 +3582,7 @@ nm_utils_file_search_in_paths(const char * progname, g_return_val_if_fail(file_test_flags || predicate, NULL); /* Only consider @try_first if it is a valid, absolute path. This makes - * it simpler to pass in a path from configure checks. */ + * it simpler to pass in a path from configure checks. */ if (try_first && try_first[0] == '/' && (file_test_flags == 0 || g_file_test(try_first, file_test_flags)) && (!predicate || predicate(try_first, user_data))) @@ -4263,8 +4263,8 @@ nm_utils_hwaddr_matches(gconstpointer hwaddr1, if (G_UNLIKELY(hwaddr1_len <= 0 || hwaddr1_len > NM_UTILS_HWADDR_LEN_MAX)) { /* Only valid addresses can compare equal. In particular, - * addresses that are too long or of zero bytes, never - * compare equal. */ + * addresses that are too long or of zero bytes, never + * compare equal. */ return FALSE; } @@ -4377,18 +4377,18 @@ _nm_utils_hwaddr_cloned_data_synth(const NMSettInfoSetting * sett_ g_object_get(setting, "cloned-mac-address", &addr, NULL); /* Before introducing the extended "cloned-mac-address" (and its D-Bus - * field "assigned-mac-address"), libnm's _nm_utils_hwaddr_to_dbus() - * would drop invalid values as it was unable to serialize them. - * - * Now, we would like to send invalid values as "assigned-mac-address" - * over D-Bus and let the server reject them. - * - * However, clients used to set the cloned-mac-address property - * to "" and it just worked as the value was not serialized in - * an ill form. - * - * To preserve that behavior, serialize "" as NULL. - */ + * field "assigned-mac-address"), libnm's _nm_utils_hwaddr_to_dbus() + * would drop invalid values as it was unable to serialize them. + * + * Now, we would like to send invalid values as "assigned-mac-address" + * over D-Bus and let the server reject them. + * + * However, clients used to set the cloned-mac-address property + * to "" and it just worked as the value was not serialized in + * an ill form. + * + * To preserve that behavior, serialize "" as NULL. + */ return addr && addr[0] ? g_variant_new_take_string(g_steal_pointer(&addr)) : NULL; } @@ -4547,8 +4547,8 @@ static char * _split_word(char *s) { /* takes @s and truncates the string on the first white-space. - * then it returns the first word afterwards (again seeking - * over leading white-space). */ + * then it returns the first word afterwards (again seeking + * over leading white-space). */ for (; s[0]; s++) { if (g_ascii_isspace(s[0])) { s[0] = '\0'; @@ -4577,7 +4577,7 @@ _nm_utils_generate_mac_address_mask_parse(const char * value, if (!value || !*value) { /* NULL and "" are valid values and both mean the default - * "q */ + * "q */ if (out_mask) { memset(out_mask, 0, sizeof(*out_mask)); out_mask->ether_addr_octet[0] |= 0x02; @@ -4766,10 +4766,10 @@ const char * nm_utils_inet4_ntop(in_addr_t inaddr, char *dst) { /* relying on the static buffer (by leaving @dst as %NULL) is discouraged. - * Don't do that! - * - * However, still support it to be lenient against mistakes and because - * this is public API of libnm. */ + * Don't do that! + * + * However, still support it to be lenient against mistakes and because + * this is public API of libnm. */ return _nm_utils_inet4_ntop(inaddr, dst ?: _nm_utils_inet_ntop_buffer); } @@ -4796,10 +4796,10 @@ const char * nm_utils_inet6_ntop(const struct in6_addr *in6addr, char *dst) { /* relying on the static buffer (by leaving @dst as %NULL) is discouraged. - * Don't do that! - * - * However, still support it to be lenient against mistakes and because - * this is public API of libnm. */ + * Don't do that! + * + * However, still support it to be lenient against mistakes and because + * this is public API of libnm. */ g_return_val_if_fail(in6addr, NULL); return _nm_utils_inet6_ntop(in6addr, dst ?: _nm_utils_inet_ntop_buffer); } @@ -5081,8 +5081,8 @@ _nm_utils_strstrdictkey_create(const char *v1, const char *v2) return g_malloc0(1); /* we need to distinguish between ("",NULL) and (NULL,""). - * Thus, in @type we encode which strings we have present - * as not-NULL. */ + * Thus, in @type we encode which strings we have present + * as not-NULL. */ if (v1) { type |= STRSTRDICTKEY_V1_SET; l1 = strlen(v1) + 1; @@ -5367,7 +5367,7 @@ nm_utils_is_json_object(const char *str, GError **error) } /* valid JSON (depending on the definition) can also be a literal. - * Here we only allow objects. */ + * Here we only allow objects. */ if (!nm_json_is_object(json)) { g_set_error_literal(error, NM_CONNECTION_ERROR, @@ -5706,9 +5706,9 @@ nm_utils_get_timestamp_msec(void) if (ts == -EINVAL) { /* The fallback to CLOCK_MONOTONIC is taken only if we're running on a - * criminally old kernel, prior to 2.6.39 (released on 18 May, 2011). - * That happens during buildcheck on old builders, we don't expect to - * be actually runs on kernels that old. */ + * criminally old kernel, prior to 2.6.39 (released on 18 May, 2011). + * That happens during buildcheck on old builders, we don't expect to + * be actually runs on kernels that old. */ ts = nm_utils_clock_gettime_msec(CLOCK_MONOTONIC); if (ts >= 0) return ts; diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index 8d875bb172..c39075ccb5 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -24,10 +24,10 @@ static void nm_vpn_editor_plugin_default_init(NMVpnEditorPluginInterface *iface) { /** - * NMVpnEditorPlugin:name: - * - * Short display name of the VPN plugin. - */ + * NMVpnEditorPlugin:name: + * + * Short display name of the VPN plugin. + */ g_object_interface_install_property( iface, g_param_spec_string(NM_VPN_EDITOR_PLUGIN_NAME, @@ -37,10 +37,10 @@ nm_vpn_editor_plugin_default_init(NMVpnEditorPluginInterface *iface) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * NMVpnEditorPlugin:description: - * - * Longer description of the VPN plugin. - */ + * NMVpnEditorPlugin:description: + * + * Longer description of the VPN plugin. + */ g_object_interface_install_property( iface, g_param_spec_string(NM_VPN_EDITOR_PLUGIN_DESCRIPTION, @@ -50,10 +50,10 @@ nm_vpn_editor_plugin_default_init(NMVpnEditorPluginInterface *iface) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * NMVpnEditorPlugin:service: - * - * D-Bus service name of the plugin's VPN service. - */ + * NMVpnEditorPlugin:service: + * + * D-Bus service name of the plugin's VPN service. + */ g_object_interface_install_property( iface, g_param_spec_string(NM_VPN_EDITOR_PLUGIN_SERVICE, @@ -239,15 +239,15 @@ _nm_vpn_editor_plugin_load(const char * plugin_name, g_return_val_if_fail(plugin_name && *plugin_name, NULL); /* if @do_file_checks is FALSE, we pass plugin_name directly to - * g_module_open(). - * - * Otherwise, we allow for library names without path component. - * In which case, we prepend the plugin directory and form an - * absolute path. In that case, we perform checks on the file. - * - * One exception is that we don't allow for the "la" suffix. The - * reason is that g_module_open() interprets files with this extension - * special and we don't want that. */ + * g_module_open(). + * + * Otherwise, we allow for library names without path component. + * In which case, we prepend the plugin directory and form an + * absolute path. In that case, we perform checks on the file. + * + * One exception is that we don't allow for the "la" suffix. The + * reason is that g_module_open() interprets files with this extension + * special and we don't want that. */ plugin_filename = plugin_name; if (do_file_checks) { if (!strchr(plugin_name, '/') && !g_str_has_suffix(plugin_name, ".la")) { @@ -259,9 +259,9 @@ _nm_vpn_editor_plugin_load(const char * plugin_name, dl_module = dlopen(plugin_filename, RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); if (!dl_module && do_file_checks) { /* If the module is already loaded, we skip the file checks. - * - * _nm_utils_check_module_file() fails with ENOENT if the plugin file - * does not exist. That is relevant, because nm-applet checks for that. */ + * + * _nm_utils_check_module_file() fails with ENOENT if the plugin file + * does not exist. That is relevant, because nm-applet checks for that. */ if (!_nm_utils_check_module_file(plugin_filename, check_owner, check_file, @@ -303,10 +303,10 @@ _nm_vpn_editor_plugin_load(const char * plugin_name, if (loaded_before) { /* we want to leak the library, because the factory will register glib - * types, which cannot be unregistered. - * - * However, if the library was already loaded before, we want to return - * our part of the reference count. */ + * types, which cannot be unregistered. + * + * However, if the library was already loaded before, we want to return + * our part of the reference count. */ dlclose(dl_module); } diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 8690425faa..8fd56197cf 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -33,9 +33,9 @@ typedef struct { GKeyFile *keyfile; /* It is convenient for nm_vpn_plugin_info_lookup_property() to return a const char *, - * contrary to what g_key_file_get_string() does. Hence we must cache the returned - * value somewhere... let's put it in an internal hash table. - * This contains a clone of all the strings in keyfile. */ + * contrary to what g_key_file_get_string() does. Hence we must cache the returned + * value somewhere... let's put it in an internal hash table. + * This contains a clone of all the strings in keyfile. */ GHashTable *keys; gboolean editor_plugin_loaded; @@ -290,9 +290,9 @@ _nm_vpn_plugin_info_list_load_dir(const char * dirname, g_dir_close(dir); /* sort the files so that we have a stable behavior. The directory might contain - * duplicate VPNs, so while nm_vpn_plugin_info_list_load() would load them all, the - * caller probably wants to reject duplicates. Having a stable order means we always - * reject the same files in face of duplicates. */ + * duplicate VPNs, so while nm_vpn_plugin_info_list_load() would load them all, the + * caller probably wants to reject duplicates. Having a stable order means we always + * reject the same files in face of duplicates. */ g_array_sort(array, (GCompareFunc) _sort_files); for (i = 0; i < array->len; i++) @@ -320,16 +320,16 @@ nm_vpn_plugin_info_list_load() GSList * infos, *info; const char *const dir[] = { /* We load plugins from NM_VPN_PLUGIN_DIR *and* DEFAULT_DIR*, with - * preference to the former. - * - * load user directory with highest priority. */ + * preference to the former. + * + * load user directory with highest priority. */ _nm_vpn_plugin_info_get_default_dir_user(), /* lib directory has higher priority then etc. The reason is that - * etc is deprecated and used by old plugins. We expect newer plugins - * to install their file in lib, where they have higher priority. - * - * Optimally, there are no duplicates anyway, so it doesn't really matter. */ + * etc is deprecated and used by old plugins. We expect newer plugins + * to install their file in lib, where they have higher priority. + * + * Optimally, there are no duplicates anyway, so it doesn't really matter. */ _nm_vpn_plugin_info_get_default_dir_lib(), _nm_vpn_plugin_info_get_default_dir_etc(), }; @@ -461,7 +461,7 @@ nm_vpn_plugin_info_list_add(GSList **list, NMVpnPluginInfo *plugin_info, GError } /* the plugin must have unique values for certain properties. E.g. two different - * plugins cannot share the same service type. */ + * plugins cannot share the same service type. */ if (!_check_no_conflict(plugin_info, iter->data, error)) return FALSE; } @@ -632,25 +632,25 @@ nm_vpn_plugin_info_list_find_service_type(GSList *list, const char *name) return g_strdup(name); /* try to interpret @name as plugin name, in which case we return - * the main service-type (not an alias). */ + * the main service-type (not an alias). */ info = _list_find_by_service(list, name, NULL); if (info) return g_strdup(NM_VPN_PLUGIN_INFO_GET_PRIVATE(info)->service); /* check the hard-coded list of short-names. They all have the same - * well-known prefix org.freedesktop.NetworkManager and the name. */ + * well-known prefix org.freedesktop.NetworkManager and the name. */ if (nm_utils_strv_find_first((char **) known_names, G_N_ELEMENTS(known_names), name) >= 0) return g_strdup_printf("%s.%s", NM_DBUS_INTERFACE, name); /* try, if there exists a plugin with @name under org.freedesktop.NetworkManager. - * Allow this to be a valid abbreviation. */ + * Allow this to be a valid abbreviation. */ n = g_strdup_printf("%s.%s", NM_DBUS_INTERFACE, name); if (_list_find_by_service(list, NULL, n)) return n; g_free(n); /* currently, VPN plugins have no way to define a short-name for their - * alias name, unless the alias name is prefixed by org.freedesktop.NetworkManager. */ + * alias name, unless the alias name is prefixed by org.freedesktop.NetworkManager. */ return NULL; } @@ -934,8 +934,8 @@ nm_vpn_plugin_info_get_aliases(NMVpnPluginInfo *self) return (const char *const *) priv->aliases; /* For convenience, we always want to return non-NULL, even for empty - * aliases. Hack around that, by making a NULL terminated array using - * the NULL of priv->aliases. */ + * aliases. Hack around that, by making a NULL terminated array using + * the NULL of priv->aliases. */ return (const char *const *) &priv->aliases; } @@ -1052,7 +1052,7 @@ nm_vpn_plugin_info_load_editor_plugin(NMVpnPluginInfo *self, GError **error) } /* We only try once to load the plugin. If we previously tried and it was - * unsuccessful, error out immediately. */ + * unsuccessful, error out immediately. */ if (priv->editor_plugin_loaded) { g_set_error(error, NM_VPN_PLUGIN_ERROR, @@ -1151,7 +1151,7 @@ init_sync(GInitable *initable, GCancellable *cancellable, GError **error) } /* we also require "service", because that how we associate NMSettingVpn:service-type with the - * NMVpnPluginInfo. */ + * NMVpnPluginInfo. */ priv->service = g_key_file_get_string(priv->keyfile, NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, "service", @@ -1185,7 +1185,7 @@ init_sync(GInitable *initable, GCancellable *cancellable, GError **error) char *s; /* Lookup the value via get_string(). We want that behavior for all our - * values. */ + * values. */ s = g_key_file_get_string(priv->keyfile, groups[i], keys[j], NULL); if (s) g_hash_table_insert(priv->keys, @@ -1295,12 +1295,12 @@ nm_vpn_plugin_info_class_init(NMVpnPluginInfoClass *plugin_class) object_class->finalize = finalize; /** - * NMVpnPluginInfo:name: - * - * The name of the VPN plugin. - * - * Since: 1.2 - */ + * NMVpnPluginInfo:name: + * + * The name of the VPN plugin. + * + * Since: 1.2 + */ g_object_class_install_property(object_class, PROP_NAME, g_param_spec_string(NM_VPN_PLUGIN_INFO_NAME, @@ -1310,15 +1310,15 @@ nm_vpn_plugin_info_class_init(NMVpnPluginInfoClass *plugin_class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * NMVpnPluginInfo:filename: - * - * The filename from which the info was loaded. - * Can be %NULL if the instance was not loaded from - * a file (i.e. the keyfile instance was passed to the - * constructor). - * - * Since: 1.2 - */ + * NMVpnPluginInfo:filename: + * + * The filename from which the info was loaded. + * Can be %NULL if the instance was not loaded from + * a file (i.e. the keyfile instance was passed to the + * constructor). + * + * Since: 1.2 + */ g_object_class_install_property( object_class, PROP_FILENAME, @@ -1329,14 +1329,14 @@ nm_vpn_plugin_info_class_init(NMVpnPluginInfoClass *plugin_class) G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); /** - * NMVpnPluginInfo:keyfile: - * - * Initialize the instance with a different keyfile instance. - * When passing a keyfile instance, the constructor will not - * try to read from filename. - * - * Since: 1.2 - */ + * NMVpnPluginInfo:keyfile: + * + * Initialize the instance with a different keyfile instance. + * When passing a keyfile instance, the constructor will not + * try to read from filename. + * + * Since: 1.2 + */ g_object_class_install_property( object_class, PROP_KEYFILE, diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c index 4c5ba0f7d8..97a574de13 100644 --- a/libnm-core/tests/test-crypto.c +++ b/libnm-core/tests/test-crypto.c @@ -326,9 +326,9 @@ test_pkcs8(gconstpointer test_data) test_is_pkcs12(path, TRUE); /* Note: NSS and gnutls < 3.5.4 don't support all the ciphers that openssl - * can use with PKCS#8 and thus the password can't be actually verified with - * such libraries. - */ + * can use with PKCS#8 and thus the password can't be actually verified with + * such libraries. + */ test_load_pkcs8(path, password, -1); g_free(path); diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 20b3b222eb..7c10f02756 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -142,9 +142,9 @@ _test_hash_str(const char *str) v = nm_hash_complete(&h); /* assert that hashing a string and a buffer yields the - * same result. - * - * I think that is a desirable property. */ + * same result. + * + * I think that is a desirable property. */ nm_hash_init(&h, SEED); nm_hash_update_mem(&h, str, strlen(str)); v2 = nm_hash_complete(&h); @@ -167,8 +167,8 @@ _test_hash_str(const char *str) nm_hash_init(&h3, 10); \ \ /* assert that it doesn't matter, whether we hash the values individually, - * or all at once, or via the convenience macros nm_hash_update_val() - * and nm_hash_update_vals(). */ \ + * or all at once, or via the convenience macros nm_hash_update_val() + * and nm_hash_update_vals(). */ \ for (i = 0; i < G_N_ELEMENTS(v); i++) { \ nm_hash_update(&h0, &v[i], sizeof(type)); \ nm_hash_update_val(&h1, v[i]); \ @@ -300,7 +300,7 @@ _do_test_nm_utils_strsplit_set_f_one(NMUtilsStrsplitSetFlags flags, initial_offset = (f_preserve_empty || !str) ? 0u : strspn(str, DELIMITERS); /* first compare our expected values with what g_strsplit_set() would - * do. */ + * do. */ words_g = str ? g_strsplit_set(str, DELIMITERS, -1) : NULL; if (str == NULL) { g_assert_cmpint(words_len, ==, 0); @@ -365,9 +365,9 @@ _do_test_nm_utils_strsplit_set_f_one(NMUtilsStrsplitSetFlags flags, } /* while strsplit removes all delimiters, we can relatively easily find them - * in the original string. Assert that the original string and the pointer offsets - * of words correspond. In particular, find idx_delim_after and idx_delim_before - * to determine which delimiter was after/before a word. */ + * in the original string. Assert that the original string and the pointer offsets + * of words correspond. In particular, find idx_delim_after and idx_delim_before + * to determine which delimiter was after/before a word. */ { gsize idx_word_start; gsize idx_delim_after_old = G_MAXSIZE; @@ -379,9 +379,9 @@ _do_test_nm_utils_strsplit_set_f_one(NMUtilsStrsplitSetFlags flags, gsize idx_delim_before; /* find the delimiter *after* words[i]. We can do that by looking at the next - * word and calculating the pointer difference. - * - * The delimiter after the very last word is '\0' and requires strlen() to find. */ + * word and calculating the pointer difference. + * + * The delimiter after the very last word is '\0' and requires strlen() to find. */ idx_delim_after = initial_offset + ((words[i] - words[0]) + l_i); if (idx_delim_after != idx_word_start + l_i) { g_assert(!f_preserve_empty); @@ -408,7 +408,7 @@ _do_test_nm_utils_strsplit_set_f_one(NMUtilsStrsplitSetFlags flags, /* find the delimiter *before* words[i]. */ if (i == 0) { /* there is only a delimiter *before*, with !f_preserve_empty and leading - * delimiters. */ + * delimiters. */ idx_delim_before = G_MAXSIZE; if (initial_offset > 0) { g_assert(!f_preserve_empty); @@ -755,8 +755,8 @@ _escaped_tokens_create_random_word_full(const char *const *tokens, gsize n_token } /* reallocate the string, so that we don't have any excess memory from - * the GString buffer. This is so that valgrind may better detect an out - * or range access. */ + * the GString buffer. This is so that valgrind may better detect an out + * or range access. */ return nm_str_realloc(g_string_free(gstr, FALSE)); } @@ -967,10 +967,10 @@ test_nm_utils_escaped_tokens(void) if (i_option % 2u == 1 && nmtst_get_rand_uint32() % 5 == 0 && strlen(options->pdata[options->len - 1]) > 0u) { /* For some options, leave the value unset and only generate a key. - * - * If key is "", then we cannot do that, because the test below would try - * to append "" to the combined list, which the parser then would drop. - * Only test omitting the value, if strlen() of the key is positive. */ + * + * If key is "", then we cannot do that, because the test below would try + * to append "" to the combined list, which the parser then would drop. + * Only test omitting the value, if strlen() of the key is positive. */ } else word = _escaped_tokens_create_random_word(); g_ptr_array_add(options, word); @@ -1032,18 +1032,18 @@ test_nm_utils_escaped_tokens(void) g_assert_cmpint(NM_PTRARRAY_LEN(strv_split), ==, num_options); /* Above we show a full round-trip of random option key-value pairs, that they can - * without loss escape, concatenate, split-list, and split. This proofed that every - * option key-value pair can be represented as a combined string and parsed back. - * - * Now, just check that we can also parse arbitrary random words in nm_utils_escaped_tokens_options_split(). - * split() is a non-injective surjective function. As we check the round-trip above for random words, where - * options-split() is the last step, we show that every random word can be the output of the function - * (which shows, the surjective part). - * - * But multiple random input arguments, may map to the same output argument (non-injective). - * Just test whether we can handle random input words without crashing. For that, just use the - * above generate list of random words. - */ + * without loss escape, concatenate, split-list, and split. This proofed that every + * option key-value pair can be represented as a combined string and parsed back. + * + * Now, just check that we can also parse arbitrary random words in nm_utils_escaped_tokens_options_split(). + * split() is a non-injective surjective function. As we check the round-trip above for random words, where + * options-split() is the last step, we show that every random word can be the output of the function + * (which shows, the surjective part). + * + * But multiple random input arguments, may map to the same output argument (non-injective). + * Just test whether we can handle random input words without crashing. For that, just use the + * above generate list of random words. + */ for (i = 0; i < 1u + 2u * i_option; i++) { gs_free char *str = NULL; const char * cstr; @@ -1726,9 +1726,9 @@ del_iter_func(const char *key, const char *value, gpointer user_data) int i; /* Record how many times this function gets called; it should get called - * exactly as many times as there are keys in the hash table, regardless - * of what keys we delete from the table. - */ + * exactly as many times as there are keys in the hash table, regardless + * of what keys we delete from the table. + */ info->called++; /* During the iteration, remove a bunch of stuff from the table */ @@ -1774,8 +1774,8 @@ test_setting_vpn_modify_during_foreach(void) } /* And make sure the foreach callback was called the same number of times - * as there were keys in the table at the beginning of the foreach. - */ + * as there were keys in the table at the beginning of the foreach. + */ g_assert_cmpint(info.called, ==, TO_DEL_NUM * 2); g_object_unref(s_vpn); @@ -1812,8 +1812,8 @@ test_setting_ip4_config_labels(void) g_assert(label == NULL); /* The 'address-labels' property should be omitted from the serialization if - * there are no non-NULL labels. - */ + * there are no non-NULL labels. + */ conn = nmtst_create_minimal_connection("label test", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL); nm_connection_add_setting(conn, nm_setting_duplicate(NM_SETTING(s_ip4))); dict = nm_connection_to_dbus(conn, NM_CONNECTION_SERIALIZE_ALL); @@ -1876,8 +1876,8 @@ test_setting_ip4_config_labels(void) g_assert(label == NULL); /* If we serialize as the daemon, the labels should appear in the D-Bus - * serialization under both 'address-labels' and 'address-data'. - */ + * serialization under both 'address-labels' and 'address-data'. + */ conn = nmtst_create_minimal_connection("label test", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL); nm_connection_add_setting(conn, NM_SETTING(s_ip4)); _nm_utils_is_manager_process = TRUE; @@ -1915,8 +1915,8 @@ test_setting_ip4_config_labels(void) g_variant_unref(setting_dict); /* We should be able to deserialize the labels from either 'address-labels' - * or 'address-data'. - */ + * or 'address-data'. + */ dict2 = g_variant_ref(dict); NMTST_VARIANT_EDITOR( @@ -2018,8 +2018,8 @@ test_setting_ip4_config_address_data(void) nmtst_assert_setting_verifies(NM_SETTING(s_ip4)); /* The client-side D-Bus serialization should include the attributes in - * "address-data", and should not have an "addresses" property. - */ + * "address-data", and should not have an "addresses" property. + */ conn = nmtst_create_minimal_connection("address-data test", NULL, NM_SETTING_WIRED_SETTING_NAME, @@ -2512,8 +2512,8 @@ test_connection_to_dbus_setting_name(void) dict = nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL); /* Make sure the keys of the first level dict are setting names, not - * the GType name of the setting objects. - */ + * the GType name of the setting objects. + */ g_assert(_variant_contains(dict, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME)); g_variant_unref(dict); @@ -2727,15 +2727,15 @@ test_setting_new_from_dbus_bad(void) GError * error = NULL; /* We want to test: - * - ordinary scalar properties - * - string properties - * - GBytes-valued properties (which are handled specially by set_property_from_dbus()) - * - enum/flags-valued properties - * - overridden properties - * - transformed properties - * - * No single setting class has examples of all of these, so we need two settings. - */ + * - ordinary scalar properties + * - string properties + * - GBytes-valued properties (which are handled specially by set_property_from_dbus()) + * - enum/flags-valued properties + * - overridden properties + * - transformed properties + * + * No single setting class has examples of all of these, so we need two settings. + */ conn = nm_simple_connection_new(); @@ -3927,8 +3927,8 @@ test_connection_bad_base_types(void) GError * error = NULL; /* Test various non-base connection types to make sure they are rejected; - * using a fake 'wired' connection so the rest of it verifies - */ + * using a fake 'wired' connection so the rest of it verifies + */ /* Connection setting */ connection = nm_simple_connection_new(); @@ -4353,8 +4353,8 @@ test_setting_compare_secrets(gconstpointer test_data) gs_unref_object NMSetting *new = NULL; /* Make sure that a connection with transient/unsaved secrets compares - * successfully to the same connection without those secrets. - */ + * successfully to the same connection without those secrets. + */ old = nm_setting_wireless_security_new(); g_object_set(old, @@ -4433,8 +4433,8 @@ test_setting_compare_vpn_secrets(gconstpointer test_data) gboolean success; /* Make sure that a connection with transient/unsaved secrets compares - * successfully to the same connection without those secrets. - */ + * successfully to the same connection without those secrets. + */ old = nm_setting_vpn_new(); nm_setting_vpn_add_secret(NM_SETTING_VPN(old), "foobarbaz", "really secret password"); @@ -4650,7 +4650,7 @@ _netmask_to_prefix(guint32 netmask) g_assert_cmpint(prefix, <=, 32); /* we re-implemented the netmask-to-prefix code differently. Check - * that they agree. */ + * that they agree. */ g_assert_cmpint(prefix, ==, nm_utils_ip4_netmask_to_prefix(netmask)); return prefix; @@ -4706,7 +4706,7 @@ test_ip4_netmask_to_prefix(void) continue; /* create an invalid netmask with holes and check that the function - * returns the longest prefix. */ + * returns the longest prefix. */ prefix_holey = _netmask_to_prefix(netmask_holey); g_assert_cmpint(i, ==, prefix_holey); @@ -5193,7 +5193,7 @@ test_setting_old_uuid(void) gs_unref_object NMSetting *setting = NULL; /* NetworkManager-0.9.4.0 generated 40-character UUIDs with no dashes, - * like this one. Test that we maintain compatibility. */ + * like this one. Test that we maintain compatibility. */ const char *uuid = "f43bec2cdd60e5da381ebb1eb1fa39f3cc52660c"; setting = nm_setting_connection_new(); @@ -5312,8 +5312,8 @@ test_connection_normalize_virtual_iface_name(void) g_object_unref(con); /* But removing connection.interface-name should result in vlan.connection-name - * being "promoted". - */ + * being "promoted". + */ NMTST_VARIANT_EDITOR(connection_dict, NMTST_VARIANT_DROP_PROPERTY(NM_SETTING_CONNECTION_SETTING_NAME, NM_SETTING_CONNECTION_INTERFACE_NAME);); @@ -5838,8 +5838,8 @@ test_connection_normalize_gateway_never_default(void) g_assert_cmpstr("1.1.1.254", ==, nm_setting_ip_config_get_gateway(s_ip4)); /* Now set never-default to TRUE and check that the gateway is - * removed during normalization - * */ + * removed during normalization + * */ g_object_set(s_ip4, NM_SETTING_IP_CONFIG_NEVER_DEFAULT, TRUE, NULL); nmtst_assert_connection_verifies_after_normalization(con, @@ -5880,8 +5880,8 @@ test_connection_normalize_may_fail(void) nmtst_assert_connection_verifies_and_normalizable(con); /* Now set method=disabled/ignore and check that may-fail becomes TRUE - * after normalization - * */ + * after normalization + * */ g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_DISABLED, NULL); g_object_set(s_ip6, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL); @@ -5922,8 +5922,8 @@ test_connection_normalize_shared_addresses(void) nmtst_assert_connection_verifies_and_normalizable(con); /* Now we add other addresses and check that they are - * removed during normalization - * */ + * removed during normalization + * */ addr = nm_ip_address_new(AF_INET, "2.2.2.2", 24, &error); g_assert_no_error(error); nm_setting_ip_config_add_address(s_ip4, addr); @@ -6345,8 +6345,8 @@ test_setting_ip4_gateway(void) nmtst_assert_ip4_address(addr_vals_0[0], "192.168.1.10"); /* When serializing on the daemon side, ipv4.gateway is copied to the first - * entry of ipv4.addresses - */ + * entry of ipv4.addresses + */ conn = nmtst_create_minimal_connection("test_setting_ip4_gateway", NULL, NM_SETTING_WIRED_SETTING_NAME, @@ -6398,8 +6398,8 @@ test_setting_ip4_gateway(void) g_variant_unref(ip4_dict); /* When deserializing an old-style connection, the first non-0 gateway in - * ipv4.addresses is copied to :gateway. - */ + * ipv4.addresses is copied to :gateway. + */ NMTST_VARIANT_EDITOR( conn_dict, NMTST_VARIANT_DROP_PROPERTY(NM_SETTING_IP4_CONFIG_SETTING_NAME, @@ -6500,8 +6500,8 @@ test_setting_ip6_gateway(void) GError * error = NULL; /* When serializing on the daemon side, ipv6.gateway is copied to the first - * entry of ipv6.addresses - */ + * entry of ipv6.addresses + */ conn = nmtst_create_minimal_connection("test_setting_ip6_gateway", NULL, NM_SETTING_WIRED_SETTING_NAME, @@ -6555,8 +6555,8 @@ test_setting_ip6_gateway(void) g_variant_unref(ip6_dict); /* When deserializing an old-style connection, the first non-0 gateway in - * ipv6.addresses is copied to :gateway. - */ + * ipv6.addresses is copied to :gateway. + */ NMTST_VARIANT_EDITOR( conn_dict, NMTST_VARIANT_DROP_PROPERTY(NM_SETTING_IP6_CONFIG_SETTING_NAME, @@ -8280,7 +8280,7 @@ test_nm_utils_is_power_of_two(void) if (xyes != 0) { again: /* Find another @xno, that is not a power of two. Do that, - * by randomly setting bits. */ + * by randomly setting bits. */ numbits = g_rand_int_range(rand, 1, 65); while (xno != ~((guint64) 0) && numbits > 0) { guint64 v = (((guint64) 1) << g_rand_int_range(rand, 0, 64)); @@ -8512,7 +8512,7 @@ test_nm_utils_ptrarray_find_binary_search_with_duplicates(void) for (i_test = 0; i_test < N_TEST; i_test++) { for (i_len = 0; i_len < BIN_SEARCH_W_DUPS_LEN; i_len++) { /* fill with random numbers... surely there are some duplicates - * there... or maybe even there are none... */ + * there... or maybe even there are none... */ for (i = 0; i < i_len; i++) arr[i] = GINT_TO_POINTER(nmtst_get_rand_uint32() % (i_len + BIN_SEARCH_W_DUPS_JITTER)); @@ -8884,8 +8884,8 @@ _do_test_utils_str_utf8safe(const char * str, g_assert_cmpstr(buf_safe, ==, str_safe); /* nm_utils_buf_utf8safe_escape() can only return a pointer equal to the input string, - * if and only if str_len is negative. Otherwise, the input str won't be NUL terminated - * and cannot be returned. */ + * if and only if str_len is negative. Otherwise, the input str won't be NUL terminated + * and cannot be returned. */ g_assert(buf_safe != str); g_assert(buf_safe == str_free_1); } else @@ -9425,7 +9425,7 @@ test_nm_set_out(void) int call_count; /* NM_SET_OUT() has an unexpected non-function like behavior - * wrt. side-effects of the value argument. Test it */ + * wrt. side-effects of the value argument. Test it */ p_val = &val; call_count = 0; @@ -10121,14 +10121,14 @@ test_strsplit_quoted(void) gs_free char * str = NULL; /* create random strv array and join them carefully so that splitting - * them will yield the original value. */ + * them will yield the original value. */ strv = _strsplit_quoted_create_strv_rand(); str = _strsplit_quoted_join_strv_rand((const char *const *) strv); _strsplit_quoted_test(str, (const char *const *) strv); } /* Create random words and assert that systemd and our implementation can - * both split them (and in the exact same way). */ + * both split them (and in the exact same way). */ for (i_run = 0; i_run < 1000; i_run++) { gs_free char *s = _strsplit_quoted_create_str_rand(nmtst_get_rand_uint32() % 150); diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index f4168e5222..c4d33fe418 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -45,7 +45,7 @@ do_test_encode_key_full(GKeyFile * kf, g_assert_cmpstr(key2, ==, key); /* try to add the encoded key to the keyfile. We expect - * no g_critical warning about invalid key. */ + * no g_critical warning about invalid key. */ g_key_file_set_value(kf, "group", key, "dummy"); } @@ -195,8 +195,8 @@ _nm_keyfile_read(GKeyFile * keyfile, NMSettingConnection *s_con; /* a non-slave connection must have a proxy setting, but - * keyfile reader does not add that (unless a [proxy] section - * is present. */ + * keyfile reader does not add that (unless a [proxy] section + * is present. */ s_con = nm_connection_get_setting_connection(con); if (s_con && !nm_setting_connection_get_master(s_con) && !nm_connection_get_setting_proxy(con)) @@ -223,7 +223,7 @@ _keyfile_convert(NMConnection ** con, nm_auto_unref_keyfile GKeyFile *k0_c1_k2 = NULL, *c0_k1 = NULL, *c0_k1_c2_k3 = NULL; /* convert from @con to @keyfile and check that we can make - * full round trips and obtaining the same result. */ + * full round trips and obtaining the same result. */ g_assert(con); g_assert(keyfile); @@ -247,8 +247,8 @@ _keyfile_convert(NMConnection ** con, k0_c1_k2_c3 = _nm_keyfile_read(k0_c1_k2, keyfile_name, read_handler, read_data, FALSE); /* It is a expected behavior, that if @k0 contains a relative path ca-cert, @k0_c1 will - * contain that path as relative. But @k0_c1_k2 and @k0_c1_k2_c3 will have absolute paths. - * In this case, hack up @k0_c1_k2_c3 to contain the same relative path. */ + * contain that path as relative. But @k0_c1_k2 and @k0_c1_k2_c3 will have absolute paths. + * In this case, hack up @k0_c1_k2_c3 to contain the same relative path. */ s1 = nm_connection_get_setting_802_1x(k0_c1); s2 = nm_connection_get_setting_802_1x(k0_c1_k2_c3); if (s1 || s2) { @@ -269,8 +269,8 @@ _keyfile_convert(NMConnection ** con, g_assert(p1[0] != '/' && p2[0] == '/'); /* one of the paths is a relative path and the other is absolute. This is an - * expected difference. - * Make the paths of s2 identical to s1... */ + * expected difference. + * Make the paths of s2 identical to s1... */ puri = g_strconcat(NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, p1, NULL); pfile = g_bytes_new(puri, strlen(puri) + 1); g_object_set(s2, NM_SETTING_802_1X_CA_CERT, pfile, NULL); @@ -301,7 +301,7 @@ _keyfile_convert(NMConnection ** con, *con = g_object_ref(k0_c1); else { /* finally, if both a keyfile and a connection are given, assert that they are equal - * after a round of conversion. */ + * after a round of conversion. */ g_assert(_nm_keyfile_equals(c0_k1, k0_c1_k2, TRUE)); nmtst_assert_connection_equals(k0_c1, FALSE, c0_k1_c2, FALSE); } diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c index 347db36c9f..8711d3367f 100644 --- a/libnm-core/tests/test-secrets.c +++ b/libnm-core/tests/test-secrets.c @@ -430,8 +430,8 @@ test_update_secrets_wifi_full_hash(void) const char * tmp; /* Test update with a hashed connection containing only 802-11-wireless - * setting and secrets. - */ + * setting and secrets. + */ connection = wifi_connection_new(); @@ -470,8 +470,8 @@ test_update_secrets_wifi_bad_setting_name(void) const char * wepkey = "11111111111111111111111111"; /* Test that passing an invalid setting name to - * nm_connection_update_secrets() fails with the correct error. - */ + * nm_connection_update_secrets() fails with the correct error. + */ connection = wifi_connection_new(); @@ -497,8 +497,8 @@ test_update_secrets_whole_connection(void) const char * wepkey = "11111111111111111111111111"; /* Test calling nm_connection_update_secrets() with an entire hashed - * connection including non-secrets. - */ + * connection including non-secrets. + */ connection = wifi_connection_new(); @@ -556,8 +556,8 @@ test_update_secrets_whole_connection_bad_setting(void) const char * wepkey = "11111111111111111111111111"; /* Test that sending a hashed connection containing an invalid setting - * name fails with the right error. - */ + * name fails with the right error. + */ connection = wifi_connection_new(); s_wsec = nm_connection_get_setting_wireless_security(connection); @@ -568,9 +568,9 @@ test_update_secrets_whole_connection_bad_setting(void) secrets = nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL); /* Copy the dict, renaming the wireless-security setting in the process - * (so we ensure libnm is returning the right error when it finds an entry - * in the connection hash that doesn't match any setting in the connection). - */ + * (so we ensure libnm is returning the right error when it finds an entry + * in the connection hash that doesn't match any setting in the connection). + */ g_variant_builder_init(&conn_builder, NM_VARIANT_TYPE_CONNECTION); g_variant_iter_init(&conn_iter, secrets); while (g_variant_iter_next(&conn_iter, "{&s@a{sv}}", &setting_name, &setting_hash)) { @@ -601,8 +601,8 @@ test_update_secrets_whole_connection_empty_base_setting(void) gboolean success; /* Test that a hashed connection which does not have any hashed secrets - * for the requested setting returns success. - */ + * for the requested setting returns success. + */ connection = wifi_connection_new(); secrets = nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ONLY_SECRETS); diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c index d18c0a44fc..d8518ca853 100644 --- a/libnm-core/tests/test-setting.c +++ b/libnm-core/tests/test-setting.c @@ -82,7 +82,7 @@ _connection_new_from_dbus_strict(GVariant *dict, gboolean normalize) nmtst_assert_connection_verifies_without_normalization(con_n_s); /* randomly compare some pairs that we created. They must all be equal, - * after accounting for normalization. */ + * after accounting for normalization. */ for (i = 0; i < 10; i++) { NMConnection *cons[] = {con_x_0, con_x_s, con_x_e, con_n_0, con_n_s, con_n_e}; guint idx_a = (nmtst_get_rand_uint32() % G_N_ELEMENTS(cons)); @@ -749,9 +749,9 @@ test_dcb_flags_valid(void) #define TEST_FLAG(p, f, v) \ { \ /* GObject property min/max should ensure the property does not get set to \ - * the invalid value, so we ensure the value we just tried to set is 0 and \ - * that verify is successful since the property never got set. \ - */ \ + * the invalid value, so we ensure the value we just tried to set is 0 and \ + * that verify is successful since the property never got set. \ + */ \ g_object_set(G_OBJECT(s_dcb), p, v, NULL); \ g_assert_cmpint(f(s_dcb), ==, 0); \ success = nm_setting_verify(NM_SETTING(s_dcb), NULL, &error); \ @@ -862,8 +862,8 @@ test_dcb_app_priorities(void) if (verify) { \ if (val != 0) { \ /* Assert that verify fails because the flags do not include 'enabled' \ - * and a value has been set. \ - */ \ + * and a value has been set. \ + */ \ success = nm_setting_verify(NM_SETTING(s_dcb), NULL, &error); \ g_assert_error(error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY); \ g_assert(success == FALSE); \ @@ -922,8 +922,8 @@ test_dcb_priorities_valid(void) nm_setting_dcb_set_priority_group_bandwidth(s_dcb, i, 0); /* Priority Group Bandwidth must add up to 100% if enabled, which requires - * some dancing for verifying individual values here. - */ + * some dancing for verifying individual values here. + */ for (i = 0; i < 8; i++) { guint other = 7 - (i % 8); @@ -1577,9 +1577,9 @@ _check_team_setting(NMSetting *setting) nmtst_assert_setting_dbus_roundtrip(setting); /* OK, now parse the setting only from the D-Bus variant, but removing the JSON config. - * For that, we have to "drop" the JSON and we do that by resetting the property. - * This causes JSON to be regenerated and it's in a normalized form that will compare - * equal. */ + * For that, we have to "drop" the JSON and we do that by resetting the property. + * This causes JSON to be regenerated and it's in a normalized form that will compare + * equal. */ setting_clone = nm_setting_duplicate(setting); setting = setting_clone; if (is_port) { @@ -2991,8 +2991,8 @@ _rndt_wg_peers_create(void) guint i_aip, n_aip; /* we don't bother to create a valid curve25519 public key. Of course, libnm cannot - * check whether the public key is bogus or not. Hence, for our purpose a random - * bogus key is good enough. */ + * check whether the public key is bogus or not. Hence, for our purpose a random + * bogus key is good enough. */ public_key = g_base64_encode(nmtst_rand_buf(NULL, public_key_buf, sizeof(public_key_buf)), sizeof(public_key_buf)); @@ -3524,8 +3524,8 @@ test_roundtrip_conversion(gconstpointer test_data) } /* the first kf_data_arr entry is special: it is the exact result of what we expect - * when converting @con to keyfile. Write @con to keyfile and compare the expected result - * literally. */ + * when converting @con to keyfile. Write @con to keyfile and compare the expected result + * literally. */ { nm_auto_unref_keyfile GKeyFile *kf = NULL; @@ -3533,7 +3533,7 @@ test_roundtrip_conversion(gconstpointer test_data) nmtst_assert_success(kf, error); /* the first kf_data_arr entry is special: it must be what the writer would - * produce again. */ + * produce again. */ nmtst_keyfile_assert_data(kf, kf_data_arr->pdata[0], -1); } @@ -3553,12 +3553,12 @@ test_roundtrip_conversion(gconstpointer test_data) if (ETH_MTU > (guint32) G_MAXINT && kf_data_idx == 1) { /* older versions wrote values > 2^21 as signed integers, but the reader would - * always reject such negative values for G_TYPE_UINT. - * - * The test case kf_data_idx #1 still writes the values in the old style. - * The behavior was fixed, but such values are still rejected as invalid. - * - * Patch the setting so that the comparison below succeeds are usual. */ + * always reject such negative values for G_TYPE_UINT. + * + * The test case kf_data_idx #1 still writes the values in the old style. + * The behavior was fixed, but such values are still rejected as invalid. + * + * Patch the setting so that the comparison below succeeds are usual. */ g_assert_cmpint(nm_setting_wired_get_mtu(s_eth2), ==, 0); g_object_set(s_eth2, NM_SETTING_WIRED_MTU, ETH_MTU, NULL); } @@ -4127,7 +4127,7 @@ test_setting_metadata(void) default_value = ((const GParamSpecString *) sip->param_spec)->default_value; if (default_value) { /* having a string property with a default != NULL is really ugly. They - * should be best avoided... */ + * should be best avoided... */ if (meta_type == NM_META_SETTING_TYPE_DCB && nm_streq(sip->name, NM_SETTING_DCB_APP_FCOE_MODE)) { /* Whitelist the properties that have a non-NULL default value. */ @@ -4166,7 +4166,7 @@ test_setting_metadata(void) g_assert_cmpint(meta_type, ==, NM_META_SETTING_TYPE_CONNECTION); /* ensure that there are no duplicates, and that all properties are also - * tracked by sis->property_infos. */ + * tracked by sis->property_infos. */ for (prop_idx = 0; prop_idx < sis->property_infos_len; prop_idx++) { const NMSettInfoProperty *sip = sis->property_infos_sorted[prop_idx]; @@ -4226,16 +4226,16 @@ test_setting_metadata(void) || (pt_2 == &nm_sett_info_propert_type_plain_u && pt == &nm_sett_info_propert_type_deprecated_ignore_u)) { /* These are known to be duplicated. This is the case for - * "gsm.network-type" and plain properties like "802-11-wireless-security.fils" ("i" D-Bus type) - * "gsm.allowed-bands" and plain properties like "802-11-olpc-mesh.channel" ("u" D-Bus type) - * While the content/behaviour of the property types are identical, their purpose - * is different. So allow them. - */ + * "gsm.network-type" and plain properties like "802-11-wireless-security.fils" ("i" D-Bus type) + * "gsm.allowed-bands" and plain properties like "802-11-olpc-mesh.channel" ("u" D-Bus type) + * While the content/behaviour of the property types are identical, their purpose + * is different. So allow them. + */ continue; } /* the property-types with same content should all be shared. Here we have two that - * are the same content, but different instances. Bug. */ + * are the same content, but different instances. Bug. */ g_error("The identical property type for D-Bus type \"%s\" is used by: %s and %s", (const char *) pt->dbus_type, _PROP_IDX_OWNER(h_property_types, pt), diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c index 988521e431..228207fc78 100644 --- a/libnm-core/tests/test-settings-defaults.c +++ b/libnm-core/tests/test-settings-defaults.c @@ -43,8 +43,8 @@ test_defaults(GType type, const char *name) gboolean ok = FALSE; /* Ignore non-fundamental types since they won't really have - * defaults. - */ + * defaults. + */ if (!G_TYPE_IS_FUNDAMENTAL(prop_spec->value_type)) continue; |