projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: use RELAYD_MAX_ADDRS as address array size
[project/odhcpd.git]
/
src
/
router.c
diff --git
a/src/router.c
b/src/router.c
index
9711975
..
bc22829
100644
(file)
--- a/
src/router.c
+++ b/
src/router.c
@@
-247,7
+247,7
@@
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[
8
];
+ struct odhcpd_ipaddr addrs[
RELAYD_MAX_ADDRS
];
ssize_t ipcnt = 0;
int64_t minvalid = INT64_MAX;
ssize_t ipcnt = 0;
int64_t minvalid = INT64_MAX;
@@
-257,10
+257,10
@@
static uint64_t send_router_advert(struct interface *iface, const struct in6_add
memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
// Check default route
memcpy(addrs, iface->ia_addr, ipcnt * sizeof(*addrs));
// Check default route
- 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);
if (iface->default_router > 1)
adv.h.nd_ra_router_lifetime = htons(iface->default_router);
+ else if (parse_routes(addrs, ipcnt))
+ adv.h.nd_ra_router_lifetime = htons(1);
}
// Construct Prefix Information options
}
// Construct Prefix Information options