fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-22 17:20:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: test parsing of domain-search option

Browse source 
Add a test for the parsing of the the domain-search option.
This commit is contained in:
Beniamino Galvani 2019-12-17 18:18:48 +01:00
parent 36f8822c9b
commit c9fbdf3cb0
3 changed files with 98 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/dhcp/nm-dhcp-nettools.c
View file

@ -775,23 +775,12 @@ lease_parse_domainname (NDhcp4ClientLease *lease,
str->str);
}
static void
lease_parse_search_domains (NDhcp4ClientLease *lease,
NMIP4Config *ip4_config,
GHashTable *options)
char **
nm_dhcp_parse_search_list (guint8 *data, size_t n_data)
{
nm_auto_free_gstring GString *str = NULL;
uint8_t *data, *cache;
size_t n_data, n_cache = 0;
int r;
r = n_dhcp4_client_lease_query (lease, NM_DHCP_OPTION_DHCP4_DOMAIN_SEARCH_LIST, &data, &n_data);
if (r)
return;
cache = data;
nm_gstring_prepare (&str);
GPtrArray *array = NULL;
guint8 *cache = data;
size_t n_cache = 0;
for (;;) {
nm_auto_free_gstring GString *domain = NULL;
@ -801,8 +790,42 @@ lease_parse_search_domains (NDhcp4ClientLease *lease,
if (!lease_option_print_domain_name (domain, cache, &n_cache, &data, &n_data))
break;
g_string_append (nm_gstring_add_space_delimiter (str), domain->str);
nm_ip4_config_add_search (ip4_config, domain->str);
if (!array)
array = g_ptr_array_new ();
g_ptr_array_add (array, g_string_free (domain, FALSE));
domain = NULL;
}
if (array) {
g_ptr_array_add (array, NULL);
return (char **) g_ptr_array_free (array, FALSE);
} else
return NULL;
}
static void
lease_parse_search_domains (NDhcp4ClientLease *lease,
NMIP4Config *ip4_config,
GHashTable *options)
{
nm_auto_free_gstring GString *str = NULL;
uint8_t *data;
size_t n_data;
gs_strfreev char **domains = NULL;
guint i;
int r;
r = n_dhcp4_client_lease_query (lease, NM_DHCP_OPTION_DHCP4_DOMAIN_SEARCH_LIST, &data, &n_data);
if (r)
return;
domains = nm_dhcp_parse_search_list (data, n_data);
nm_gstring_prepare (&str);
for (i = 0; domains && domains[i]; i++) {
g_string_append (nm_gstring_add_space_delimiter (str), domains[i]);
nm_ip4_config_add_search (ip4_config, domains[i]);
}
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,

2
src/dhcp/nm-dhcp-utils.h
View file

@ -36,5 +36,7 @@ gboolean nm_dhcp_utils_get_leasefile_path (int addr_family,
const char *uuid,
char **out_leasefile_path);
char **nm_dhcp_parse_search_list (guint8 *data, size_t n_data);
#endif /* __NETWORKMANAGER_DHCP_UTILS_H__ */

55
src/dhcp/tests/test-dhcp-utils.c
View file

@ -199,6 +199,60 @@ test_vendor_option_metered (void)
g_hash_table_destroy (options);
}
static void
test_parse_search_list (void)
{
guint8 *data;
char **domains;
data = (guint8 []) {
0x05, 'l', 'o', 'c', 'a', 'l',
0x00
};
domains = nm_dhcp_parse_search_list (data, 7);
g_assert (domains);
g_assert_cmpint (g_strv_length (domains), ==, 1);
g_assert_cmpstr (domains[0], ==, "local");
g_strfreev (domains);
data = (guint8 []) {
0x04, 't', 'e', 's', 't',
0x07, 'e', 'x', 'a', 'm', 'p', 'l', 'e',
0x03, 'c', 'o', 'm',
0x00,
0xc0, 0x05,
0x03, 'a', 'b', 'c',
0xc0, 0x0d,
0x06, 'f', 'o', 'o', 'b', 'a', 'r',
0x00
};
domains = nm_dhcp_parse_search_list (data, 34);
g_assert (domains);
g_assert_cmpint (g_strv_length (domains), ==, 4);
g_assert_cmpstr (domains[0], ==, "test.example.com");
g_assert_cmpstr (domains[1], ==, "example.com");
g_assert_cmpstr (domains[2], ==, "abc.com");
g_assert_cmpstr (domains[3], ==, "foobar");
g_strfreev (domains);
data = (guint8 []) {
0x40, 'b', 'a', 'd',
};
domains = nm_dhcp_parse_search_list (data, 4);
g_assert (!domains);
data = (guint8 []) {
0x04, 'o', 'k', 'a', 'y',
0x00,
0x40, 'b', 'a', 'd',
};
domains = nm_dhcp_parse_search_list (data, 10);
g_assert (domains);
g_assert_cmpint (g_strv_length (domains), ==, 1);
g_assert_cmpstr (domains[0], ==, "okay");
g_strfreev (domains);
}
static void
ip4_test_route (NMIP4Config *ip4_config,
guint route_num,
@ -732,6 +786,7 @@ int main (int argc, char **argv)
g_test_add_func ("/dhcp/ip4-prefix-classless", test_ip4_prefix_classless);
g_test_add_func ("/dhcp/client-id-from-string", test_client_id_from_string);
g_test_add_func ("/dhcp/vendor-option-metered", test_vendor_option_metered);
g_test_add_func ("/dhcp/parse-search-list", test_parse_search_list);
return g_test_run ();
}