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 (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",
- add ? "add" : "delete", ipbuf, iface->ifname);
+ neigh_add ? "add" : "delete", ipbuf, c->ifname);
else
syslog(LOG_DEBUG, "%s proxy neighbour entry %s%%%s",
- add ? "Added" : "Deleted", ipbuf, iface->ifname);
- }
-}
-
-static void setup_ping6(struct in6_addr *addr, struct interface *iface)
-{
- struct interface *c;
-
- list_for_each_entry(c, &interfaces, head) {
- if (iface == c || c->ndp != RELAYD_RELAY ||
- c->external == true)
- continue;
-
- ping6(addr, c);
+ neigh_add ? "Added" : "Deleted", ipbuf, c->ifname);
}
}
-static struct in6_addr last_solicited;
-
static void handle_rtnl_event(struct odhcpd_event *e)
{
struct event_socket *ev_sock = container_of(e, struct event_socket, ev);
case RTM_NEWADDR:
add = true;
+ /* fall through */
case RTM_DELADDR: {
struct ifaddrmsg *ifa = nlmsg_data(hdr);
struct nlattr *nla[__IFA_MAX];
case RTM_NEWNEIGH:
add = true;
+ /* fall through */
case RTM_DELNEIGH: {
struct ndmsg *ndm = nlmsg_data(hdr);
struct nlattr *nla[__NDA_MAX];
if (add && !(ndm->ndm_state &
(NUD_REACHABLE | NUD_STALE | NUD_DELAY | NUD_PROBE |
- NUD_PERMANENT | NUD_NOARP))) {
- if (!IN6_ARE_ADDR_EQUAL(&last_solicited, addr)) {
- last_solicited = *addr;
- setup_ping6(addr, iface);
- }
-
+ NUD_PERMANENT | NUD_NOARP)))
return NL_OK;
- }
setup_addr_for_relaying(addr, iface, add);
setup_route(addr, iface, add);