#include "dhcpv4.h"
#include "dhcpv6.h"
+static void dhcpv4_netevent_cb(unsigned long event, struct netevent_handler_info *info);
static int setup_dhcpv4_addresses(struct interface *iface);
static void update_static_assignments(struct interface *iface);
+static void valid_until_cb(struct uloop_timeout *event);
+static void handle_addrlist_change(struct interface *iface);
static void free_dhcpv4_assignment(struct dhcpv4_assignment *a);
static void dhcpv4_fr_start(struct dhcpv4_assignment *a);
static void dhcpv4_fr_stop(struct dhcpv4_assignment *a);
static void handle_dhcpv4(void *addr, void *data, size_t len,
struct interface *iface, void *dest_addr);
static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
- enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
+ enum dhcpv4_msg msg, const uint8_t *mac, const uint32_t reqaddr,
uint32_t *leasetime, const char *hostname, const size_t hostname_len,
const bool accept_fr_nonce, bool *incl_fr_opt, uint32_t *fr_serverid);
+
+static struct netevent_handler dhcpv4_netevent_handler = { .cb = dhcpv4_netevent_cb, };
+static struct uloop_timeout valid_until_timeout = {.cb = valid_until_cb};
static uint32_t serial = 0;
struct odhcpd_ref_ip {
};
/* Create socket and register events */
-int init_dhcpv4(void)
+int dhcpv4_init(void)
{
+ uloop_timeout_set(&valid_until_timeout, 1000);
+ netlink_add_netevent_handler(&dhcpv4_netevent_handler);
+
return 0;
}
-int setup_dhcpv4_interface(struct interface *iface, bool enable)
+int dhcpv4_setup_interface(struct interface *iface, bool enable)
{
if (iface->dhcpv4_event.uloop.fd > 0) {
uloop_fd_delete(&iface->dhcpv4_event.uloop);
int sock = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
if (sock < 0) {
- syslog(LOG_ERR, "Failed to create DHCPv4 server socket: %s",
- strerror(errno));
+ syslog(LOG_ERR, "Failed to create DHCPv4 server socket: %m");
return -1;
}
{INADDR_ANY}, {0}};
if (bind(sock, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) {
- syslog(LOG_ERR, "Failed to open DHCPv4 server socket: %s",
- strerror(errno));
+ syslog(LOG_ERR, "Failed to open DHCPv4 server socket: %m");
return -1;
}
return 0;
}
+
+static void dhcpv4_netevent_cb(unsigned long event, struct netevent_handler_info *info)
+{
+ struct interface *iface = info->iface;
+
+ if (!iface || iface->dhcpv4 == MODE_DISABLED)
+ return;
+
+ switch (event) {
+ case NETEV_IFINDEX_CHANGE:
+ dhcpv4_setup_interface(iface, true);
+ break;
+ case NETEV_ADDRLIST_CHANGE:
+ handle_addrlist_change(iface);
+ break;
+ default:
+ break;
+ }
+}
+
static struct dhcpv4_assignment *find_assignment_by_hwaddr(struct interface *iface, const uint8_t *hwaddr)
{
struct dhcpv4_assignment *a;
struct odhcpd_ref_ip *ip = *ptr;
if (--ip->ref_cnt == 0) {
- odhcpd_setup_addr(&ip->addr, iface, false, false);
+ netlink_setup_addr(&ip->addr, iface->ifindex, false, false);
list_del(&ip->head);
free(ip);
return fr_ip ? true : false;
}
-void dhcpv4_addr_update(struct interface *iface)
+static void valid_until_cb(struct uloop_timeout *event)
{
- if (iface->dhcpv4 == MODE_DISABLED)
- return;
+ time_t now = odhcpd_time();
+ struct interface *iface;
+ list_for_each_entry(iface, &interfaces, head) {
+ if (iface->dhcpv4 != MODE_SERVER || iface->dhcpv4_assignments.next == NULL)
+ continue;
+ struct dhcpv4_assignment *a, *n;
+ list_for_each_entry_safe(a, n, &iface->dhcpv4_assignments, head) {
+ if (!INFINITE_VALID(a->valid_until) && a->valid_until < now)
+ free_dhcpv4_assignment(a);
+ }
+ }
+ uloop_timeout_set(event, 1000);
+}
+
+static void handle_addrlist_change(struct interface *iface)
+{
struct odhcpd_ipaddr ip;
struct odhcpd_ref_ip *a;
struct dhcpv4_assignment *c;
uint32_t mask = iface->dhcpv4_mask.s_addr;
- memset(&ip, sizeof(ip), 0);
+ memset(&ip, 0, sizeof(ip));
ip.addr.in = iface->dhcpv4_local;
ip.prefix = odhcpd_netmask2bitlen(false, &iface->dhcpv4_mask);
ip.broadcast = iface->dhcpv4_bcast;
a = list_first_entry(&iface->dhcpv4_fr_ips, struct odhcpd_ref_ip, head);
- if (odhcpd_setup_addr(&a->addr, iface, false, true)) {
+ if (netlink_setup_addr(&a->addr, iface->ifindex, false, true)) {
syslog(LOG_ERR, "Failed to add ip address");
return;
}
uint8_t reqmsg = DHCPV4_MSG_REQUEST;
uint8_t msg = DHCPV4_MSG_ACK;
- struct in_addr reqaddr = {INADDR_ANY};
+ uint32_t reqaddr = INADDR_ANY;
uint32_t leasetime = 0;
size_t hostname_len = 0;
char hostname[256];
} else if (reqmsg == DHCPV4_MSG_DISCOVER)
msg = DHCPV4_MSG_OFFER;
else if (reqmsg == DHCPV4_MSG_REQUEST &&
- ((reqaddr.s_addr && reqaddr.s_addr != lease->addr) ||
+ ((reqaddr && reqaddr != lease->addr) ||
(req->ciaddr.s_addr && req->ciaddr.s_addr != lease->addr))) {
msg = DHCPV4_MSG_NAK;
/*
req->chaddr[0],req->chaddr[1],req->chaddr[2],
req->chaddr[3],req->chaddr[4],req->chaddr[5]);
+#ifdef WITH_UBUS
+ if (reqmsg == DHCPV4_MSG_RELEASE)
+ ubus_bcast_dhcp_event("dhcp.release", req->chaddr, req->hlen,
+ &req->ciaddr, hostname, iface->ifname);
+#endif
if (reqmsg == DHCPV4_MSG_DECLINE || reqmsg == DHCPV4_MSG_RELEASE)
return;
sendto(sock, &reply, sizeof(reply), MSG_DONTWAIT,
(struct sockaddr*)&dest, sizeof(dest));
-}
-
-static bool dhcpv4_test(struct interface *iface, uint32_t try)
-{
- struct dhcpv4_assignment *c;
- list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
- if (c->addr == try)
- return false;
- }
- return true;
+#ifdef WITH_UBUS
+ if (msg == DHCPV4_MSG_ACK)
+ ubus_bcast_dhcp_event("dhcp.ack", req->chaddr, req->hlen, &reply.yiaddr,
+ hostname, iface->ifname);
+#endif
}
static bool dhcpv4_assign(struct interface *iface,
uint32_t count = end - start + 1;
// try to assign the IP the client asked for
- if (start <= ntohl(raddr) && ntohl(raddr) <= end && dhcpv4_test(iface, raddr)) {
+ if (start <= ntohl(raddr) && ntohl(raddr) <= end &&
+ !find_assignment_by_addr(iface, raddr)) {
assign->addr = raddr;
syslog(LOG_INFO, "assigning the IP the client asked for: %u.%u.%u.%u",
((uint8_t *)&assign->addr)[0],
}
for (uint32_t i = 0; i < count; ++i) {
- if (dhcpv4_test(iface, htonl(try))) {
+ if (!find_assignment_by_addr(iface, htonl(try))) {
/* test was successful: IP address is not assigned, assign it */
assign->addr = htonl(try);
syslog(LOG_DEBUG, "assigning mapped IP: %u.%u.%u.%u (try %u of %u)",
static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
- enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
+ enum dhcpv4_msg msg, const uint8_t *mac, const uint32_t reqaddr,
uint32_t *leasetime, const char *hostname, const size_t hostname_len,
const bool accept_fr_nonce, bool *incl_fr_opt, uint32_t *fr_serverid)
{
+ struct dhcpv4_assignment *a = find_assignment_by_hwaddr(iface, mac);
struct dhcpv4_assignment *lease = NULL;
time_t now = odhcpd_time();
- struct dhcpv4_assignment *c, *n, *a = NULL;
- list_for_each_entry_safe(c, n, &iface->dhcpv4_assignments, head) {
- if (!memcmp(c->hwaddr, mac, 6)) {
- a = c;
- if (c->addr == reqaddr.s_addr)
- break;
- } else if (!INFINITE_VALID(c->valid_until) && c->valid_until < now)
- free_dhcpv4_assignment(c);
- }
-
if (a && (a->flags & OAF_BOUND) && a->fr_ip) {
*fr_serverid = a->fr_ip->addr.addr.in.s_addr;
dhcpv4_fr_stop(a);
/* Don't consider new assignment as infinite */
a->valid_until = now;
- assigned = dhcpv4_assign(iface, a, reqaddr.s_addr);
+ assigned = dhcpv4_assign(iface, a, reqaddr);
if (assigned) {
a->iface = iface;
list_add(&a->head, &iface->dhcpv4_assignments);
(iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr)) {
list_del(&a->head);
- assigned = dhcpv4_assign(iface, a, reqaddr.s_addr);
+ assigned = dhcpv4_assign(iface, a, reqaddr);
if (assigned)
list_add(&a->head, &iface->dhcpv4_assignments);
}
projects / project / odhcpd.git / blobdiff