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
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) {
dump_neigh_table(false);
else
dump_neigh = false;
+ } else {
+ close(procfd);
}
- close(procfd);
if (dump_neigh)
dump_neigh_table(true);
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