setsockopt(rtnl_event.uloop.fd, SOL_NETLINK,
NETLINK_ADD_MEMBERSHIP, &group, sizeof(group));
- // Synthesize initial address events
- struct {
- struct nlmsghdr nh;
- struct ifaddrmsg ifa;
- } req2 = {
- {sizeof(req2), RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP,
- ++rtnl_seqid, 0},
- {.ifa_family = AF_INET6}
- };
- send(rtnl_event.uloop.fd, &req2, sizeof(req2), MSG_DONTWAIT);
odhcpd_register(&rtnl_event);
// Open ICMPv6 socket
}
+static void dump_neigh_table(bool proxy)
+{
+ struct {
+ struct nlmsghdr nh;
+ struct ndmsg ndm;
+ } req = {
+ {sizeof(req), RTM_GETNEIGH, NLM_F_REQUEST | NLM_F_DUMP,
+ ++rtnl_seqid, 0},
+ {.ndm_family = AF_INET6, .ndm_flags = (proxy) ? NTF_PROXY : 0}
+ };
+ send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+ odhcpd_process(&rtnl_event);
+}
+
+
int setup_ndp_interface(struct interface *iface, bool enable)
{
char procbuf[64];
snprintf(procbuf, sizeof(procbuf), "/proc/sys/net/ipv6/conf/%s/proxy_ndp", iface->ifname);
int procfd = open(procbuf, O_WRONLY);
+ bool dump_neigh = false;
- if (iface->ndp_event.uloop.fd >= 0) {
+ if (iface->ndp_event.uloop.fd > 0) {
uloop_fd_delete(&iface->ndp_event.uloop);
close(iface->ndp_event.uloop.fd);
iface->ndp_event.uloop.fd = -1;
- write(procfd, "0\n", 2);
+ if (!enable || iface->ndp != RELAYD_RELAY)
+ write(procfd, "0\n", 2);
+
+ dump_neigh = true;
+ }
+
+ if (enable && (iface->ra == RELAYD_SERVER ||
+ iface->dhcpv6 == RELAYD_SERVER || iface->ndp == RELAYD_RELAY)) {
+ // Synthesize initial address events
+ struct {
+ struct nlmsghdr nh;
+ struct ifaddrmsg ifa;
+ } req2 = {
+ {sizeof(req2), RTM_GETADDR, NLM_F_REQUEST | NLM_F_DUMP,
+ ++rtnl_seqid, 0},
+ {.ifa_family = AF_INET6, .ifa_index = iface->ifindex}
+ };
+ send(rtnl_event.uloop.fd, &req2, sizeof(req2), MSG_DONTWAIT);
}
if (enable && iface->ndp == RELAYD_RELAY) {
write(procfd, "1\n", 2);
+ close(procfd);
int sock = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IPV6));
if (sock < 0) {
.sll_family = AF_PACKET,
.sll_ifindex = iface->ifindex,
.sll_protocol = htons(ETH_P_IPV6),
+ .sll_hatype = 0,
+ .sll_pkttype = 0,
+ .sll_halen = 0,
+ .sll_addr = {0},
};
bind(sock, (struct sockaddr*)&ll, sizeof(ll));
iface->ndp_event.handle_dgram = handle_solicit;
odhcpd_register(&iface->ndp_event);
- // Dump neighbor events
- struct {
- struct nlmsghdr nh;
- struct ndmsg ndm;
- } req = {
- {sizeof(req), RTM_GETNEIGH, NLM_F_REQUEST | NLM_F_DUMP,
- ++rtnl_seqid, 0},
- {.ndm_family = AF_INET6}
- };
- send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+ // If we already were enabled dump is unnecessary, if not do dump
+ if (!dump_neigh)
+ dump_neigh_table(false);
+ else
+ dump_neigh = false;
+ } else {
+ close(procfd);
}
- close(procfd);
+
+ if (dump_neigh)
+ dump_neigh_table(true);
return 0;
}
struct interface *c;
list_for_each_entry(c, &interfaces, head)
if (iface->ndp == RELAYD_RELAY && iface != c &&
- (!ns_is_dad || !c->external == false))
+ (ns_is_dad || !c->external))
ping6(&req->nd_ns_target, c);
}
if (add) {
req.nh.nlmsg_type = RTM_NEWROUTE;
req.nh.nlmsg_flags |= (NLM_F_CREATE | NLM_F_REPLACE);
- req.rtm.rtm_protocol = RTPROT_BOOT;
+ req.rtm.rtm_protocol = RTPROT_STATIC;
req.rtm.rtm_scope = (gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
req.rtm.rtm_type = RTN_UNICAST;
} else {
req.rtm.rtm_scope = RT_SCOPE_NOWHERE;
}
- size_t reqlen = (gw) ? sizeof(req) : offsetof(struct req, rta_gw);
- send(rtnl_event.uloop.fd, &req, reqlen, MSG_DONTWAIT);
+ req.nh.nlmsg_len = (gw) ? sizeof(req) : offsetof(struct req, rta_gw);
+ send(rtnl_event.uloop.fd, &req, req.nh.nlmsg_len, MSG_DONTWAIT);
}
// Use rtnetlink to modify kernel routes
-static void setup_route(struct in6_addr *addr, struct interface *iface,
- bool add)
+static void setup_route(struct in6_addr *addr, struct interface *iface, bool add)
{
char namebuf[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, addr, namebuf, sizeof(namebuf));
- syslog(LOG_NOTICE, "%s about %s on %s", (add) ? "Learned" : "Forgot",
- namebuf, (iface) ? iface->ifname : "<pending>");
-
- if (!iface || !iface->learn_routes)
- return;
+ syslog(LOG_NOTICE, "%s about %s on %s",
+ (add) ? "Learned" : "Forgot", namebuf, iface->ifname);
- odhcpd_setup_route(addr, 128, iface, NULL, add);
+ if (iface->learn_routes)
+ odhcpd_setup_route(addr, 128, iface, NULL, add);
}
*addr
};
- if (add) {
- req.nh.nlmsg_type = RTM_NEWNEIGH;
- req.nh.nlmsg_flags |= NLM_F_CREATE;
-
+ if (ndm->ndm_flags & NTF_PROXY) {
+ // Dump & flush proxy entries
+ if (nh->nlmsg_type == RTM_NEWNEIGH) {
+ req.ndm.ndm_ifindex = iface->ifindex;
+ send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+ setup_route(addr, iface, false);
+ dump_neigh = true;
+ }
+ } else if (add) {
struct interface *c;
list_for_each_entry(c, &interfaces, head) {
- if (c->ndp == RELAYD_RELAY && iface != c) {
+ if (iface == c)
+ continue;
+
+ if (c->ndp == RELAYD_RELAY) {
+ req.nh.nlmsg_type = RTM_NEWNEIGH;
+ req.nh.nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+
+ req.ndm.ndm_ifindex = c->ifindex;
+ send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
+ } else { // Delete NDP cache from interfaces without relay
+ req.nh.nlmsg_type = RTM_DELNEIGH;
+ req.nh.nlmsg_flags &= ~(NLM_F_CREATE | NLM_F_REPLACE);
+
req.ndm.ndm_ifindex = c->ifindex;
send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
}
}
}
- if (is_addr && iface->ra == RELAYD_SERVER)
- raise(SIGUSR1); // Inform about a change in addresses
+ if (is_addr) {
+ if (iface->ra == RELAYD_SERVER)
+ raise(SIGUSR1); // Inform about a change in addresses
- if (is_addr && iface->dhcpv6 == RELAYD_SERVER)
- iface->ia_reconf = true;
+ if (iface->dhcpv6 == RELAYD_SERVER)
+ iface->ia_reconf = true;
- if (iface->ndp == RELAYD_RELAY && is_addr && iface->master) {
- // Replay address changes on all slave interfaces
- nh->nlmsg_flags = NLM_F_REQUEST;
+ if (iface->ndp == RELAYD_RELAY && iface->master) {
+ // Replay address changes on all slave interfaces
+ nh->nlmsg_flags = NLM_F_REQUEST;
- if (nh->nlmsg_type == RTM_NEWADDR)
- nh->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
+ if (nh->nlmsg_type == RTM_NEWADDR)
+ nh->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE;
- struct interface *c;
- list_for_each_entry(c, &interfaces, head) {
- if (c->ndp == RELAYD_RELAY && !c->master) {
- ifa->ifa_index = c->ifindex;
- send(rtnl_event.uloop.fd, nh, nh->nlmsg_len, MSG_DONTWAIT);
+ struct interface *c;
+ list_for_each_entry(c, &interfaces, head) {
+ if (c->ndp == RELAYD_RELAY && !c->master) {
+ ifa->ifa_index = c->ifindex;
+ send(rtnl_event.uloop.fd, nh, nh->nlmsg_len, MSG_DONTWAIT);
+ }
}
}
}
}
- if (dump_neigh) {
- struct {
- struct nlmsghdr nh;
- struct ndmsg ndm;
- } req = {
- {sizeof(req), RTM_GETNEIGH, NLM_F_REQUEST | NLM_F_DUMP,
- ++rtnl_seqid, 0},
- {.ndm_family = AF_INET6}
- };
- send(rtnl_event.uloop.fd, &req, sizeof(req), MSG_DONTWAIT);
- }
+ if (dump_neigh)
+ dump_neigh_table(false);
}
projects / project / odhcpd.git / blobdiff