fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-07 15:40:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dnsmasq: use '@interface' for link-local DNS servers in the dnsmasq config

Browse source 
inet_ntop() either returns 'address%interface' or just 'address'. In the first
case, we replace '%' with '@' since dnsmasq supports '%' only since version
2.58. In the second case, we append '@interface' to make it work.

(small fixes by dcbw)
This commit is contained in:
Michael Stapelberg 2011-08-12 13:43:07 +02:00 • committed by Dan Williams
parent 7bf04582e3
commit de38843828
5 changed files with 66 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dns-manager/nm-dns-bind.c
View file

@ -297,7 +297,8 @@ update (NMDnsPlugin *plugin,
const GSList *vpn_configs,
const GSList *dev_configs,
const GSList *other_configs,
const char *hostname)
const char *hostname,
const char *iface)
{
NMDnsBind *self = NM_DNS_BIND (plugin);
NMDnsBindPrivate *priv = NM_DNS_BIND_GET_PRIVATE (self);

68
src/dns-manager/nm-dns-dnsmasq.c
View file

@ -133,23 +133,56 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
return TRUE;
}
static gboolean
ip6_addr_to_string (const struct in6_addr *addr, char *buf, size_t buflen)
#define IP6_ADDR_BUFLEN (INET6_ADDRSTRLEN + 50)
static char *
ip6_addr_to_string (const struct in6_addr *addr, const char *iface)
{
memset (buf, 0, buflen);
char *buf, *p;
/* allocate enough space for the address + interface name */
buf = g_malloc0 (IP6_ADDR_BUFLEN + 1);
/* inet_ntop is probably supposed to do this for us, but it doesn't */
if (IN6_IS_ADDR_V4MAPPED (addr))
return !!inet_ntop (AF_INET, &(addr->s6_addr32[3]), buf, buflen);
if (IN6_IS_ADDR_V4MAPPED (addr)) {
if (!inet_ntop (AF_INET, &(addr->s6_addr32[3]), buf, IP6_ADDR_BUFLEN))
goto error;
return buf;
}
return !!inet_ntop (AF_INET6, addr, buf, buflen);
if (!inet_ntop (AF_INET6, addr, buf, IP6_ADDR_BUFLEN))
goto error;
/* In the case of addr being a link-local address, inet_ntop can either
* return an address with scope identifier already in place (like
* fe80::202:b3ff:fe8d:7aaf%wlan0) or it returns an address without
* scope identifier at all (like fe80::202:b3ff:fe8d:7aaf)
*/
p = strchr (buf, '%');
if (p) {
/* If we got a scope identifier, we need to replace the '%'
* with '@', since dnsmasq supports '%' in server= addresses
* only since version 2.58 and up
*/
*p = '@';
} else if (IN6_IS_ADDR_LINKLOCAL (addr)) {
/* If we got no scope identifier at all append the interface name */
strncat (buf, "@", IP6_ADDR_BUFLEN - strlen (buf));
strncat (buf, iface, IP6_ADDR_BUFLEN - strlen (buf));
}
return buf;
error:
g_free (buf);
return NULL;
}
static gboolean
add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split, const char *iface)
{
char buf[INET6_ADDRSTRLEN + 1];
const struct in6_addr *addr;
char *buf;
int n, i;
gboolean added = FALSE;
@ -159,7 +192,8 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
* the first nameserver here.
*/
addr = nm_ip6_config_get_nameserver (ip6, 0);
if (!ip6_addr_to_string (addr, &buf[0], sizeof (buf)))
buf = ip6_addr_to_string (addr, iface);
if (!buf)
return FALSE;
/* searches are preferred over domains */
@ -181,6 +215,8 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
added = TRUE;
}
}
g_free (buf);
}
/* If no searches or domains, just add the namservers */
@ -188,8 +224,11 @@ add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
n = nm_ip6_config_get_num_nameservers (ip6);
for (i = 0; i < n; i++) {
addr = nm_ip6_config_get_nameserver (ip6, i);
if (ip6_addr_to_string (addr, &buf[0], sizeof (buf)))
buf = ip6_addr_to_string (addr, iface);
if (buf) {
g_string_append_printf (str, "server=%s\n", buf);
g_free (buf);
}
}
}
@ -201,7 +240,8 @@ update (NMDnsPlugin *plugin,
const GSList *vpn_configs,
const GSList *dev_configs,
const GSList *other_configs,
const char *hostname)
const char *hostname,
const char *iface)
{
NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
GString *conf;
@ -226,7 +266,7 @@ update (NMDnsPlugin *plugin,
if (NM_IS_IP4_CONFIG (iter->data))
add_ip4_config (conf, NM_IP4_CONFIG (iter->data), TRUE);
else if (NM_IS_IP6_CONFIG (iter->data))
add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE);
add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE, iface);
}
/* Now add interface configs without split DNS */
@ -234,7 +274,7 @@ update (NMDnsPlugin *plugin,
if (NM_IS_IP4_CONFIG (iter->data))
add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
else if (NM_IS_IP6_CONFIG (iter->data))
add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
}
/* And any other random configs */
@ -242,7 +282,7 @@ update (NMDnsPlugin *plugin,
if (NM_IS_IP4_CONFIG (iter->data))
add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
else if (NM_IS_IP6_CONFIG (iter->data))
add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
}
/* Write out the config file */

3
src/dns-manager/nm-dns-manager.c
View file

@ -711,7 +711,8 @@ update_dns (NMDnsManager *self,
vpn_configs,
dev_configs,
other_configs,
priv->hostname)) {
priv->hostname,
iface)) {
nm_log_warn (LOGD_DNS, "DNS: plugin %s update failed", plugin_name);
/* If the plugin failed to update, we shouldn't write out a local

6
src/dns-manager/nm-dns-plugin.c
View file

@ -55,7 +55,8 @@ nm_dns_plugin_update (NMDnsPlugin *self,
const GSList *vpn_configs,
const GSList *dev_configs,
const GSList *other_configs,
const char *hostname)
const char *hostname,
const char *iface)
{
g_return_val_if_fail (NM_DNS_PLUGIN_GET_CLASS (self)->update != NULL, FALSE);
@ -63,7 +64,8 @@ nm_dns_plugin_update (NMDnsPlugin *self,
vpn_configs,
dev_configs,
other_configs,
hostname);
hostname,
iface);
}
static gboolean

6
src/dns-manager/nm-dns-plugin.h
View file

@ -53,7 +53,8 @@ typedef struct {
const GSList *vpn_configs,
const GSList *dev_configs,
const GSList *other_configs,
const char *hostname);
const char *hostname,
const char *iface);
/* Subclasses should override and return TRUE if they start a local
* caching nameserver that listens on localhost and would block any
@ -91,7 +92,8 @@ gboolean nm_dns_plugin_update (NMDnsPlugin *self,
const GSList *vpn_configs,
const GSList *dev_configs,
const GSList *other_configs,
const char *hostname);
const char *hostname,
const char *iface);
/* For subclasses/plugins */