#include <limits.h>
#include <arpa/inet.h>
+#include <netinet/in.h>
#include "netifd.h"
#include "device.h"
if (r1->sourcemask != r2->sourcemask)
return r1->sourcemask - r2->sourcemask;
+ if (r1->table != r2->table)
+ return r1->table - r2->table;
+
int maskcmp = memcmp(&r1->source, &r2->source, sizeof(r1->source));
if (maskcmp)
return maskcmp;
free(route_old);
}
- if (node_new)
- system_add_route(dev, route_new);
+ if (node_new) {
+ if (system_add_route(dev, route_new))
+ route_new->failed = true;
+ }
}
}
assignment->enabled = false;
- } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP)) {
- system_add_address(l3_downlink, &addr);
+ } else if (add && (iface->state == IFS_UP || iface->state == IFS_SETUP) &&
+ !system_add_address(l3_downlink, &addr)) {
if (prefix->iface && !assignment->enabled) {
set_ip_source_policy(true, true, IPRULE_PRIORITY_REJECT, &addr.addr,
addr.mask, 0, iface, "unreachable");
}
static void
-write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip)
+write_resolv_conf_entries(FILE *f, struct interface_ip_settings *ip, const char *dev)
{
struct dns_server *s;
struct dns_search_domain *d;
if (!str)
continue;
- fprintf(f, "nameserver %s\n", str);
+ if (s->af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&s->addr.in6))
+ fprintf(f, "nameserver %s%%%s\n", str, dev);
+ else
+ fprintf(f, "nameserver %s\n", str);
}
vlist_simple_for_each_element(&ip->dns_search, d, node) {
continue;
fprintf(f, "# Interface %s\n", iface->name);
- write_resolv_conf_entries(f, &iface->config_ip);
+ write_resolv_conf_entries(f, &iface->config_ip, iface->ifname);
if (!iface->proto_ip.no_dns)
- write_resolv_conf_entries(f, &iface->proto_ip);
+ write_resolv_conf_entries(f, &iface->proto_ip, iface->ifname);
}
fflush(f);
rewind(f);
if (!(route->flags & DEVROUTE_METRIC))
route->metric = ip->iface->metric;
- system_add_route(dev, route);
+ if (system_add_route(dev, route))
+ route->failed = true;
} else
system_del_route(dev, route);
route->enabled = _enabled;