#include <stddef.h>
#include <resolv.h>
#include <sys/timerfd.h>
+#include <arpa/inet.h>
#include "odhcpd.h"
#include "dhcpv6.h"
if (iface->dhcpv6 == RELAYD_SERVER)
setsockopt(sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &server, sizeof(server));
+ if (iface->dhcpv6 != RELAYD_RELAY || !iface->master)
+ ndp_rqs_addr6_dump();
+
iface->dhcpv6_event.uloop.fd = sock;
iface->dhcpv6_event.handle_dgram = handle_dhcpv6;
odhcpd_register(&iface->dhcpv6_event);
size_t dns_cnt = iface->dns_cnt;
if ((dns_cnt == 0) &&
- !odhcpd_get_linklocal_interface_address(iface->ifindex, &dns_addr)) {
+ !odhcpd_get_interface_dns_addr(iface, &dns_addr)) {
dns_addr_ptr = &dns_addr;
dns_cnt = 1;
}
iov[IOV_CERID].iov_len = sizeof(cerid);
if (IN6_IS_ADDR_UNSPECIFIED(&cerid.addr)) {
- struct odhcpd_ipaddr addrs[32];
- ssize_t len = odhcpd_get_interface_addresses(0, addrs,
- ARRAY_SIZE(addrs));
+ struct odhcpd_ipaddr *addrs;
+ ssize_t len = odhcpd_get_interface_addresses(0, &addrs);
for (ssize_t i = 0; i < len; ++i)
if (IN6_IS_ADDR_UNSPECIFIED(&cerid.addr)
|| memcmp(&addrs[i].addr, &cerid.addr, sizeof(cerid.addr)) < 0)
cerid.addr = addrs[i].addr;
+
+ free(addrs);
}
#endif
}
size_t rewrite_cnt = iface->dns_cnt;
if (rewrite_cnt == 0) {
- if (odhcpd_get_linklocal_interface_address(iface->ifindex, &addr))
+ if (odhcpd_get_interface_dns_addr(iface, &addr))
return; // Unable to get interface address
rewrite = &addr;
memcpy(&hdr.interface_id_data, &ifindex, sizeof(ifindex));
// Detect public IP of slave interface to use as link-address
- struct odhcpd_ipaddr ip;
- if (odhcpd_get_interface_addresses(iface->ifindex, &ip, 1) < 1) {
+ struct odhcpd_ipaddr *ip = NULL;
+ if (odhcpd_get_interface_addresses(iface->ifindex, &ip) < 1) {
// No suitable address! Is the slave not configured yet?
// Detect public IP of master interface and use it instead
// This is WRONG and probably violates the RFC. However
// otherwise we have a hen and egg problem because the
// slave-interface cannot be auto-configured.
- if (odhcpd_get_interface_addresses(master->ifindex, &ip, 1) < 1)
+ if (odhcpd_get_interface_addresses(master->ifindex, &ip) < 1)
return; // Could not obtain a suitable address
}
- memcpy(&hdr.link_address, &ip.addr, sizeof(hdr.link_address));
+ memcpy(&hdr.link_address, &ip[0].addr, sizeof(hdr.link_address));
+ free(ip);
struct sockaddr_in6 dhcpv6_servers = {AF_INET6,
htons(DHCPV6_SERVER_PORT), 0, ALL_DHCPV6_SERVERS, 0};