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:
681ba23
)
dhcpv6-pd: ignore /64 on interface
author
Steven Barth
<steven@midlink.org>
Wed, 13 May 2015 12:29:51 +0000
(14:29 +0200)
committer
Steven Barth
<steven@midlink.org>
Wed, 13 May 2015 12:29:51 +0000
(14:29 +0200)
src/dhcpv6-ia.c
patch
|
blob
|
history
diff --git
a/src/dhcpv6-ia.c
b/src/dhcpv6-ia.c
index 69fda0792420c98d9264d1ffa97eff349160e963..a6ea66f1109ba1cd1a7ba116db8b6c67da33f3f8 100644
(file)
--- a/
src/dhcpv6-ia.c
+++ b/
src/dhcpv6-ia.c
@@
-581,7
+581,8
@@
static void update(struct interface *iface)
int minprefix = -1;
for (int i = 0; i < len; ++i) {
int minprefix = -1;
for (int i = 0; i < len; ++i) {
- if (addr[i].preferred > 0 && addr[i].prefix > minprefix)
+ if (addr[i].preferred > 0 && addr[i].prefix < 64 &&
+ addr[i].prefix > minprefix)
minprefix = addr[i].prefix;
addr[i].addr.s6_addr32[3] = 0;
minprefix = addr[i].prefix;
addr[i].addr.s6_addr32[3] = 0;
@@
-756,7
+757,8
@@
static size_t append_reply(uint8_t *buf, size_t buflen, uint16_t status,
size_t entrlen = sizeof(p) - 4;
if (datalen + entrlen + 4 > buflen ||
size_t entrlen = sizeof(p) - 4;
if (datalen + entrlen + 4 > buflen ||
- (a->assigned == 0 && a->managed_size == 0))
+ (a->assigned == 0 && a->managed_size == 0) ||
+ (!a->managed_size && a->length < p.preferred))
continue;
memcpy(buf + datalen, &p, sizeof(p));
continue;
memcpy(buf + datalen, &p, sizeof(p));