fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 12:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dnsmasq: use ipv4.dns and ipv4.dns-search with ipv4.method=shared

Browse source 
Configure the dnsmasq DHCP server for shared mode to announce the
configured name resolution settings.
This commit is contained in:
Thomas Haller 2017-03-03 13:29:31 +01:00
parent 9e429ddc0a
commit c8fa7b6f57
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/dnsmasq/nm-dnsmasq-manager.c
View file

@ -156,9 +156,11 @@ create_dm_cmd_line (const char *iface,
char first[INET_ADDRSTRLEN];
char last[INET_ADDRSTRLEN];
char localaddr[INET_ADDRSTRLEN];
char tmpaddr[INET_ADDRSTRLEN];
char *error_desc = NULL;
const char *dm_binary;
const NMPlatformIP4Address *listen_address;
guint i, n;
listen_address = nm_ip4_config_get_address (ip4_config, 0);
g_return_val_if_fail (listen_address, NULL);
@ -226,6 +228,24 @@ create_dm_cmd_line (const char *iface,
g_string_truncate (s, 0);
}
if ((n = nm_ip4_config_get_num_nameservers (ip4_config))) {
g_string_append (s, "--dhcp-option=option:dns-server");
for (i = 0; i < n; i++) {
g_string_append_c (s, ',');
g_string_append (s, nm_utils_inet4_ntop (nm_ip4_config_get_nameserver (ip4_config, i), tmpaddr));
}
g_string_truncate (s, 0);
}
if ((n = nm_ip4_config_get_num_searches (ip4_config))) {
g_string_append (s, "--dhcp-option=option:domain-search");
for (i = 0; i < n; i++) {
g_string_append_c (s, ',');
g_string_append (s, nm_ip4_config_get_search (ip4_config, i));
}
g_string_truncate (s, 0);
}
nm_cmd_line_add_string (cmd, "--dhcp-lease-max=50");
g_string_append (s, "--pid-file=");