mirrors/dhcpcd
0
0
Fork 0
mirror of https://github.com/rsmarples/dhcpcd.git synced 2024-11-27 12:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Flags fake routes so we can change them when we renew our lease.

Browse Source
This commit is contained in:
Roy Marples 2014-11-26 10:41:32 +00:00
parent e604c2d788
commit 55b0a9ce4a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dhcp.c
View File

@ -3141,6 +3141,7 @@ dhcp_start1(void *arg)
state->addr = state->lease.addr;
state->net = state->lease.net;
state->added |= STATE_ADDED | STATE_FAKE;
ipv4_sortinterfaces(ifp->ctx);
ipv4_buildroutes(ifp->ctx);
} else
syslog(LOG_ERR, "%s: %m", __func__);

15
ipv4.c
View File

@ -230,6 +230,11 @@ ipv4_ifcmp(const struct interface *si, const struct interface *ti)
return -1;
if (!sis->new && tis->new)
return 1;
/* Always prefer proper leases */
if (!(sis->added & STATE_FAKE) && (sis->added & STATE_FAKE))
return -1;
if ((sis->added & STATE_FAKE) && !(sis->added & STATE_FAKE))
return 1;
/* If we are either, they neither have a lease, or they both have.
* We need to check for IPv4LL and make it non-preferred. */
if (sis->new && tis->new) {
@ -625,10 +630,8 @@ ipv4_buildroutes(struct dhcpcd_ctx *ctx)
if ((or = find_route(ctx->ipv4_routes, rt, NULL))) {
if (state->added & STATE_FAKE)
continue;
ostate = D_CSTATE(or->iface);
if (ostate->added & STATE_FAKE)
goto remroute;
if (or->iface != ifp ||
if (or->flags & STATE_FAKE ||
or->iface != ifp ||
or->src.s_addr != state->addr.s_addr ||
rt->gate.s_addr != or->gate.s_addr ||
rt->metric != or->metric)
@ -636,7 +639,6 @@ ipv4_buildroutes(struct dhcpcd_ctx *ctx)
if (c_route(or, rt) != 0)
continue;
}
remroute:
TAILQ_REMOVE(ctx->ipv4_routes, or, next);
free(or);
} else {
@ -644,6 +646,9 @@ remroute:
n_route(rt) != 0)
continue;
}
rt->flags = STATE_ADDED;
if (state->added & STATE_FAKE)
rt->flags |= STATE_FAKE;
TAILQ_REMOVE(dnr, rt, next);
TAILQ_INSERT_TAIL(nrs, rt, next);
}

1
ipv4.h
View File

@ -38,6 +38,7 @@ struct rt {
const struct interface *iface;
unsigned int metric;
struct in_addr src;
uint8_t flags;
};
TAILQ_HEAD(rt_head, rt);