#include <netlink/socket.h>
#include <netlink/attr.h>
-#include "router.h"
#include "dhcpv6.h"
-#include "ndp.h"
+#include "odhcpd.h"
struct event_socket {
struct odhcpd_event ev;
static int cb_rtnl_valid(struct nl_msg *msg, void *arg);
static void catch_rtnl_err(struct odhcpd_event *e, int error);
+static int addr6_dump_rqs = 0;
static int ping_socket = -1;
static struct event_socket rtnl_event = {
.ev = {
nlmsg_free(msg);
}
-static void dump_addr_table(void)
+static void dump_addr6_table(void)
{
struct nl_msg *msg;
struct ifaddrmsg ifa = {
nlmsg_free(msg);
}
+void ndp_handle_addr6_dump(void)
+{
+ if (!addr6_dump_rqs)
+ return;
+
+ dump_addr6_table();
+ addr6_dump_rqs = 0;
+}
+
+inline void ndp_rqs_addr6_dump(void)
+{
+ addr6_dump_rqs++;
+}
+
int setup_ndp_interface(struct interface *iface, bool enable)
{
int ret = 0, procfd;
dump_neigh = true;
}
- if (enable && (iface->ra == RELAYD_SERVER ||
- iface->dhcpv6 == RELAYD_SERVER || iface->ndp == RELAYD_RELAY))
- dump_addr_table();
-
if (enable && iface->ndp == RELAYD_RELAY) {
if (write(procfd, "1\n", 2) < 0) {}
dump_neigh_table(false);
else
dump_neigh = false;
+
+ ndp_rqs_addr6_dump();
}
if (dump_neigh)
// Check address update
static void check_addr_updates(struct interface *iface)
{
- struct odhcpd_ipaddr addr[RELAYD_MAX_ADDRS] = {{IN6ADDR_ANY_INIT, 0, 0, 0, 0}};
+ struct odhcpd_ipaddr *addr = NULL;
time_t now = odhcpd_time();
- ssize_t len = odhcpd_get_interface_addresses(iface->ifindex, addr, ARRAY_SIZE(addr));
+ ssize_t len = odhcpd_get_interface_addresses(iface->ifindex, &addr);
if (len < 0)
return;
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 (change)
dhcpv6_ia_preupdate(iface);
- memcpy(iface->ia_addr, addr, len * sizeof(*addr));
+ free(iface->ia_addr);
+ iface->ia_addr = addr;
iface->ia_addr_len = len;
if (change)
}
}
-void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add)
+static void setup_addr_for_relaying(struct in6_addr *addr, struct interface *iface, bool add)
{
struct interface *c;
char ipbuf[INET6_ADDRSTRLEN];
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);
- }
-}
-
-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);
if (nl_socket_set_buffer_size(ev_sock->sock, ev_sock->sock_bufsize, 0))
goto err;
- dump_addr_table();
+ dump_addr6_table();
return;
err: