diff options
| author | Thomas Haller <thaller@redhat.com> | 2013-12-01 23:31:47 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-06-30 18:35:46 +0200 |
| commit | 29d538239f519e7328c3895b086136ca1b2864f8 (patch) | |
| tree | c4c9ae949bf601413dc458f9e91585e370c2eec7 /libnm-util/nm-connection.h | |
| parent | 794ed1c9efc8ddd3677e125795acd40c69a5ed5a (diff) | |
| download | NetworkManager-29d538239f519e7328c3895b086136ca1b2864f8.tar.gz | |
libnm-util: normalize IP settings in connection
This is the same behaviour as nm_utils_normalize_connection(),
which will soon be removed in favor of nm_connection_normalize().
This takes care, that normal connections always have an IP4 and IP6 setting,
and that slave connections never have it.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'libnm-util/nm-connection.h')
| -rw-r--r-- | libnm-util/nm-connection.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h index dcc24b9178..692bdc688b 100644 --- a/libnm-util/nm-connection.h +++ b/libnm-util/nm-connection.h @@ -86,6 +86,8 @@ G_BEGIN_DECLS * #NMSettingWireless. * @NM_CONNECTION_ERROR_SETTING_NOT_FOUND: the #NMConnection object * did not contain the specified #NMSetting object + *@NM_CONNECTION_ERROR_INVALID_SETTING: the #NMConnection object contains + * a conflicting setting object * * Describes errors that may result from operations involving a #NMConnection. * @@ -95,9 +97,17 @@ typedef enum NM_CONNECTION_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND, /*< nick=ConnectionSettingNotFound >*/ NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID, /*< nick=ConnectionTypeInvalid >*/ - NM_CONNECTION_ERROR_SETTING_NOT_FOUND /*< nick=SettingNotFound >*/ + NM_CONNECTION_ERROR_SETTING_NOT_FOUND, /*< nick=SettingNotFound >*/ + NM_CONNECTION_ERROR_INVALID_SETTING, /*< nick=InvalidSetting >*/ } NMConnectionError; +/* + * NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD: overwrite the ip6 method + * when normalizing ip6 configuration. If omited, this defaults to + * @NM_SETTING_IP6_CONFIG_METHOD_AUTO. + */ +#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method" + #define NM_CONNECTION_ERROR nm_connection_error_quark () GQuark nm_connection_error_quark (void); |