projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
router: fix invalid router lifetime
[project/odhcpd.git]
/
src
/
router.c
diff --git
a/src/router.c
b/src/router.c
index
3d26c58
..
51fd954
100644
(file)
--- a/
src/router.c
+++ b/
src/router.c
@@
-37,6
+37,7
@@
static void sigusr1_refresh(int signal);
static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6};
static FILE *fp_route = NULL;
static struct odhcpd_event router_event = {{.fd = -1}, handle_icmpv6};
static FILE *fp_route = NULL;
+#define RA_IOV_LEN 6
int init_router(void)
int init_router(void)
@@
-176,7
+177,7
@@
static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len)
char line[512], ifname[16];
bool found_default = false;
char line[512], ifname[16];
bool found_default = false;
- struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, 0,
false, 0,
0, 0};
+ struct odhcpd_ipaddr p = {IN6ADDR_ANY_INIT, 0, 0, 0, 0};
while (fgets(line, sizeof(line), fp_route)) {
uint32_t rflags;
if (sscanf(line, "00000000000000000000000000000000 00 "
while (fgets(line, sizeof(line), fp_route)) {
uint32_t rflags;
if (sscanf(line, "00000000000000000000000000000000 00 "
@@
-205,13
+206,14
@@
static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len)
return found_default;
}
return found_default;
}
-
// Router Advert server mode
static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
{
// Router Advert server mode
static uint64_t send_router_advert(struct interface *iface, const struct in6_addr *from)
{
- int mtu = odhcpd_get_interface_mtu(iface->ifname);
- if (mtu < 0)
- mtu = 1500;
+ int mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
+ int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
+
+ if (mtu < 1280)
+ mtu = 1280;
struct {
struct nd_router_advert h;
struct {
struct nd_router_advert h;
@@
-224,6
+226,9
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
.mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)},
};
.mtu = {ND_OPT_MTU, 1, 0, htonl(mtu)},
};
+ if (hlim > 0)
+ adv.h.nd_ra_curhoplimit = hlim;
+
if (iface->dhcpv6)
adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
if (iface->dhcpv6)
adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
@@
-239,7
+244,8
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
// If not currently shutting down
struct odhcpd_ipaddr addrs[RELAYD_MAX_PREFIXES];
ssize_t ipcnt = 0;
// If not currently shutting down
struct odhcpd_ipaddr addrs[RELAYD_MAX_PREFIXES];
ssize_t ipcnt = 0;
- uint64_t maxpreferred = 0;
+ uint64_t minvalid = UINT64_MAX;
+ uint64_t maxvalid = 0;
// If not shutdown
if (iface->timer_rs.cb) {
// If not shutdown
if (iface->timer_rs.cb) {
@@
-248,12
+254,10
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
// Check default route
if (parse_routes(addrs, ipcnt) || iface->default_router > 1)
// Check default route
if (parse_routes(addrs, ipcnt) || iface->default_router > 1)
- adv.h.nd_ra_router_lifetime =
- htons(3 * MaxRtrAdvInterval);
+ adv.h.nd_ra_router_lifetime = 1;
}
// Construct Prefix Information options
}
// Construct Prefix Information options
- bool have_public = false;
size_t cnt = 0;
struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
size_t cnt = 0;
struct in6_addr dns_pref = IN6ADDR_ANY_INIT, *dns_addr = &dns_pref;
@@
-262,11
+266,11
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
for (ssize_t i = 0; i < ipcnt; ++i) {
struct odhcpd_ipaddr *addr = &addrs[i];
- if (addr->prefix > 96
|| addr->has_class
)
+ if (addr->prefix > 96)
continue; // Address not suitable
continue; // Address not suitable
- if (addr->preferred > Max
Preferre
dTime)
- addr->preferred = Max
Preferre
dTime;
+ if (addr->preferred > Max
Vali
dTime)
+ addr->preferred = Max
Vali
dTime;
if (addr->valid > MaxValidTime)
addr->valid = MaxValidTime;
if (addr->valid > MaxValidTime)
addr->valid = MaxValidTime;
@@
-286,13
+290,16
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
p = &adv.prefix[cnt++];
}
p = &adv.prefix[cnt++];
}
- if ((addr->addr.s6_addr[0] & 0xfe) != 0xfc && addr->preferred > 0) {
- have_public = true;
+ if (addr->preferred > 0) {
+ if (minvalid > 1000ULL * addr->valid)
+ minvalid = 1000ULL * addr->valid;
- if (maxpreferred < 1000 * addr->preferred)
- maxpreferred = 1000 * addr->preferred;
+ if (maxvalid < 1000ULL * addr->valid && (iface->default_router ||
+ (addr->addr.s6_addr[0] & 0xfe) != 0xfc))
+ maxvalid = 1000ULL * addr->valid;
}
}
+
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
p->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION;
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
p->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION;
@@
-314,7
+321,7
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
}
}
}
}
- if (!
have_public
&& !iface->default_router && adv.h.nd_ra_router_lifetime) {
+ if (!
maxvalid
&& !iface->default_router && adv.h.nd_ra_router_lifetime) {
syslog(LOG_WARNING, "A default route is present but there is no public prefix "
"on %s thus we don't announce a default route!", iface->ifname);
adv.h.nd_ra_router_lifetime = 0;
syslog(LOG_WARNING, "A default route is present but there is no public prefix "
"on %s thus we don't announce a default route!", iface->ifname);
adv.h.nd_ra_router_lifetime = 0;
@@
-415,20
+422,23
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
// Calculate periodic transmit
int msecs = 0;
// Calculate periodic transmit
int msecs = 0;
- uint32_t maxival = MaxRtrAdvInterval * 1000;
- uint32_t minival = MinRtrAdvInterval * 1000;
+ uint32_t maxival = iface->ra_maxinterval * 1000;
+ uint32_t minival;
+
+ if (maxival < 4000 || maxival > MaxRtrAdvInterval * 1000)
+ maxival = MaxRtrAdvInterval * 1000;
+
+ if (minvalid < maxival / 3) {
+ maxival = minvalid / 3;
- if (maxpreferred > 0 && maxival > maxpreferred / 2) {
- maxival = maxpreferred / 2;
if (maxival < 4000)
maxival = 4000;
if (maxival < 4000)
maxival = 4000;
-
- if (maxival >= 9000)
- minival = maxival / 3;
- else
- minival = (maxival * 3) / 4;
}
}
+ minival = (maxival * 3) / 4;
+ if (adv.h.nd_ra_router_lifetime)
+ adv.h.nd_ra_router_lifetime = htons(maxvalid / 1000);
+
odhcpd_urandom(&msecs, sizeof(msecs));
msecs = (labs(msecs) % (maxival - minival)) + minival;
odhcpd_urandom(&msecs, sizeof(msecs));
msecs = (labs(msecs) % (maxival - minival)) + minival;
@@
-438,7
+448,8
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
.data = {0, 0, maxival >> 24, maxival >> 16, maxival >> 8, maxival}
};
.data = {0, 0, maxival >> 24, maxival >> 16, maxival >> 8, maxival}
};
- struct iovec iov[] = {{&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv},
+ struct iovec iov[RA_IOV_LEN] = {
+ {&adv, (uint8_t*)&adv.prefix[cnt] - (uint8_t*)&adv},
{&routes, routes_cnt * sizeof(*routes)},
{&dns, (dns_cnt) ? sizeof(dns) : 0},
{dns_addr, dns_cnt * sizeof(*dns_addr)},
{&routes, routes_cnt * sizeof(*routes)},
{&dns, (dns_cnt) ? sizeof(dns) : 0},
{dns_addr, dns_cnt * sizeof(*dns_addr)},