fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 10:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rdisc: ensure RDNSS and DNSSL lifetimes are updated (rh #1044757) (bgo #720760)

Browse source 
NetworkManager was not correctly updating the DNSSL/RDNSS option timestamps
when new Router Advertisements were received, leading to a router solicitation
loop after 1/2 the lifetime of the DNSSL/RDNSS option.
This commit is contained in:
Dan Williams 2013-12-19 18:03:28 -06:00
commit f4f20ca0bc
2 changed files with 65 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/devices/nm-device.c
View file

@ -3319,6 +3319,9 @@ rdisc_config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed, NMDevice *device
} }
if (changed & NM_RDISC_CONFIG_DNS_DOMAINS) { if (changed & NM_RDISC_CONFIG_DNS_DOMAINS) {
/* Rebuild domain list from router discovery cache. */
nm_ip6_config_reset_domains (priv->ac_ip6_config);
for (i = 0; i < rdisc->dns_domains->len; i++) { for (i = 0; i < rdisc->dns_domains->len; i++) {
NMRDiscDNSDomain *discovered_domain = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i); NMRDiscDNSDomain *discovered_domain = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i);
@ -3361,6 +3364,7 @@ addrconf6_start (NMDevice *self)
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMConnection *connection; NMConnection *connection;
NMActStageReturn ret; NMActStageReturn ret;
const char *ip_iface = nm_device_get_ip_iface (self);
connection = nm_device_get_connection (self); connection = nm_device_get_connection (self);
g_assert (connection); g_assert (connection);
@ -3371,15 +3375,14 @@ addrconf6_start (NMDevice *self)
priv->ac_ip6_config = NULL; priv->ac_ip6_config = NULL;
} }
priv->rdisc = nm_lndp_rdisc_new (nm_device_get_ip_ifindex (self), nm_device_get_ip_iface (self)); priv->rdisc = nm_lndp_rdisc_new (nm_device_get_ip_ifindex (self), ip_iface);
if (!priv->rdisc) { if (!priv->rdisc) {
nm_log_err (LOGD_IP6, "Failed to start router discovery."); nm_log_err (LOGD_IP6, "(%s): failed to start router discovery.", ip_iface);
return FALSE; return FALSE;
} }
/* ensure link local is ready... */ /* ensure link local is ready... */
ret = linklocal6_start (self); ret = linklocal6_start (self);
if (ret == NM_ACT_STAGE_RETURN_SUCCESS) if (ret == NM_ACT_STAGE_RETURN_SUCCESS)
addrconf6_start_with_link_ready (self); addrconf6_start_with_link_ready (self);
else else

93
src/rdisc/nm-lndp-rdisc.c
View file

@ -144,36 +144,60 @@ add_route (NMRDisc *rdisc, const NMRDiscRoute *new)
} }
static gboolean static gboolean
add_server (NMRDisc *rdisc, const NMRDiscDNSServer *new) add_dns_server (NMRDisc *rdisc, const NMRDiscDNSServer *new)
{ {
int i; int i;
for (i = 0; i < rdisc->dns_servers->len; i++) { for (i = 0; i < rdisc->dns_servers->len; i++) {
NMRDiscDNSServer *item = &g_array_index (rdisc->dns_servers, NMRDiscDNSServer, i); NMRDiscDNSServer *item = &g_array_index (rdisc->dns_servers, NMRDiscDNSServer, i);
if (IN6_ARE_ADDR_EQUAL (&item->address, &new->address)) if (IN6_ARE_ADDR_EQUAL (&item->address, &new->address)) {
return FALSE; gboolean changed = item->timestamp != new->timestamp ||
item->lifetime != new->lifetime;
if (changed) {
item->timestamp = new->timestamp;
item->lifetime = new->lifetime;
}
return changed;
}
} }
g_array_insert_val (rdisc->dns_servers, i, *new); /* DNS server should no longer be used */
if (new->lifetime == 0)
return FALSE;
g_array_insert_val (rdisc->dns_servers, i, *new);
return TRUE; return TRUE;
} }
/* Copies new->domain if 'new' is added to the dns_domains list */
static gboolean static gboolean
add_domain (NMRDisc *rdisc, const NMRDiscDNSDomain *new) add_dns_domain (NMRDisc *rdisc, const NMRDiscDNSDomain *new)
{ {
NMRDiscDNSDomain *item;
int i; int i;
for (i = 0; i < rdisc->dns_domains->len; i++) { for (i = 0; i < rdisc->dns_domains->len; i++) {
NMRDiscDNSDomain *item = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i); item = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i);
if (!g_strcmp0 (item->domain, new->domain)) if (!g_strcmp0 (item->domain, new->domain)) {
return FALSE; gboolean changed = item->timestamp != new->timestamp ||
item->lifetime != new->lifetime;
if (changed) {
item->timestamp = new->timestamp;
item->lifetime = new->lifetime;
}
return changed;
}
} }
g_array_insert_val (rdisc->dns_domains, i, *new); /* Domain should no longer be used */
if (new->lifetime == 0)
return FALSE;
g_array_insert_val (rdisc->dns_domains, i, *new);
item = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i);
item->domain = g_strdup (new->domain);
return TRUE; return TRUE;
} }
@ -190,7 +214,7 @@ send_rs (NMRDisc *rdisc)
g_assert (!error); g_assert (!error);
ndp_msg_ifindex_set (msg, rdisc->ifindex); ndp_msg_ifindex_set (msg, rdisc->ifindex);
debug ("(%s): sending router solicitation: %d", rdisc->ifname, rdisc->ifindex); debug ("(%s): sending router solicitation", rdisc->ifname);
error = ndp_msg_send (priv->ndp, msg); error = ndp_msg_send (priv->ndp, msg);
if (error) if (error)
@ -222,9 +246,9 @@ clean_gateways (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32
for (i = 0; i < rdisc->gateways->len; i++) { for (i = 0; i < rdisc->gateways->len; i++) {
NMRDiscGateway *item = &g_array_index (rdisc->gateways, NMRDiscGateway, i); NMRDiscGateway *item = &g_array_index (rdisc->gateways, NMRDiscGateway, i);
guint32 expiry = item->timestamp + item->lifetime; guint64 expiry = item->timestamp + item->lifetime;
if (item->lifetime == UINT_MAX) if (item->lifetime == G_MAXUINT32)
continue; continue;
if (now >= expiry) { if (now >= expiry) {
@ -242,9 +266,9 @@ clean_addresses (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32
for (i = 0; i < rdisc->addresses->len; i++) { for (i = 0; i < rdisc->addresses->len; i++) {
NMRDiscAddress *item = &g_array_index (rdisc->addresses, NMRDiscAddress, i); NMRDiscAddress *item = &g_array_index (rdisc->addresses, NMRDiscAddress, i);
guint32 expiry = item->timestamp + item->lifetime; guint64 expiry = item->timestamp + item->lifetime;
if (item->lifetime == UINT_MAX) if (item->lifetime == G_MAXUINT32)
continue; continue;
if (now >= expiry) { if (now >= expiry) {
@ -262,9 +286,9 @@ clean_routes (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *n
for (i = 0; i < rdisc->routes->len; i++) { for (i = 0; i < rdisc->routes->len; i++) {
NMRDiscRoute *item = &g_array_index (rdisc->routes, NMRDiscRoute, i); NMRDiscRoute *item = &g_array_index (rdisc->routes, NMRDiscRoute, i);
guint32 expiry = item->timestamp + item->lifetime; guint64 expiry = item->timestamp + item->lifetime;
if (item->lifetime == UINT_MAX) if (item->lifetime == G_MAXUINT32)
continue; continue;
if (now >= expiry) { if (now >= expiry) {
@ -276,21 +300,21 @@ clean_routes (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *n
} }
static void static void
clean_servers (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *nextevent) clean_dns_servers (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *nextevent)
{ {
int i; int i;
for (i = 0; i < rdisc->dns_servers->len; i++) { for (i = 0; i < rdisc->dns_servers->len; i++) {
NMRDiscDNSServer *item = &g_array_index (rdisc->dns_servers, NMRDiscDNSServer, i); NMRDiscDNSServer *item = &g_array_index (rdisc->dns_servers, NMRDiscDNSServer, i);
guint32 expiry = item->timestamp + item->lifetime; guint64 expiry = item->timestamp + item->lifetime;
guint32 refresh = item->timestamp + item->lifetime / 2; guint64 refresh = item->timestamp + item->lifetime / 2;
if (item->lifetime == UINT_MAX) if (item->lifetime == G_MAXUINT32)
continue; continue;
if (now >= expiry) { if (now >= expiry) {
g_array_remove_index (rdisc->dns_servers, i--); g_array_remove_index (rdisc->dns_servers, i--);
*changed |= NM_RDISC_CONFIG_ROUTES; *changed |= NM_RDISC_CONFIG_DNS_SERVERS;
} else if (now >= refresh) } else if (now >= refresh)
solicit (rdisc); solicit (rdisc);
else if (*nextevent > refresh) else if (*nextevent > refresh)
@ -299,21 +323,22 @@ clean_servers (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *
} }
static void static void
clean_domains (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *nextevent) clean_dns_domains (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap *changed, guint32 *nextevent)
{ {
int i; int i;
for (i = 0; i < rdisc->dns_domains->len; i++) { for (i = 0; i < rdisc->dns_domains->len; i++) {
NMRDiscDNSDomain *item = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i); NMRDiscDNSDomain *item = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i);
guint32 expiry = item->timestamp + item->lifetime; guint64 expiry = item->timestamp + item->lifetime;
guint32 refresh = item->timestamp + item->lifetime / 2; guint64 refresh = item->timestamp + item->lifetime / 2;
if (item->lifetime == UINT_MAX) if (item->lifetime == G_MAXUINT32)
continue; continue;
if (now >= expiry) { if (now >= expiry) {
g_free (item->domain);
g_array_remove_index (rdisc->dns_domains, i--); g_array_remove_index (rdisc->dns_domains, i--);
*changed |= NM_RDISC_CONFIG_ROUTES; *changed |= NM_RDISC_CONFIG_DNS_DOMAINS;
} else if (now >= refresh) } else if (now >= refresh)
solicit (rdisc); solicit (rdisc);
else if (*nextevent >=refresh) else if (*nextevent >=refresh)
@ -327,7 +352,7 @@ static void
check_timestamps (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap changed) check_timestamps (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap changed)
{ {
NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc); NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc);
/* Use a magic date in distant enough future as there's no guint32 max macro. */ /* Use a magic date in the distant future (~68 years) */
guint32 never = G_MAXINT32; guint32 never = G_MAXINT32;
guint32 nextevent = never; guint32 nextevent = never;
@ -339,14 +364,14 @@ check_timestamps (NMRDisc *rdisc, guint32 now, NMRDiscConfigMap changed)
clean_gateways (rdisc, now, &changed, &nextevent); clean_gateways (rdisc, now, &changed, &nextevent);
clean_addresses (rdisc, now, &changed, &nextevent); clean_addresses (rdisc, now, &changed, &nextevent);
clean_routes (rdisc, now, &changed, &nextevent); clean_routes (rdisc, now, &changed, &nextevent);
clean_servers (rdisc, now, &changed, &nextevent); clean_dns_servers (rdisc, now, &changed, &nextevent);
clean_domains (rdisc, now, &changed, &nextevent); clean_dns_domains (rdisc, now, &changed, &nextevent);
if (changed) if (changed)
g_signal_emit_by_name (rdisc, NM_RDISC_CONFIG_CHANGED, changed); g_signal_emit_by_name (rdisc, NM_RDISC_CONFIG_CHANGED, changed);
if (nextevent != never) { if (nextevent != never) {
debug ("Scheduling next now/lifetime check: %d seconds", (int) nextevent); debug ("(%s): scheduling next now/lifetime check: %u seconds", rdisc->ifname, nextevent);
priv->timeout_id = g_timeout_add_seconds (nextevent, timeout_cb, rdisc); priv->timeout_id = g_timeout_add_seconds (nextevent, timeout_cb, rdisc);
} }
} }
@ -454,7 +479,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
* single time when the configuration is finished and updates can * single time when the configuration is finished and updates can
* come at any time. * come at any time.
*/ */
debug ("Received router advertisement: %d at %d", rdisc->ifindex, (int) now); debug ("(%s): received router advertisement at %u", rdisc->ifname, now);
if (priv->send_rs_id) { if (priv->send_rs_id) {
g_source_remove (priv->send_rs_id); g_source_remove (priv->send_rs_id);
@ -563,7 +588,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
*/ */
if (dns_server.lifetime && dns_server.lifetime < 7200) if (dns_server.lifetime && dns_server.lifetime < 7200)
dns_server.lifetime = 7200; dns_server.lifetime = 7200;
if (add_server (rdisc, &dns_server)) if (add_dns_server (rdisc, &dns_server))
changed |= NM_RDISC_CONFIG_DNS_SERVERS; changed |= NM_RDISC_CONFIG_DNS_SERVERS;
} }
} }
@ -575,7 +600,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
NMRDiscDNSDomain dns_domain; NMRDiscDNSDomain dns_domain;
memset (&dns_domain, 0, sizeof (dns_domain)); memset (&dns_domain, 0, sizeof (dns_domain));
dns_domain.domain = g_strdup (domain); dns_domain.domain = domain;
dns_domain.timestamp = now; dns_domain.timestamp = now;
dns_domain.lifetime = ndp_msg_opt_rdnss_lifetime (msg, offset); dns_domain.lifetime = ndp_msg_opt_rdnss_lifetime (msg, offset);
/* Pad the lifetime somewhat to give a bit of slack in cases /* Pad the lifetime somewhat to give a bit of slack in cases
@ -585,7 +610,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
*/ */
if (dns_domain.lifetime && dns_domain.lifetime < 7200) if (dns_domain.lifetime && dns_domain.lifetime < 7200)
dns_domain.lifetime = 7200; dns_domain.lifetime = 7200;
if (add_domain (rdisc, &dns_domain)) if (add_dns_domain (rdisc, &dns_domain))
changed |= NM_RDISC_CONFIG_DNS_DOMAINS; changed |= NM_RDISC_CONFIG_DNS_DOMAINS;
} }
} }