projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ndp: fix adding proxy neighbor entries
[project/odhcpd.git]
/
src
/
ndp.c
diff --git
a/src/ndp.c
b/src/ndp.c
index
3b472de
..
49aea1c
100644
(file)
--- a/
src/ndp.c
+++ b/
src/ndp.c
@@
-362,8
+362,6
@@
static void check_addr_updates(struct interface *iface)
qsort(addr, len, sizeof(*addr), prefixcmp);
for (int i = 0; i < len; ++i) {
qsort(addr, len, sizeof(*addr), prefixcmp);
for (int i = 0; i < len; ++i) {
- addr[i].addr.s6_addr32[3] = 0;
-
if (addr[i].preferred < UINT32_MAX - now)
addr[i].preferred += now;
if (addr[i].preferred < UINT32_MAX - now)
addr[i].preferred += now;
@@
-405,14
+403,14
@@
static void setup_addr_for_relaying(struct in6_addr *addr, struct interface *ifa
if (iface == c || (c->ndp != RELAYD_RELAY && !add))
continue;
if (iface == c || (c->ndp != RELAYD_RELAY && !add))
continue;
- add = (c->ndp == RELAYD_RELAY ? add : false);
+
bool neigh_
add = (c->ndp == RELAYD_RELAY ? add : false);
- if (odhcpd_setup_proxy_neigh(addr, c, add))
+ if (odhcpd_setup_proxy_neigh(addr, c,
neigh_
add))
syslog(LOG_DEBUG, "Failed to %s proxy neighbour entry %s%%%s",
syslog(LOG_DEBUG, "Failed to %s proxy neighbour entry %s%%%s",
-
add ? "add" : "delete", ipbuf, iface
->ifname);
+
neigh_add ? "add" : "delete", ipbuf, c
->ifname);
else
syslog(LOG_DEBUG, "%s proxy neighbour entry %s%%%s",
else
syslog(LOG_DEBUG, "%s proxy neighbour entry %s%%%s",
-
add ? "Added" : "Deleted", ipbuf, iface
->ifname);
+
neigh_add ? "Added" : "Deleted", ipbuf, c
->ifname);
}
}
}
}