mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
core,libnm-core: use same route attribute names of iproute2
Users are probably more familiar with iproute2 route option names than
kernel ones.
Fixes: 54e58eb96b
This commit is contained in:
parent
d3b1e08c9a
commit
80dfb8cdab
|
@ -1186,8 +1186,8 @@ nm_ip_route_set_attribute (NMIPRoute *route, const char *name, GVariant *value)
|
||||||
&(NMVariantAttributeSpec) { name, type, v4, v6, str_type }
|
&(NMVariantAttributeSpec) { name, type, v4, v6, str_type }
|
||||||
|
|
||||||
static const NMVariantAttributeSpec * const ip_route_attribute_spec[] = {
|
static const NMVariantAttributeSpec * const ip_route_attribute_spec[] = {
|
||||||
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a'),
|
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_SRC, G_VARIANT_TYPE_STRING, TRUE, TRUE, 'a'),
|
||||||
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_SRC, G_VARIANT_TYPE_STRING, FALSE, TRUE, 'p'),
|
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_FROM, G_VARIANT_TYPE_STRING, FALSE, TRUE, 'p'),
|
||||||
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TOS, G_VARIANT_TYPE_BYTE, TRUE, TRUE, 0 ),
|
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_TOS, G_VARIANT_TYPE_BYTE, TRUE, TRUE, 0 ),
|
||||||
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_WINDOW, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
|
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_WINDOW, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
|
||||||
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_CWND, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
|
ATTR_SPEC_PTR (NM_IP_ROUTE_ATTRIBUTE_CWND, G_VARIANT_TYPE_UINT32, TRUE, TRUE, 0 ),
|
||||||
|
|
|
@ -131,8 +131,8 @@ gboolean nm_ip_route_attribute_validate (const char *name,
|
||||||
gboolean *known,
|
gboolean *known,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
||||||
#define NM_IP_ROUTE_ATTRIBUTE_PREF_SRC "pref-src"
|
|
||||||
#define NM_IP_ROUTE_ATTRIBUTE_SRC "src"
|
#define NM_IP_ROUTE_ATTRIBUTE_SRC "src"
|
||||||
|
#define NM_IP_ROUTE_ATTRIBUTE_FROM "from"
|
||||||
#define NM_IP_ROUTE_ATTRIBUTE_TOS "tos"
|
#define NM_IP_ROUTE_ATTRIBUTE_TOS "tos"
|
||||||
#define NM_IP_ROUTE_ATTRIBUTE_WINDOW "window"
|
#define NM_IP_ROUTE_ATTRIBUTE_WINDOW "window"
|
||||||
#define NM_IP_ROUTE_ATTRIBUTE_CWND "cwnd"
|
#define NM_IP_ROUTE_ATTRIBUTE_CWND "cwnd"
|
||||||
|
|
|
@ -666,19 +666,19 @@ test_setting_ip_route_attributes (void)
|
||||||
TEST_ATTR ("lock-mtu", boolean, TRUE, AF_INET, TRUE, TRUE);
|
TEST_ATTR ("lock-mtu", boolean, TRUE, AF_INET, TRUE, TRUE);
|
||||||
TEST_ATTR ("lock-mtu", uint32, 1, AF_INET, FALSE, TRUE);
|
TEST_ATTR ("lock-mtu", uint32, 1, AF_INET, FALSE, TRUE);
|
||||||
|
|
||||||
TEST_ATTR ("src", string, "fd01::1", AF_INET6, TRUE, TRUE);
|
TEST_ATTR ("from", string, "fd01::1", AF_INET6, TRUE, TRUE);
|
||||||
TEST_ATTR ("src", string, "fd01::1/64", AF_INET6, TRUE, TRUE);
|
TEST_ATTR ("from", string, "fd01::1/64", AF_INET6, TRUE, TRUE);
|
||||||
TEST_ATTR ("src", string, "fd01::1/128", AF_INET6, TRUE, TRUE);
|
TEST_ATTR ("from", string, "fd01::1/128", AF_INET6, TRUE, TRUE);
|
||||||
TEST_ATTR ("src", string, "fd01::1/129", AF_INET6, FALSE, TRUE);
|
TEST_ATTR ("from", string, "fd01::1/129", AF_INET6, FALSE, TRUE);
|
||||||
TEST_ATTR ("src", string, "fd01::1/a", AF_INET6, FALSE, TRUE);
|
TEST_ATTR ("from", string, "fd01::1/a", AF_INET6, FALSE, TRUE);
|
||||||
TEST_ATTR ("src", string, "abc/64", AF_INET6, FALSE, TRUE);
|
TEST_ATTR ("from", string, "abc/64", AF_INET6, FALSE, TRUE);
|
||||||
TEST_ATTR ("src", string, "1.2.3.4", AF_INET, FALSE, TRUE);
|
TEST_ATTR ("from", string, "1.2.3.4", AF_INET, FALSE, TRUE);
|
||||||
TEST_ATTR ("src", string, "1.2.3.4", AF_INET6, FALSE, TRUE);
|
TEST_ATTR ("from", string, "1.2.3.4", AF_INET6, FALSE, TRUE);
|
||||||
|
|
||||||
TEST_ATTR ("pref-src", string, "1.2.3.4", AF_INET, TRUE, TRUE);
|
TEST_ATTR ("src", string, "1.2.3.4", AF_INET, TRUE, TRUE);
|
||||||
TEST_ATTR ("pref-src", string, "1.2.3.4", AF_INET6, FALSE, TRUE);
|
TEST_ATTR ("src", string, "1.2.3.4", AF_INET6, FALSE, TRUE);
|
||||||
TEST_ATTR ("pref-src", string, "1.2.3.0/24", AF_INET, FALSE, TRUE);
|
TEST_ATTR ("src", string, "1.2.3.0/24", AF_INET, FALSE, TRUE);
|
||||||
TEST_ATTR ("pref-src", string, "fd01::12", AF_INET6, TRUE, TRUE);
|
TEST_ATTR ("src", string, "fd01::12", AF_INET6, TRUE, TRUE);
|
||||||
|
|
||||||
#undef TEST_ATTR
|
#undef TEST_ATTR
|
||||||
}
|
}
|
||||||
|
@ -5460,7 +5460,7 @@ test_route_attributes_parse (void)
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
GVariant *variant;
|
GVariant *variant;
|
||||||
|
|
||||||
ht = nm_utils_parse_variant_attributes ("mtu=1400 pref-src=1.2.3.4 cwnd=14",
|
ht = nm_utils_parse_variant_attributes ("mtu=1400 src=1.2.3.4 cwnd=14",
|
||||||
' ', '=', FALSE,
|
' ', '=', FALSE,
|
||||||
nm_ip_route_get_variant_attribute_spec (),
|
nm_ip_route_get_variant_attribute_spec (),
|
||||||
&error);
|
&error);
|
||||||
|
@ -5468,7 +5468,7 @@ test_route_attributes_parse (void)
|
||||||
g_assert (ht);
|
g_assert (ht);
|
||||||
g_hash_table_unref (ht);
|
g_hash_table_unref (ht);
|
||||||
|
|
||||||
ht = nm_utils_parse_variant_attributes ("mtu=1400 pref-src=1.2.3.4 cwnd=14 \\",
|
ht = nm_utils_parse_variant_attributes ("mtu=1400 src=1.2.3.4 cwnd=14 \\",
|
||||||
' ', '=', FALSE,
|
' ', '=', FALSE,
|
||||||
nm_ip_route_get_variant_attribute_spec (),
|
nm_ip_route_get_variant_attribute_spec (),
|
||||||
&error);
|
&error);
|
||||||
|
@ -5476,7 +5476,7 @@ test_route_attributes_parse (void)
|
||||||
g_assert (!ht);
|
g_assert (!ht);
|
||||||
g_clear_error (&error);
|
g_clear_error (&error);
|
||||||
|
|
||||||
ht = nm_utils_parse_variant_attributes ("mtu.1400 pref-src.1\\.2\\.3\\.4 ",
|
ht = nm_utils_parse_variant_attributes ("mtu.1400 src.1\\.2\\.3\\.4 ",
|
||||||
' ', '.', FALSE,
|
' ', '.', FALSE,
|
||||||
nm_ip_route_get_variant_attribute_spec (),
|
nm_ip_route_get_variant_attribute_spec (),
|
||||||
&error);
|
&error);
|
||||||
|
@ -5487,13 +5487,13 @@ test_route_attributes_parse (void)
|
||||||
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32));
|
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32));
|
||||||
g_assert_cmpuint (g_variant_get_uint32 (variant), ==, 1400);
|
g_assert_cmpuint (g_variant_get_uint32 (variant), ==, 1400);
|
||||||
|
|
||||||
variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC);
|
variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_SRC);
|
||||||
g_assert (variant);
|
g_assert (variant);
|
||||||
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
|
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
|
||||||
g_assert_cmpstr (g_variant_get_string (variant, NULL), ==, "1.2.3.4");
|
g_assert_cmpstr (g_variant_get_string (variant, NULL), ==, "1.2.3.4");
|
||||||
g_hash_table_unref (ht);
|
g_hash_table_unref (ht);
|
||||||
|
|
||||||
ht = nm_utils_parse_variant_attributes ("src:fd01\\:\\:42\\/64/initrwnd:21",
|
ht = nm_utils_parse_variant_attributes ("from:fd01\\:\\:42\\/64/initrwnd:21",
|
||||||
'/', ':', FALSE,
|
'/', ':', FALSE,
|
||||||
nm_ip_route_get_variant_attribute_spec (),
|
nm_ip_route_get_variant_attribute_spec (),
|
||||||
&error);
|
&error);
|
||||||
|
@ -5504,7 +5504,7 @@ test_route_attributes_parse (void)
|
||||||
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32));
|
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32));
|
||||||
g_assert_cmpuint (g_variant_get_uint32 (variant), ==, 21);
|
g_assert_cmpuint (g_variant_get_uint32 (variant), ==, 21);
|
||||||
|
|
||||||
variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_SRC);
|
variant = g_hash_table_lookup (ht, NM_IP_ROUTE_ATTRIBUTE_FROM);
|
||||||
g_assert (variant);
|
g_assert (variant);
|
||||||
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
|
g_assert (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING));
|
||||||
g_assert_cmpstr (g_variant_get_string (variant, NULL), ==, "fd01::42/64");
|
g_assert_cmpstr (g_variant_get_string (variant, NULL), ==, "fd01::42/64");
|
||||||
|
@ -5529,17 +5529,17 @@ test_route_attributes_format (void)
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (5000));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (5000));
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_INITRWND, g_variant_new_uint32 (20));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_INITRWND, g_variant_new_uint32 (20));
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, g_variant_new_boolean (TRUE));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, g_variant_new_boolean (TRUE));
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, g_variant_new_string ("aaaa:bbbb::1"));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_SRC, g_variant_new_string ("aaaa:bbbb::1"));
|
||||||
str = nm_utils_format_variant_attributes (ht, ' ', '=');
|
str = nm_utils_format_variant_attributes (ht, ' ', '=');
|
||||||
g_assert_cmpstr (str, ==, "initrwnd=20 lock-mtu=true mtu=5000 pref-src=aaaa:bbbb::1");
|
g_assert_cmpstr (str, ==, "initrwnd=20 lock-mtu=true mtu=5000 src=aaaa:bbbb::1");
|
||||||
g_hash_table_remove_all (ht);
|
g_hash_table_remove_all (ht);
|
||||||
g_free (str);
|
g_free (str);
|
||||||
|
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_WINDOW, g_variant_new_uint32 (30000));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_WINDOW, g_variant_new_uint32 (30000));
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_INITCWND, g_variant_new_uint32 (21));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_INITCWND, g_variant_new_uint32 (21));
|
||||||
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_SRC, g_variant_new_string ("aaaa:bbbb:cccc:dddd::/64"));
|
g_hash_table_insert (ht, NM_IP_ROUTE_ATTRIBUTE_FROM, g_variant_new_string ("aaaa:bbbb:cccc:dddd::/64"));
|
||||||
str = nm_utils_format_variant_attributes (ht, '/', ':');
|
str = nm_utils_format_variant_attributes (ht, '/', ':');
|
||||||
g_assert_cmpstr (str, ==, "initcwnd:21/src:aaaa\\:bbbb\\:cccc\\:dddd\\:\\:\\/64/window:30000");
|
g_assert_cmpstr (str, ==, "from:aaaa\\:bbbb\\:cccc\\:dddd\\:\\:\\/64/initcwnd:21/window:30000");
|
||||||
g_hash_table_remove_all (ht);
|
g_hash_table_remove_all (ht);
|
||||||
g_free (str);
|
g_free (str);
|
||||||
}
|
}
|
||||||
|
|
|
@ -435,7 +435,7 @@ merge_route_attributes (NMIPRoute *s_route, NMPlatformIP4Route *r)
|
||||||
GET_ATTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, lock_initrwnd, BOOLEAN, boolean);
|
GET_ATTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_INITRWND, lock_initrwnd, BOOLEAN, boolean);
|
||||||
GET_ATTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, lock_mtu, BOOLEAN, boolean);
|
GET_ATTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, lock_mtu, BOOLEAN, boolean);
|
||||||
|
|
||||||
if ( (variant = nm_ip_route_get_attribute (s_route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC))
|
if ( (variant = nm_ip_route_get_attribute (s_route, NM_IP_ROUTE_ATTRIBUTE_SRC))
|
||||||
&& g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) {
|
&& g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) {
|
||||||
if (inet_pton (AF_INET, g_variant_get_string (variant, NULL), &addr) == 1)
|
if (inet_pton (AF_INET, g_variant_get_string (variant, NULL), &addr) == 1)
|
||||||
r->pref_src = addr;
|
r->pref_src = addr;
|
||||||
|
|
|
@ -440,13 +440,13 @@ merge_route_attributes (NMIPRoute *s_route, NMPlatformIP6Route *r)
|
||||||
GET_ATTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, lock_mtu, BOOLEAN, boolean);
|
GET_ATTR (NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, lock_mtu, BOOLEAN, boolean);
|
||||||
|
|
||||||
|
|
||||||
if ( (variant = nm_ip_route_get_attribute (s_route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC))
|
if ( (variant = nm_ip_route_get_attribute (s_route, NM_IP_ROUTE_ATTRIBUTE_SRC))
|
||||||
&& g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) {
|
&& g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) {
|
||||||
if (inet_pton (AF_INET6, g_variant_get_string (variant, NULL), &addr) == 1)
|
if (inet_pton (AF_INET6, g_variant_get_string (variant, NULL), &addr) == 1)
|
||||||
r->pref_src = addr;
|
r->pref_src = addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( (variant = nm_ip_route_get_attribute (s_route, NM_IP_ROUTE_ATTRIBUTE_SRC))
|
if ( (variant = nm_ip_route_get_attribute (s_route, NM_IP_ROUTE_ATTRIBUTE_FROM))
|
||||||
&& g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) {
|
&& g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING)) {
|
||||||
gs_free char *string = NULL;
|
gs_free char *string = NULL;
|
||||||
guint8 plen = 128;
|
guint8 plen = 128;
|
||||||
|
|
|
@ -517,14 +517,14 @@ parse_route_options (NMIPRoute *route, int family, const char *line, GError **er
|
||||||
gs_free_error GError *local_error = NULL;
|
gs_free_error GError *local_error = NULL;
|
||||||
GVariant *variant = g_variant_new_string (str);
|
GVariant *variant = g_variant_new_string (str);
|
||||||
|
|
||||||
if (!nm_ip_route_attribute_validate (NM_IP_ROUTE_ATTRIBUTE_SRC, variant, family, NULL, &local_error)) {
|
if (!nm_ip_route_attribute_validate (NM_IP_ROUTE_ATTRIBUTE_FROM, variant, family, NULL, &local_error)) {
|
||||||
g_match_info_free (match_info);
|
g_match_info_free (match_info);
|
||||||
g_variant_unref (variant);
|
g_variant_unref (variant);
|
||||||
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
|
||||||
"Invalid route from '%s': %s", str, local_error->message);
|
"Invalid route from '%s': %s", str, local_error->message);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
nm_ip_route_set_attribute (route, NM_IP_ROUTE_ATTRIBUTE_SRC, variant);
|
nm_ip_route_set_attribute (route, NM_IP_ROUTE_ATTRIBUTE_FROM, variant);
|
||||||
}
|
}
|
||||||
g_clear_pointer (®ex, g_regex_unref);
|
g_clear_pointer (®ex, g_regex_unref);
|
||||||
g_clear_pointer (&match_info, g_match_info_free);
|
g_clear_pointer (&match_info, g_match_info_free);
|
||||||
|
@ -540,7 +540,7 @@ parse_route_options (NMIPRoute *route, int family, const char *line, GError **er
|
||||||
gs_free_error GError *local_error = NULL;
|
gs_free_error GError *local_error = NULL;
|
||||||
GVariant *variant = g_variant_new_string (str);
|
GVariant *variant = g_variant_new_string (str);
|
||||||
|
|
||||||
if (!nm_ip_route_attribute_validate (NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, variant, family,
|
if (!nm_ip_route_attribute_validate (NM_IP_ROUTE_ATTRIBUTE_SRC, variant, family,
|
||||||
NULL, &local_error)) {
|
NULL, &local_error)) {
|
||||||
g_match_info_free (match_info);
|
g_match_info_free (match_info);
|
||||||
g_variant_unref (variant);
|
g_variant_unref (variant);
|
||||||
|
@ -549,7 +549,7 @@ parse_route_options (NMIPRoute *route, int family, const char *line, GError **er
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
nm_ip_route_set_attribute (route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, variant);
|
nm_ip_route_set_attribute (route, NM_IP_ROUTE_ATTRIBUTE_SRC, variant);
|
||||||
}
|
}
|
||||||
success = TRUE;
|
success = TRUE;
|
||||||
|
|
||||||
|
|
|
@ -1906,9 +1906,9 @@ get_route_attributes_string (NMIPRoute *route, int family)
|
||||||
/* handled above */
|
/* handled above */
|
||||||
} else if (nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_TOS)) {
|
} else if (nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_TOS)) {
|
||||||
g_string_append_printf (str, "%s %u", names[i], (unsigned) g_variant_get_byte (attr));
|
g_string_append_printf (str, "%s %u", names[i], (unsigned) g_variant_get_byte (attr));
|
||||||
} else if ( nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_PREF_SRC)
|
} else if ( nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_SRC)
|
||||||
|| nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_SRC)) {
|
|| nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_FROM)) {
|
||||||
char *arg = nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_PREF_SRC) ? "src" : "from";
|
char *arg = nm_streq (names[i], NM_IP_ROUTE_ATTRIBUTE_SRC) ? "src" : "from";
|
||||||
|
|
||||||
g_string_append_printf (str, "%s %s", arg, g_variant_get_string (attr, NULL));
|
g_string_append_printf (str, "%s %s", arg, g_variant_get_string (attr, NULL));
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1135,7 +1135,7 @@ test_read_wired_static_routes (void)
|
||||||
nmtst_assert_route_attribute_uint32 (ip4_route, NM_IP_ROUTE_ATTRIBUTE_MTU, 9000);
|
nmtst_assert_route_attribute_uint32 (ip4_route, NM_IP_ROUTE_ATTRIBUTE_MTU, 9000);
|
||||||
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, TRUE);
|
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, TRUE);
|
||||||
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, TRUE);
|
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_INITCWND, TRUE);
|
||||||
nmtst_assert_route_attribute_string (ip4_route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, "1.1.1.1");
|
nmtst_assert_route_attribute_string (ip4_route, NM_IP_ROUTE_ATTRIBUTE_SRC, "1.1.1.1");
|
||||||
|
|
||||||
g_object_unref (connection);
|
g_object_unref (connection);
|
||||||
}
|
}
|
||||||
|
@ -1204,7 +1204,7 @@ test_read_wired_static_routes_legacy (void)
|
||||||
nmtst_assert_route_attribute_uint32 (ip4_route, NM_IP_ROUTE_ATTRIBUTE_MTU, 9000);
|
nmtst_assert_route_attribute_uint32 (ip4_route, NM_IP_ROUTE_ATTRIBUTE_MTU, 9000);
|
||||||
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, TRUE);
|
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, TRUE);
|
||||||
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, TRUE);
|
nmtst_assert_route_attribute_boolean (ip4_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, TRUE);
|
||||||
nmtst_assert_route_attribute_string (ip4_route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, "1.2.3.4");
|
nmtst_assert_route_attribute_string (ip4_route, NM_IP_ROUTE_ATTRIBUTE_SRC, "1.2.3.4");
|
||||||
|
|
||||||
g_object_unref (connection);
|
g_object_unref (connection);
|
||||||
}
|
}
|
||||||
|
@ -1369,8 +1369,8 @@ test_read_wired_ipv6_manual (void)
|
||||||
nmtst_assert_route_attribute_uint32 (ip6_route, NM_IP_ROUTE_ATTRIBUTE_CWND, 13);
|
nmtst_assert_route_attribute_uint32 (ip6_route, NM_IP_ROUTE_ATTRIBUTE_CWND, 13);
|
||||||
nmtst_assert_route_attribute_uint32 (ip6_route, NM_IP_ROUTE_ATTRIBUTE_MTU, 1450);
|
nmtst_assert_route_attribute_uint32 (ip6_route, NM_IP_ROUTE_ATTRIBUTE_MTU, 1450);
|
||||||
nmtst_assert_route_attribute_boolean (ip6_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, TRUE);
|
nmtst_assert_route_attribute_boolean (ip6_route, NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, TRUE);
|
||||||
nmtst_assert_route_attribute_string (ip6_route, NM_IP_ROUTE_ATTRIBUTE_SRC, "1111::2222/48");
|
nmtst_assert_route_attribute_string (ip6_route, NM_IP_ROUTE_ATTRIBUTE_FROM, "1111::2222/48");
|
||||||
nmtst_assert_route_attribute_string (ip6_route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, "5555::6666");
|
nmtst_assert_route_attribute_string (ip6_route, NM_IP_ROUTE_ATTRIBUTE_SRC, "5555::6666");
|
||||||
|
|
||||||
/* DNS Addresses */
|
/* DNS Addresses */
|
||||||
g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 2);
|
g_assert_cmpint (nm_setting_ip_config_get_num_dns (s_ip6), ==, 2);
|
||||||
|
@ -3899,8 +3899,8 @@ test_write_wired_static (void)
|
||||||
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_CWND, g_variant_new_uint32 (100));
|
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_CWND, g_variant_new_uint32 (100));
|
||||||
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (1280));
|
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (1280));
|
||||||
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, g_variant_new_boolean (TRUE));
|
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, g_variant_new_boolean (TRUE));
|
||||||
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_SRC, g_variant_new_string ("2222::bbbb/32"));
|
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_FROM, g_variant_new_string ("2222::bbbb/32"));
|
||||||
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, g_variant_new_string ("::42"));
|
nm_ip_route_set_attribute (route6, NM_IP_ROUTE_ATTRIBUTE_SRC, g_variant_new_string ("::42"));
|
||||||
nm_setting_ip_config_add_route (s_ip6, route6);
|
nm_setting_ip_config_add_route (s_ip6, route6);
|
||||||
nm_ip_route_unref (route6);
|
nm_ip_route_unref (route6);
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ routes8=1.1.1.8/18,0.0.0.0,
|
||||||
routes9=1.1.1.9/19,0.0.0.0,0
|
routes9=1.1.1.9/19,0.0.0.0,0
|
||||||
routes10=1.1.1.10/20,,0
|
routes10=1.1.1.10/20,,0
|
||||||
routes11=1.1.1.11/21,,21
|
routes11=1.1.1.11/21,,21
|
||||||
routes11_options=cwnd=10,lock-cwnd=true,mtu=1430,pref-src=7.7.7.7
|
routes11_options=cwnd=10,lock-cwnd=true,mtu=1430,src=7.7.7.7
|
||||||
ignore-auto-routes=false
|
ignore-auto-routes=false
|
||||||
ignore-auto-dns=false
|
ignore-auto-dns=false
|
||||||
|
|
||||||
|
@ -59,6 +59,6 @@ route3=6:7:8:9:0:1:2:3/126,,1
|
||||||
route4=7:8:9:0:1:2:3:4/125/::,5
|
route4=7:8:9:0:1:2:3:4/125/::,5
|
||||||
route5=8:9:0:1:2:3:4:5/124,6
|
route5=8:9:0:1:2:3:4:5/124,6
|
||||||
route6=8:9:0:1:2:3:4:6/123,,
|
route6=8:9:0:1:2:3:4:6/123,,
|
||||||
route6_options=src=abce::/63
|
route6_options=from=abce::/63
|
||||||
ignore-auto-routes=false
|
ignore-auto-routes=false
|
||||||
ignore-auto-dns=false
|
ignore-auto-dns=false
|
||||||
|
|
|
@ -326,7 +326,7 @@ test_read_valid_wired_connection (void)
|
||||||
nmtst_assert_route_attribute_uint32 (route, NM_IP_ROUTE_ATTRIBUTE_CWND, 10);
|
nmtst_assert_route_attribute_uint32 (route, NM_IP_ROUTE_ATTRIBUTE_CWND, 10);
|
||||||
nmtst_assert_route_attribute_uint32 (route, NM_IP_ROUTE_ATTRIBUTE_MTU, 1430);
|
nmtst_assert_route_attribute_uint32 (route, NM_IP_ROUTE_ATTRIBUTE_MTU, 1430);
|
||||||
nmtst_assert_route_attribute_boolean (route, NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, TRUE);
|
nmtst_assert_route_attribute_boolean (route, NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, TRUE);
|
||||||
nmtst_assert_route_attribute_string (route, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, "7.7.7.7");
|
nmtst_assert_route_attribute_string (route, NM_IP_ROUTE_ATTRIBUTE_SRC, "7.7.7.7");
|
||||||
|
|
||||||
/* ===== IPv6 SETTING ===== */
|
/* ===== IPv6 SETTING ===== */
|
||||||
s_ip6 = nm_connection_get_setting_ip6_config (connection);
|
s_ip6 = nm_connection_get_setting_ip6_config (connection);
|
||||||
|
@ -371,7 +371,7 @@ test_read_valid_wired_connection (void)
|
||||||
/* Route attributes */
|
/* Route attributes */
|
||||||
route = nm_setting_ip_config_get_route (s_ip6, 6);
|
route = nm_setting_ip_config_get_route (s_ip6, 6);
|
||||||
g_assert (route);
|
g_assert (route);
|
||||||
nmtst_assert_route_attribute_string (route, NM_IP_ROUTE_ATTRIBUTE_SRC, "abce::/63");
|
nmtst_assert_route_attribute_string (route, NM_IP_ROUTE_ATTRIBUTE_FROM, "abce::/63");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -495,7 +495,7 @@ test_write_wired_connection (void)
|
||||||
g_assert_no_error (error);
|
g_assert_no_error (error);
|
||||||
nm_ip_route_set_attribute (rt, NM_IP_ROUTE_ATTRIBUTE_CWND, g_variant_new_uint32 (10));
|
nm_ip_route_set_attribute (rt, NM_IP_ROUTE_ATTRIBUTE_CWND, g_variant_new_uint32 (10));
|
||||||
nm_ip_route_set_attribute (rt, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (1492));
|
nm_ip_route_set_attribute (rt, NM_IP_ROUTE_ATTRIBUTE_MTU, g_variant_new_uint32 (1492));
|
||||||
nm_ip_route_set_attribute (rt, NM_IP_ROUTE_ATTRIBUTE_PREF_SRC, g_variant_new_string ("1.2.3.4"));
|
nm_ip_route_set_attribute (rt, NM_IP_ROUTE_ATTRIBUTE_SRC, g_variant_new_string ("1.2.3.4"));
|
||||||
g_assert (nm_setting_ip_config_add_route (s_ip4, rt));
|
g_assert (nm_setting_ip_config_add_route (s_ip4, rt));
|
||||||
nm_ip_route_unref (rt);
|
nm_ip_route_unref (rt);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue