projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a517d7b
)
dhcpv6: prefer ula over other globals
author
Steven Barth
<steven@midlink.org>
Mon, 30 Mar 2015 08:45:38 +0000
(10:45 +0200)
committer
Steven Barth
<steven@midlink.org>
Mon, 30 Mar 2015 08:45:38 +0000
(10:45 +0200)
src/dhcpv6-ia.c
patch
|
blob
|
history
diff --git
a/src/dhcpv6-ia.c
b/src/dhcpv6-ia.c
index
ffcb6df
..
f850b02
100644
(file)
--- a/
src/dhcpv6-ia.c
+++ b/
src/dhcpv6-ia.c
@@
-254,15
+254,17
@@
void dhcpv6_write_statefile(void)
struct in6_addr addr;
struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->ia_addr;
size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->ia_addr_len;
struct in6_addr addr;
struct odhcpd_ipaddr *addrs = (c->managed) ? c->managed : iface->ia_addr;
size_t addrlen = (c->managed) ? (size_t)c->managed_size : iface->ia_addr_len;
- size_t m
ostpref
= 0;
+ size_t m = 0;
for (size_t i = 0; i < addrlen; ++i)
for (size_t i = 0; i < addrlen; ++i)
- if (addrs[i].preferred > addrs[mostpref].preferred)
- mostpref = i;
+ if (addrs[i].preferred > addrs[m].preferred ||
+ (addrs[i].preferred == addrs[m].preferred &&
+ memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
+ m = i;
for (size_t i = 0; i < addrlen; ++i) {
if (addrs[i].prefix > 96 || c->valid_until <= now ||
for (size_t i = 0; i < addrlen; ++i) {
if (addrs[i].prefix > 96 || c->valid_until <= now ||
- (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m
ostpref
))
+ (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m))
continue;
addr = addrs[i].addr;
continue;
addr = addrs[i].addr;
@@
-716,11
+718,13
@@
static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
struct odhcpd_ipaddr *addrs = (a->managed) ? a->managed : iface->ia_addr;
size_t addrlen = (a->managed) ? (size_t)a->managed_size : iface->ia_addr_len;
- size_t m
ostpref
= 0;
+ size_t m = 0;
for (size_t i = 0; i < addrlen; ++i)
for (size_t i = 0; i < addrlen; ++i)
- if (addrs[i].preferred > addrs[mostpref].preferred)
- mostpref = i;
+ if (addrs[i].preferred > addrs[m].preferred ||
+ (addrs[i].preferred == addrs[m].preferred &&
+ memcmp(&addrs[i].addr, &addrs[m].addr, 16) > 0))
+ m = i;
for (size_t i = 0; i < addrlen; ++i) {
uint32_t prefix_pref = addrs[i].preferred - now;
for (size_t i = 0; i < addrlen; ++i) {
uint32_t prefix_pref = addrs[i].preferred - now;
@@
-760,7
+764,7
@@
static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
n.addr.s6_addr32[3] = htonl(a->assigned);
size_t entrlen = sizeof(n) - 4;
n.addr.s6_addr32[3] = htonl(a->assigned);
size_t entrlen = sizeof(n) - 4;
- if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m
ostpref
)
+ if (iface->managed < RELAYD_MANAGED_NO_AFLAG && i != m)
continue;
if (datalen + entrlen + 4 > buflen || a->assigned == 0)
continue;
if (datalen + entrlen + 4 > buflen || a->assigned == 0)