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 compile issues
[project/odhcpd.git]
/
src
/
router.c
diff --git
a/src/router.c
b/src/router.c
index
bbde03f
..
1a008e1
100644
(file)
--- a/
src/router.c
+++ b/
src/router.c
@@
-114,7
+114,7
@@
int setup_router_interface(struct interface *iface, bool enable)
forward_router_solicitation(iface);
} else if (iface->ra == RELAYD_SERVER && !iface->master) {
iface->timer_rs.cb = trigger_router_advert;
forward_router_solicitation(iface);
} else if (iface->ra == RELAYD_SERVER && !iface->master) {
iface->timer_rs.cb = trigger_router_advert;
-
trigger_router_advert(&iface->timer_rs
);
+
uloop_timeout_set(&iface->timer_rs, 1000
);
}
if (iface->ra == RELAYD_RELAY || (iface->ra == RELAYD_SERVER && !iface->master))
}
if (iface->ra == RELAYD_RELAY || (iface->ra == RELAYD_SERVER && !iface->master))
@@
-209,6
+209,7
@@
static bool parse_routes(struct odhcpd_ipaddr *n, ssize_t len)
// 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)
{
+ time_t now = odhcpd_time();
int mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
int mtu = odhcpd_get_interface_config(iface->ifname, "mtu");
int hlim = odhcpd_get_interface_config(iface->ifname, "hop_limit");
@@
-219,7
+220,7
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
struct nd_router_advert h;
struct icmpv6_opt lladdr;
struct nd_opt_mtu mtu;
struct nd_router_advert h;
struct icmpv6_opt lladdr;
struct nd_opt_mtu mtu;
- struct nd_opt_prefix_info prefix[
RELAYD_MAX_PREFIXES
];
+ struct nd_opt_prefix_info prefix[
sizeof(iface->ia_addr) / sizeof(*iface->ia_addr)
];
} adv = {
.h = {{.icmp6_type = ND_ROUTER_ADVERT, .icmp6_code = 0}, 0, 0},
.lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
} adv = {
.h = {{.icmp6_type = ND_ROUTER_ADVERT, .icmp6_code = 0}, 0, 0},
.lladdr = {ND_OPT_SOURCE_LINKADDR, 1, {0}},
@@
-242,19
+243,21
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
odhcpd_get_mac(iface, adv.lladdr.data);
// If not currently shutting down
odhcpd_get_mac(iface, adv.lladdr.data);
// If not currently shutting down
- struct odhcpd_ipaddr
addrs[RELAYD_MAX_PREFIXES]
;
+ struct odhcpd_ipaddr
*addrs = NULL
;
ssize_t ipcnt = 0;
ssize_t ipcnt = 0;
-
uint64_t minvalid = U
INT64_MAX;
-
u
int64_t maxvalid = 0;
+
int64_t minvalid =
INT64_MAX;
+ int64_t maxvalid = 0;
// If not shutdown
if (iface->timer_rs.cb) {
// If not shutdown
if (iface->timer_rs.cb) {
- ipcnt = odhcpd_get_interface_addresses(iface->ifindex,
-
addrs, ARRAY_SIZE(addrs))
;
+ addrs = iface->ia_addr;
+
ipcnt = iface->ia_addr_len
;
// Check default route
// Check default route
- if (parse_routes(addrs, ipcnt) || iface->default_router > 1)
- adv.h.nd_ra_router_lifetime = 1;
+ if (parse_routes(addrs, ipcnt))
+ adv.h.nd_ra_router_lifetime = htons(1);
+ if (iface->default_router > 1)
+ adv.h.nd_ra_router_lifetime = htons(iface->default_router);
}
// Construct Prefix Information options
}
// Construct Prefix Information options
@@
-266,15
+269,9
@@
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)
+ if (addr->prefix > 96
|| addr->valid <= (uint32_t)now
)
continue; // Address not suitable
continue; // Address not suitable
- if (addr->preferred > MaxValidTime)
- addr->preferred = MaxValidTime;
-
- if (addr->valid > MaxValidTime)
- addr->valid = MaxValidTime;
-
struct nd_opt_prefix_info *p = NULL;
for (size_t i = 0; i < cnt; ++i) {
if (addr->prefix == adv.prefix[i].nd_opt_pi_prefix_len &&
struct nd_opt_prefix_info *p = NULL;
for (size_t i = 0; i < cnt; ++i) {
if (addr->prefix == adv.prefix[i].nd_opt_pi_prefix_len &&
@@
-290,15
+287,16
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
p = &adv.prefix[cnt++];
}
p = &adv.prefix[cnt++];
}
- if (addr->preferred >
0) {
-
if (minvalid > 1000ULL * addr->valid
)
-
minvalid = 1000ULL * addr->valid
;
+ if (addr->preferred >
(uint32_t)now &&
+
minvalid > 1000LL * (addr->valid - now)
)
+
minvalid = 1000LL * (addr->valid - now)
;
- if (maxvalid < 1000ULL * addr->valid && (iface->default_router ||
- (addr->addr.s6_addr[0] & 0xfe) != 0xfc))
- maxvalid = 1000ULL * addr->valid;
- }
+ if (maxvalid < 1000LL * (addr->valid - now))
+ maxvalid = 1000LL * (addr->valid - now);
+ if (((addr->addr.s6_addr[0] & 0xfe) != 0xfc || iface->default_router)
+ && ntohs(adv.h.nd_ra_router_lifetime) < addr->valid - now)
+ adv.h.nd_ra_router_lifetime = htons(addr->valid - now);
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
odhcpd_bmemcpy(&p->nd_opt_pi_prefix, &addr->addr,
(iface->ra_advrouter) ? 128 : addr->prefix);
@@
-312,16
+310,18
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_AUTO;
if (iface->ra_advrouter)
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_RADDR;
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_AUTO;
if (iface->ra_advrouter)
p->nd_opt_pi_flags_reserved |= ND_OPT_PI_FLAG_RADDR;
- p->nd_opt_pi_valid_time = htonl(addr->valid);
- p->nd_opt_pi_preferred_time = htonl(addr->preferred);
+ p->nd_opt_pi_valid_time = htonl(addr->valid - now);
+ if (addr->preferred > (uint32_t)now)
+ p->nd_opt_pi_preferred_time = htonl(addr->preferred - now);
+
- if (addr->preferred > dns_time) {
- dns_time = addr->preferred;
+ if (addr->preferred
- now
> dns_time) {
+ dns_time = addr->preferred
- now
;
dns_pref = addr->addr;
}
}
dns_pref = addr->addr;
}
}
- if (!
maxvalid && !iface->default_router && adv.h.nd_ra_router_lifetime
) {
+ if (!
iface->default_router && ntohs(adv.h.nd_ra_router_lifetime) == 1
) {
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;
@@
-392,7
+392,7
@@
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->dprefix > 64 || addr->dprefix == 0 ||
+ if (addr->dprefix > 64 || addr->dprefix == 0 ||
addr->valid <= (uint32_t)now ||
(addr->dprefix == 64 && addr->prefix == 64)) {
continue; // Address not suitable
} else if (addr->dprefix > 32) {
(addr->dprefix == 64 && addr->prefix == 64)) {
continue; // Address not suitable
} else if (addr->dprefix > 32) {
@@
-410,7
+410,7
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
routes[routes_cnt].flags |= ND_RA_PREF_LOW;
else if (iface->route_preference > 0)
routes[routes_cnt].flags |= ND_RA_PREF_HIGH;
routes[routes_cnt].flags |= ND_RA_PREF_LOW;
else if (iface->route_preference > 0)
routes[routes_cnt].flags |= ND_RA_PREF_HIGH;
- routes[routes_cnt].lifetime = htonl(addr->valid);
+ routes[routes_cnt].lifetime = htonl(addr->valid
- now
);
routes[routes_cnt].addr[0] = addr->addr.s6_addr32[0];
routes[routes_cnt].addr[1] = addr->addr.s6_addr32[1];
routes[routes_cnt].addr[2] = 0;
routes[routes_cnt].addr[0] = addr->addr.s6_addr32[0];
routes[routes_cnt].addr[1] = addr->addr.s6_addr32[1];
routes[routes_cnt].addr[2] = 0;
@@
-435,10
+435,8
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
}
minival = (maxival * 3) / 4;
}
minival = (maxival * 3) / 4;
- if (adv.h.nd_ra_router_lifetime)
- adv.h.nd_ra_router_lifetime = htons(maxvalid / 1000);
- search->lifetime = htonl(
(maxival * 3)
/ 1000);
+ search->lifetime = htonl(
maxvalid
/ 1000);
if (!dns.lifetime)
dns.lifetime = search->lifetime;
if (!dns.lifetime)
dns.lifetime = search->lifetime;