#include "dhcpv4.h"
#include "dhcpv6.h"
+#define PACKET_SIZE(start, end) (((uint8_t *)end - (uint8_t *)start) < DHCPV4_MIN_PACKET_SIZE ? \
+ DHCPV4_MIN_PACKET_SIZE : (uint8_t *)end - (uint8_t *)start)
+#define MAX_PREFIX_LEN 28
+
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 bool addr_is_fr_ip(struct interface *iface, struct in_addr *addr);
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 dhcpv4_fr_start(struct dhcp_assignment *a);
+static void dhcpv4_fr_rand_delay(struct dhcp_assignment *a);
+static void dhcpv4_fr_stop(struct dhcp_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,
+static struct dhcp_assignment* dhcpv4_lease(struct interface *iface,
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);
+ const bool accept_fr_nonce, bool *incl_fr_opt, uint32_t *fr_serverid,
+ const char *reqopts, const size_t reqopts_len);
static struct netevent_handler dhcpv4_netevent_handler = { .cb = dhcpv4_netevent_cb, };
static struct uloop_timeout valid_until_timeout = {.cb = valid_until_cb};
int dhcpv4_setup_interface(struct interface *iface, bool enable)
{
- if (iface->dhcpv4_event.uloop.fd > 0) {
+ int ret = 0;
+
+ enable = enable && (iface->dhcpv4 != MODE_DISABLED);
+
+ if (iface->dhcpv4_event.uloop.fd >= 0) {
uloop_fd_delete(&iface->dhcpv4_event.uloop);
close(iface->dhcpv4_event.uloop.fd);
iface->dhcpv4_event.uloop.fd = -1;
}
- if (iface->dhcpv4 && enable) {
- if (!iface->dhcpv4_assignments.next)
- INIT_LIST_HEAD(&iface->dhcpv4_assignments);
-
- if (!iface->dhcpv4_fr_ips.next)
- INIT_LIST_HEAD(&iface->dhcpv4_fr_ips);
+ if (enable) {
+ struct sockaddr_in bind_addr = {AF_INET, htons(DHCPV4_SERVER_PORT),
+ {INADDR_ANY}, {0}};
+ int val = 1;
- 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));
- return -1;
+ iface->dhcpv4_event.uloop.fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP);
+ if (iface->dhcpv4_event.uloop.fd < 0) {
+ syslog(LOG_ERR, "socket(AF_INET): %m");
+ ret = -1;
+ goto out;
}
/* Basic IPv4 configuration */
- int val = 1;
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
- setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &val, sizeof(val));
- setsockopt(sock, IPPROTO_IP, IP_PKTINFO, &val, sizeof(val));
+ if (setsockopt(iface->dhcpv4_event.uloop.fd, SOL_SOCKET, SO_REUSEADDR,
+ &val, sizeof(val)) < 0) {
+ syslog(LOG_ERR, "setsockopt(SO_REUSEADDR): %m");
+ ret = -1;
+ goto out;
+ }
+
+ if (setsockopt(iface->dhcpv4_event.uloop.fd, SOL_SOCKET, SO_BROADCAST,
+ &val, sizeof(val)) < 0) {
+ syslog(LOG_ERR, "setsockopt(SO_BROADCAST): %m");
+ ret = -1;
+ goto out;
+ }
+
+ if (setsockopt(iface->dhcpv4_event.uloop.fd, IPPROTO_IP, IP_PKTINFO,
+ &val, sizeof(val)) < 0) {
+ syslog(LOG_ERR, "setsockopt(IP_PKTINFO): %m");
+ ret = -1;
+ goto out;
+ }
val = IPTOS_PREC_INTERNETCONTROL;
- setsockopt(sock, IPPROTO_IP, IP_TOS, &val, sizeof(val));
+ if (setsockopt(iface->dhcpv4_event.uloop.fd, IPPROTO_IP, IP_TOS,
+ &val, sizeof(val)) < 0) {
+ syslog(LOG_ERR, "setsockopt(IP_TOS): %m");
+ ret = -1;
+ goto out;
+ }
val = IP_PMTUDISC_DONT;
- setsockopt(sock, IPPROTO_IP, IP_MTU_DISCOVER, &val, sizeof(val));
+ if (setsockopt(iface->dhcpv4_event.uloop.fd, IPPROTO_IP, IP_MTU_DISCOVER,
+ &val, sizeof(val)) < 0) {
+ syslog(LOG_ERR, "setsockopt(IP_MTU_DISCOVER): %m");
+ ret = -1;
+ goto out;
+ }
- setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
- iface->ifname, strlen(iface->ifname));
+ if (setsockopt(iface->dhcpv4_event.uloop.fd, SOL_SOCKET, SO_BINDTODEVICE,
+ iface->ifname, strlen(iface->ifname)) < 0) {
+ syslog(LOG_ERR, "setsockopt(SO_BINDTODEVICE): %m");
+ ret = -1;
+ goto out;
+ }
- struct sockaddr_in bind_addr = {AF_INET, htons(DHCPV4_SERVER_PORT),
- {INADDR_ANY}, {0}};
+ if (bind(iface->dhcpv4_event.uloop.fd, (struct sockaddr*)&bind_addr,
+ sizeof(bind_addr)) < 0) {
+ syslog(LOG_ERR, "bind(): %m");
+ ret = -1;
+ goto out;
+ }
- if (bind(sock, (struct sockaddr*)&bind_addr, sizeof(bind_addr))) {
- syslog(LOG_ERR, "Failed to open DHCPv4 server socket: %s",
- strerror(errno));
- return -1;
+ if (setup_dhcpv4_addresses(iface) < 0) {
+ ret = -1;
+ goto out;
}
- iface->dhcpv4_event.uloop.fd = sock;
iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
odhcpd_register(&iface->dhcpv4_event);
-
- if (setup_dhcpv4_addresses(iface) < 0)
- return -1;
-
- update_static_assignments(iface);
- } else if (iface->dhcpv4_assignments.next) {
+ } else {
while (!list_empty(&iface->dhcpv4_assignments))
- free_dhcpv4_assignment(list_first_entry(&iface->dhcpv4_assignments,
- struct dhcpv4_assignment, head));
+ free_assignment(list_first_entry(&iface->dhcpv4_assignments,
+ struct dhcp_assignment, head));
}
- return 0;
+
+out:
+ if (ret < 0 && iface->dhcpv4_event.uloop.fd >= 0) {
+ close(iface->dhcpv4_event.uloop.fd);
+ iface->dhcpv4_event.uloop.fd = -1;
+ }
+
+ return ret;
}
}
}
-static struct dhcpv4_assignment *find_assignment_by_hwaddr(struct interface *iface, const uint8_t *hwaddr)
+static struct dhcp_assignment *find_assignment_by_hwaddr(struct interface *iface, const uint8_t *hwaddr)
{
- struct dhcpv4_assignment *a;
+ struct dhcp_assignment *a;
list_for_each_entry(a, &iface->dhcpv4_assignments, head)
if (!memcmp(a->hwaddr, hwaddr, 6))
return NULL;
}
-static struct dhcpv4_assignment *find_assignment_by_addr(struct interface *iface, const uint32_t addr)
-{
- struct dhcpv4_assignment *a;
-
- list_for_each_entry(a, &iface->dhcpv4_assignments, head)
- if (a->addr == addr)
- return a;
-
- return NULL;
-}
-
static int setup_dhcpv4_addresses(struct interface *iface)
{
iface->dhcpv4_start_ip.s_addr = INADDR_ANY;
if (iface->dhcpv4_start.s_addr & htonl(0xffff0000) ||
iface->dhcpv4_end.s_addr & htonl(0xffff0000) ||
ntohl(iface->dhcpv4_start.s_addr) > ntohl(iface->dhcpv4_end.s_addr)) {
- syslog(LOG_ERR, "invalid DHCP range for %s", iface->name);
+ syslog(LOG_WARNING, "Invalid DHCP range for %s", iface->name);
return -1;
}
if (!iface->addr4_len) {
- syslog(LOG_WARNING, "no network(s) available on %s", iface->name);
+ syslog(LOG_WARNING, "No network(s) available on %s", iface->name);
return -1;
}
struct in_addr *addr = &iface->addr4[i].addr.in;
struct in_addr mask;
+ if (addr_is_fr_ip(iface, addr))
+ continue;
+
odhcpd_bitlen2netmask(false, iface->addr4[i].prefix, &mask);
if ((start & ntohl(~mask.s_addr)) == start &&
- (end & ntohl(~mask.s_addr)) == end) {
+ (end & ntohl(~mask.s_addr)) == end &&
+ end < ntohl(~mask.s_addr)) { /* Exclude broadcast address */
iface->dhcpv4_start_ip.s_addr = htonl(start) |
(addr->s_addr & mask.s_addr);
iface->dhcpv4_end_ip.s_addr = htonl(end) |
}
}
- /* Don't allocate IP range for subnets bigger than 28 */
- if (iface->addr4[0].prefix > 28) {
- syslog(LOG_WARNING, "auto allocation of DHCP range fails on %s", iface->name);
+ /* Don't allocate IP range for subnets smaller than /28 */
+ if (iface->addr4[0].prefix > MAX_PREFIX_LEN) {
+ syslog(LOG_WARNING, "Auto allocation of DHCP range fails on %s (prefix length must be < %d).", iface->name, MAX_PREFIX_LEN + 1);
return -1;
}
end = start = iface->dhcpv4_local.s_addr & iface->dhcpv4_mask.s_addr;
/* Auto allocate ranges */
- if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffff00) {
+ if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffff00) { /* /24, 150 of 256, [100..249] */
iface->dhcpv4_start_ip.s_addr = start | htonl(100);
- iface->dhcpv4_end_ip.s_addr = end | htonl(250);
- } else if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffffc0) {
+ iface->dhcpv4_end_ip.s_addr = end | htonl(100 + 150 - 1);
+ } else if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffff80) { /* /25, 100 of 128, [20..119] */
+ iface->dhcpv4_start_ip.s_addr = start | htonl(20);
+ iface->dhcpv4_end_ip.s_addr = end | htonl(20 + 100 - 1);
+ } else if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffffc0) { /* /26, 50 of 64, [10..59] */
iface->dhcpv4_start_ip.s_addr = start | htonl(10);
- iface->dhcpv4_end_ip.s_addr = end | htonl(60);
- } else if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffffe0) {
+ iface->dhcpv4_end_ip.s_addr = end | htonl(10 + 50 - 1);
+ } else if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffffe0) { /* /27, 20 of 32, [10..29] */
iface->dhcpv4_start_ip.s_addr = start | htonl(10);
- iface->dhcpv4_end_ip.s_addr = end | htonl(30);
- } else {
+ iface->dhcpv4_end_ip.s_addr = end | htonl(10 + 20 - 1);
+ } else { /* /28, 10 of 16, [3..12] */
iface->dhcpv4_start_ip.s_addr = start | htonl(3);
- iface->dhcpv4_end_ip.s_addr = end | htonl(12);
+ iface->dhcpv4_end_ip.s_addr = end | htonl(3 + 10 - 1);
}
return 0;
}
-static void update_static_assignments(struct interface *iface)
-{
- struct dhcpv4_assignment *a, *c;
-
- /* Cleanup static entries not belonging to the network */
- list_for_each_entry_safe(a, c, &iface->dhcpv4_assignments, head) {
- if ((a->flags & OAF_STATIC) &&
- ((a->addr & iface->dhcpv4_mask.s_addr) !=
- (iface->dhcpv4_start.s_addr & iface->dhcpv4_mask.s_addr)))
- free_dhcpv4_assignment(a);
- }
-
- /* Parse static entries */
- struct lease *lease;
- list_for_each_entry(lease, &leases, head) {
- if ((iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr) !=
- (lease->ipaddr.s_addr & iface->dhcpv4_mask.s_addr)) {
- continue;
- }
-
- a = find_assignment_by_hwaddr(iface, lease->mac.ether_addr_octet);
-
- if (!a) {
- /* Check if there's an assignment with the specified IP address */
- if (find_assignment_by_addr(iface, lease->ipaddr.s_addr))
- continue;
-
- /* Construct entry */
- a = calloc(1, sizeof(*a));
- if (!a) {
- syslog(LOG_ERR, "Calloc failed for static lease on interface %s",
- iface->ifname);
- continue;
- }
- memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
- }
-
- a->leasetime = lease->dhcpv4_leasetime;
-
- a->addr = lease->ipaddr.s_addr;
- /* Static assignment */
- a->flags |= OAF_STATIC;
- /* Infinite valid */
- a->valid_until = 0;
- a->iface = iface;
- if (lease->hostname[0]) {
- free(a->hostname);
- a->hostname = strdup(lease->hostname);
- }
-
- /* Assign to all interfaces */
- list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
- if (ntohl(c->addr) > ntohl(a->addr)) {
- list_add_tail(&a->head, &c->head);
- break;
- }
- }
-
- if (&c->head == &iface->dhcpv4_assignments)
- list_add(&a->head, &iface->dhcpv4_assignments);
- }
-}
-
static void inc_ref_cnt_ip(struct odhcpd_ref_ip **ptr, struct odhcpd_ref_ip *ip)
{
*ptr = ip;
*ptr = NULL;
}
+static bool addr_is_fr_ip(struct interface *iface, struct in_addr *addr)
+{
+ struct odhcpd_ref_ip *p;
+
+ list_for_each_entry(p, &iface->dhcpv4_fr_ips, head) {
+ if (addr->s_addr == p->addr.addr.in.s_addr)
+ return true;
+ }
+
+ return false;
+}
+
static bool leases_require_fr(struct interface *iface, struct odhcpd_ipaddr *addr,
uint32_t mask)
{
- struct dhcpv4_assignment *a = NULL;
+ struct dhcp_assignment *a = NULL;
struct odhcpd_ref_ip *fr_ip = NULL;
list_for_each_entry(a, &iface->dhcpv4_assignments, head) {
static void valid_until_cb(struct uloop_timeout *event)
{
- 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)
+ time_t now = odhcpd_time();
+
+ avl_for_each_element(&interfaces, iface, avl) {
+ struct dhcp_assignment *a, *n;
+
+ if (iface->dhcpv4 != MODE_SERVER)
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);
+ free_assignment(a);
}
}
uloop_timeout_set(event, 1000);
{
struct odhcpd_ipaddr ip;
struct odhcpd_ref_ip *a;
- struct dhcpv4_assignment *c;
+ struct dhcp_assignment *c;
uint32_t mask = iface->dhcpv4_mask.s_addr;
memset(&ip, 0, sizeof(ip));
a = list_first_entry(&iface->dhcpv4_fr_ips, struct odhcpd_ref_ip, head);
if (netlink_setup_addr(&a->addr, iface->ifindex, false, true)) {
- syslog(LOG_ERR, "Failed to add ip address");
+ syslog(LOG_WARNING, "Failed to add ip address on %s", iface->name);
return;
}
list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
if ((c->flags & OAF_BOUND) && c->fr_ip && !c->fr_cnt) {
if (c->accept_fr_nonce || iface->dhcpv4_forcereconf)
- dhcpv4_fr_start(c);
+ dhcpv4_fr_rand_delay(c);
else
dhcpv4_fr_stop(c);
}
}
}
-static void free_dhcpv4_assignment(struct dhcpv4_assignment *a)
+static void dhcpv4_free_assignment(struct dhcp_assignment *a)
{
- if (a->head.next)
- list_del(&a->head);
-
if (a->fr_ip)
dhcpv4_fr_stop(a);
-
- free(a->hostname);
- free(a);
}
static void dhcpv4_put(struct dhcpv4_message *msg, uint8_t **cookie,
uint8_t type, uint8_t len, const void *data)
{
uint8_t *c = *cookie;
- if (*cookie + 2 + len > (uint8_t*)&msg[1])
+ uint8_t *end = (uint8_t *)msg + sizeof(*msg);
+ bool tag_only = type == DHCPV4_OPT_PAD || type == DHCPV4_OPT_END;
+ int total_len = tag_only ? 1 : 2 + len;
+
+ if (*cookie + total_len > end)
return;
+ *cookie += total_len;
*c++ = type;
+
+ if (tag_only)
+ return;
+
*c++ = len;
memcpy(c, data, len);
-
- *cookie = c + len;
}
-static void dhcpv4_fr_send(struct dhcpv4_assignment *a)
+static void dhcpv4_fr_send(struct dhcp_assignment *a)
{
struct dhcpv4_message fr_msg = {
.op = DHCPV4_BOOTREPLY,
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
dest.sin_addr.s_addr = a->addr;
- syslog(LOG_WARNING, "sending %s to %02x:%02x:%02x:%02x:%02x:%02x - %s",
- dhcpv4_msg_to_string(msg),
- a->hwaddr[0], a->hwaddr[1], a->hwaddr[2],
- a->hwaddr[3], a->hwaddr[4], a->hwaddr[5],
- inet_ntoa(dest.sin_addr));
-
- sendto(iface->dhcpv4_event.uloop.fd, &fr_msg, sizeof(fr_msg),
- MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest));
+ if (sendto(iface->dhcpv4_event.uloop.fd, &fr_msg, PACKET_SIZE(&fr_msg, cookie),
+ MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest)) < 0)
+ syslog(LOG_ERR, "Failed to send %s to %s - %s: %m", dhcpv4_msg_to_string(msg),
+ odhcpd_print_mac(a->hwaddr, sizeof(a->hwaddr)), inet_ntoa(dest.sin_addr));
+ else
+ syslog(LOG_DEBUG, "Sent %s to %s - %s", dhcpv4_msg_to_string(msg),
+ odhcpd_print_mac(a->hwaddr, sizeof(a->hwaddr)), inet_ntoa(dest.sin_addr));
}
static void dhcpv4_fr_timer(struct uloop_timeout *event)
{
- struct dhcpv4_assignment *a = container_of(event, struct dhcpv4_assignment, fr_timer);
+ struct dhcp_assignment *a = container_of(event, struct dhcp_assignment, fr_timer);
if (a->fr_cnt > 0 && a->fr_cnt < 8) {
dhcpv4_fr_send(a);
dhcpv4_fr_stop(a);
}
-static void dhcpv4_fr_start(struct dhcpv4_assignment *a)
+static void dhcpv4_fr_start(struct dhcp_assignment *a)
{
uloop_timeout_set(&a->fr_timer, 1000 << a->fr_cnt);
a->fr_timer.cb = dhcpv4_fr_timer;
dhcpv4_fr_send(a);
}
-static void dhcpv4_fr_stop(struct dhcpv4_assignment *a)
+static void dhcpv4_fr_delay_timer(struct uloop_timeout *event)
+{
+ struct dhcp_assignment *a = container_of(event, struct dhcp_assignment, fr_timer);
+ struct interface *iface = a->iface;
+
+ (iface->dhcpv4_event.uloop.fd == -1 ? dhcpv4_fr_rand_delay(a) : dhcpv4_fr_start(a));
+}
+
+static void dhcpv4_fr_rand_delay(struct dhcp_assignment *a)
+{
+#define MIN_DELAY 500
+#define MAX_FUZZ 500
+ int msecs;
+
+ odhcpd_urandom(&msecs, sizeof(msecs));
+
+ msecs = labs(msecs)%MAX_FUZZ + MIN_DELAY;
+
+ uloop_timeout_set(&a->fr_timer, msecs);
+ a->fr_timer.cb = dhcpv4_fr_delay_timer;
+}
+
+static void dhcpv4_fr_stop(struct dhcp_assignment *a)
{
uloop_timeout_cancel(&a->fr_timer);
decr_ref_cnt_ip(&a->fr_ip, a->iface);
a->fr_timer.cb = NULL;
}
-// Handler for DHCPv4 messages
+static int dhcpv4_send_reply(const void *buf, size_t len,
+ const struct sockaddr *dest, socklen_t dest_len,
+ void *opaque)
+{
+ int *sock = opaque;
+
+ return sendto(*sock, buf, len, MSG_DONTWAIT, dest, dest_len);
+}
+
+/* Handler for DHCPv4 messages */
static void handle_dhcpv4(void *addr, void *data, size_t len,
struct interface *iface, _unused void *dest_addr)
{
- if (!iface->dhcpv4)
- return;
+ int sock = iface->dhcpv4_event.uloop.fd;
+
+ dhcpv4_handle_msg(addr, data, len, iface, dest_addr, dhcpv4_send_reply, &sock);
+}
+void dhcpv4_handle_msg(void *addr, void *data, size_t len,
+ struct interface *iface, _unused void *dest_addr,
+ send_reply_cb_t send_reply, void *opaque)
+{
struct dhcpv4_message *req = data;
+
+ if (iface->dhcpv4 == MODE_DISABLED)
+ return;
+
if (len < offsetof(struct dhcpv4_message, options) + 4 ||
req->op != DHCPV4_BOOTREQUEST || req->hlen != 6)
return;
-
- syslog(LOG_NOTICE, "Got DHCPv4 request");
+ syslog(LOG_DEBUG, "Got DHCPv4 request on %s", iface->name);
if (!iface->dhcpv4_start_ip.s_addr && !iface->dhcpv4_end_ip.s_addr) {
syslog(LOG_WARNING, "No DHCP range available on %s", iface->name);
uint32_t reqaddr = INADDR_ANY;
uint32_t leasetime = 0;
size_t hostname_len = 0;
+ size_t reqopts_len = 0;
char hostname[256];
+ char reqopts[256];
bool accept_fr_nonce = false;
bool incl_fr_opt = false;
dhcpv4_for_each_option(start, end, opt) {
if (opt->type == DHCPV4_OPT_MESSAGE && opt->len == 1)
reqmsg = opt->data[0];
- else if (opt->type == DHCPV4_OPT_HOSTNAME && opt->len > 0) {
+ else if (opt->type == DHCPV4_OPT_REQOPTS && opt->len > 0) {
+ reqopts_len = opt->len;
+ memcpy(reqopts, opt->data, reqopts_len);
+ reqopts[reqopts_len] = 0;
+ } else if (opt->type == DHCPV4_OPT_HOSTNAME && opt->len > 0) {
hostname_len = opt->len;
memcpy(hostname, opt->data, hostname_len);
hostname[hostname_len] = 0;
}
if (reqmsg != DHCPV4_MSG_DISCOVER && reqmsg != DHCPV4_MSG_REQUEST &&
- reqmsg != DHCPV4_MSG_INFORM && reqmsg != DHCPV4_MSG_DECLINE &&
- reqmsg != DHCPV4_MSG_RELEASE)
+ reqmsg != DHCPV4_MSG_INFORM && reqmsg != DHCPV4_MSG_DECLINE &&
+ reqmsg != DHCPV4_MSG_RELEASE)
return;
- struct dhcpv4_assignment *lease = NULL;
+ struct dhcp_assignment *a = NULL;
uint32_t serverid = iface->dhcpv4_local.s_addr;
uint32_t fr_serverid = INADDR_ANY;
if (reqmsg != DHCPV4_MSG_INFORM)
- lease = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr,
- &leasetime, hostname, hostname_len,
- accept_fr_nonce, &incl_fr_opt, &fr_serverid);
+ a = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr,
+ &leasetime, hostname, hostname_len,
+ accept_fr_nonce, &incl_fr_opt, &fr_serverid,
+ reqopts, reqopts_len);
- if (!lease) {
+ if (!a) {
if (reqmsg == DHCPV4_MSG_REQUEST)
msg = DHCPV4_MSG_NAK;
else if (reqmsg == DHCPV4_MSG_DISCOVER)
} else if (reqmsg == DHCPV4_MSG_DISCOVER)
msg = DHCPV4_MSG_OFFER;
else if (reqmsg == DHCPV4_MSG_REQUEST &&
- ((reqaddr && reqaddr != lease->addr) ||
- (req->ciaddr.s_addr && req->ciaddr.s_addr != lease->addr))) {
+ ((reqaddr && reqaddr != a->addr) ||
+ (req->ciaddr.s_addr && req->ciaddr.s_addr != a->addr))) {
msg = DHCPV4_MSG_NAK;
/*
* DHCP client requested an IP which we can't offer to him. Probably the
req->ciaddr.s_addr = INADDR_ANY;
}
- syslog(LOG_WARNING, "received %s from %02x:%02x:%02x:%02x:%02x:%02x",
- dhcpv4_msg_to_string(reqmsg),
- req->chaddr[0],req->chaddr[1],req->chaddr[2],
- req->chaddr[3],req->chaddr[4],req->chaddr[5]);
+ syslog(LOG_INFO, "Received %s from %s on %s", dhcpv4_msg_to_string(reqmsg),
+ odhcpd_print_mac(req->chaddr, req->hlen), iface->name);
#ifdef WITH_UBUS
if (reqmsg == DHCPV4_MSG_RELEASE)
ubus_bcast_dhcp_event("dhcp.release", req->chaddr, req->hlen,
- &req->ciaddr, hostname, iface->ifname);
+ &req->ciaddr, a ? a->hostname : NULL, iface->ifname);
#endif
if (reqmsg == DHCPV4_MSG_DECLINE || reqmsg == DHCPV4_MSG_RELEASE)
return;
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_MESSAGE, 1, &msg);
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, &serverid);
- if (lease) {
+ if (a) {
uint32_t val;
- reply.yiaddr.s_addr = lease->addr;
+ reply.yiaddr.s_addr = a->addr;
val = htonl(leasetime);
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_LEASETIME, 4, &val);
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NETMASK, 4,
&iface->dhcpv4_mask.s_addr);
- if (lease->hostname)
+ if (a->hostname)
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_HOSTNAME,
- strlen(lease->hostname), lease->hostname);
+ strlen(a->hostname), a->hostname);
if (iface->dhcpv4_bcast.s_addr != INADDR_ANY)
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_BROADCAST, 4, &iface->dhcpv4_bcast);
.key = {0},
};
- memcpy(auth.key, lease->key, sizeof(auth.key));
+ memcpy(auth.key, a->key, sizeof(auth.key));
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_AUTHENTICATION, sizeof(auth), &auth);
} else {
uint8_t one = 1;
}
}
- struct ifreq ifr = {.ifr_name = ""};
- strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name));
+ struct ifreq ifr;
+
+ memset(&ifr, 0, sizeof(ifr));
+ strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name) - 1);
if (!ioctl(sock, SIOCGIFMTU, &ifr)) {
uint16_t mtu = htons(ifr.ifr_mtu);
4 * iface->dhcpv4_router_cnt, iface->dhcpv4_router);
- if (iface->dhcpv4_dns_cnt == 0)
- dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, &iface->dhcpv4_local);
- else
+ if (iface->dhcpv4_dns_cnt == 0) {
+ if (iface->dns_service)
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, &iface->dhcpv4_local);
+ } else
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER,
4 * iface->dhcpv4_dns_cnt, iface->dhcpv4_dns);
+ if (a && a->reqopts && iface->dhcpv4_ntp_cnt != 0) {
+ for(size_t opts = 0; a->reqopts[opts]; opts++) {
+ if (a->reqopts[opts] == DHCPV4_OPT_NTPSERVER) {
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NTPSERVER,
+ 4 * iface->dhcpv4_ntp_cnt, iface->dhcpv4_ntp);
+ }
+ }
+ }
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_END, 0, NULL);
dest.sin_addr.s_addr = INADDR_BROADCAST;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else {
+ struct arpreq arp = {.arp_flags = ATF_COM};
+
/*
* send reply to the newly (in this proccess) allocated IP
*/
dest.sin_addr = reply.yiaddr;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
- struct arpreq arp = {.arp_flags = ATF_COM};
- memcpy(arp.arp_ha.sa_data, req->chaddr, 6);
- memcpy(&arp.arp_pa, &dest, sizeof(arp.arp_pa));
- memcpy(arp.arp_dev, iface->ifname, sizeof(arp.arp_dev));
- ioctl(sock, SIOCSARP, &arp);
+ if (!(iface->ifflags & IFF_NOARP)) {
+ memcpy(arp.arp_ha.sa_data, req->chaddr, 6);
+ memcpy(&arp.arp_pa, &dest, sizeof(arp.arp_pa));
+ memcpy(arp.arp_dev, iface->ifname, sizeof(arp.arp_dev));
+
+ if (ioctl(sock, SIOCSARP, &arp) < 0)
+ syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
+ }
}
- if (dest.sin_addr.s_addr == INADDR_BROADCAST)
- /* reply goes to IP broadcast -> MAC broadcast */
- syslog(LOG_WARNING, "sending %s to ff:ff:ff:ff:ff:ff - %s",
- dhcpv4_msg_to_string(msg),
- inet_ntoa(dest.sin_addr));
+ if (send_reply(&reply, PACKET_SIZE(&reply, cookie),
+ (struct sockaddr*)&dest, sizeof(dest), opaque) < 0)
+ syslog(LOG_ERR, "Failed to send %s to %s - %s: %m",
+ dhcpv4_msg_to_string(msg),
+ dest.sin_addr.s_addr == INADDR_BROADCAST ?
+ "ff:ff:ff:ff:ff:ff": odhcpd_print_mac(req->chaddr, req->hlen),
+ inet_ntoa(dest.sin_addr));
else
- /*
- * reply is send directly to IP,
- * MAC is assumed to be the same as the request
- */
- syslog(LOG_WARNING, "sending %s to %02x:%02x:%02x:%02x:%02x:%02x - %s",
- dhcpv4_msg_to_string(msg),
- req->chaddr[0],req->chaddr[1],req->chaddr[2],
- req->chaddr[3],req->chaddr[4],req->chaddr[5],
- inet_ntoa(dest.sin_addr));
+ syslog(LOG_DEBUG, "Sent %s to %s - %s",
+ dhcpv4_msg_to_string(msg),
+ dest.sin_addr.s_addr == INADDR_BROADCAST ?
+ "ff:ff:ff:ff:ff:ff": odhcpd_print_mac(req->chaddr, req->hlen),
+ inet_ntoa(dest.sin_addr));
- sendto(sock, &reply, sizeof(reply), MSG_DONTWAIT,
- (struct sockaddr*)&dest, sizeof(dest));
#ifdef WITH_UBUS
if (msg == DHCPV4_MSG_ACK)
ubus_bcast_dhcp_event("dhcp.ack", req->chaddr, req->hlen, &reply.yiaddr,
- hostname, iface->ifname);
+ a ? a->hostname : NULL, iface->ifname);
#endif
}
-static bool dhcpv4_assign(struct interface *iface,
- struct dhcpv4_assignment *assign, uint32_t raddr)
+static bool dhcpv4_insert_assignment(struct list_head *list, struct dhcp_assignment *a,
+ uint32_t addr)
+{
+ uint32_t h_addr = ntohl(addr);
+ struct dhcp_assignment *c;
+
+ list_for_each_entry(c, list, head) {
+ uint32_t c_addr = ntohl(c->addr);
+
+ if (c_addr == h_addr)
+ return false;
+
+ if (c_addr > h_addr)
+ break;
+ }
+
+ /* Insert new node before c (might match list head) */
+ a->addr = addr;
+ list_add_tail(&a->head, &c->head);
+
+ return true;
+}
+
+static char* ip4toa(uint32_t addr)
+{
+ static char buf[16];
+
+ snprintf(buf, sizeof(buf), "%u.%u.%u.%u",
+ ((uint8_t *)&addr)[0], ((uint8_t *)&addr)[1],
+ ((uint8_t *)&addr)[2], ((uint8_t *)&addr)[3]);
+
+ return buf;
+}
+
+static bool dhcpv4_assign(struct interface *iface, struct dhcp_assignment *a,
+ uint32_t raddr)
{
uint32_t start = ntohl(iface->dhcpv4_start_ip.s_addr);
uint32_t end = ntohl(iface->dhcpv4_end_ip.s_addr);
uint32_t count = end - start + 1;
+ uint32_t seed = 0;
+ bool assigned;
+
+ /* Preconfigured IP address by static lease */
+ if (a->addr) {
+ assigned = dhcpv4_insert_assignment(&iface->dhcpv4_assignments,
+ a, a->addr);
- // try to assign the IP the client asked for
+ if (assigned)
+ syslog(LOG_DEBUG, "Assigning static IP: %s", ip4toa(a->addr));
+
+ return assigned;
+ }
+
+ /* try to assign the IP the client asked for */
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],
- ((uint8_t *)&assign->addr)[1],
- ((uint8_t *)&assign->addr)[2],
- ((uint8_t *)&assign->addr)[3]);
- return true;
+ !config_find_lease_by_ipaddr(raddr)) {
+ assigned = dhcpv4_insert_assignment(&iface->dhcpv4_assignments,
+ a, raddr);
+
+ if (assigned) {
+ syslog(LOG_DEBUG, "Assigning the IP the client asked for: %s",
+ ip4toa(a->addr));
+
+ return true;
+ }
}
- // Seed RNG with checksum of hwaddress
- uint32_t seed = 0;
- for (size_t i = 0; i < sizeof(assign->hwaddr); ++i) {
- // Knuth's multiplicative method
- uint8_t o = assign->hwaddr[i];
+ /* Seed RNG with checksum of hwaddress */
+ for (size_t i = 0; i < sizeof(a->hwaddr); ++i) {
+ /* Knuth's multiplicative method */
+ uint8_t o = a->hwaddr[i];
seed += (o*2654435761) % UINT32_MAX;
}
srand(seed);
- uint32_t try = (((uint32_t)rand()) % count) + start;
+ for (uint32_t i = 0, try = (((uint32_t)rand()) % count) + start; i < count;
+ ++i, try = (((try - start) + 1) % count) + start) {
+ uint32_t n_try = htonl(try);
- if (list_empty(&iface->dhcpv4_assignments)) {
- assign->addr = htonl(try);
- syslog(LOG_INFO, "assigning mapped IP (empty list): %u.%u.%u.%u",
- ((uint8_t *)&assign->addr)[0],
- ((uint8_t *)&assign->addr)[1],
- ((uint8_t *)&assign->addr)[2],
- ((uint8_t *)&assign->addr)[3]);
- return true;
- }
+ if (config_find_lease_by_ipaddr(n_try))
+ continue;
+
+ assigned = dhcpv4_insert_assignment(&iface->dhcpv4_assignments,
+ a, n_try);
+
+ if (assigned) {
+ syslog(LOG_DEBUG, "Assigning mapped IP: %s (try %u of %u)",
+ ip4toa(a->addr), i + 1, count);
- for (uint32_t i = 0; i < count; ++i) {
- 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)",
- ((uint8_t *)&assign->addr)[0],
- ((uint8_t *)&assign->addr)[1],
- ((uint8_t *)&assign->addr)[2],
- ((uint8_t *)&assign->addr)[3],
- i, count);
return true;
}
- try = (((try - start) + 1) % count) + start;
}
- syslog(LOG_WARNING, "can't assign any IP address -> address space is full");
+ syslog(LOG_NOTICE, "Can't assign any IP address -> address space is full");
+
return false;
}
-static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
- 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 dhcp_assignment*
+dhcpv4_lease(struct interface *iface, 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, const char* reqopts, const size_t reqopts_len)
{
- struct dhcpv4_assignment *a = find_assignment_by_hwaddr(iface, mac);
- struct dhcpv4_assignment *lease = NULL;
+ struct dhcp_assignment *a = find_assignment_by_hwaddr(iface, mac);
+ struct lease *l = config_find_lease_by_mac(mac);
time_t now = odhcpd_time();
+ if (l && a && a->lease != l) {
+ free_assignment(a);
+ a = NULL;
+ }
+
if (a && (a->flags & OAF_BOUND) && a->fr_ip) {
*fr_serverid = a->fr_ip->addr.addr.in.s_addr;
dhcpv4_fr_stop(a);
bool assigned = !!a;
if (!a) {
- if (!iface->no_dynamic_dhcp) {
+ if (!iface->no_dynamic_dhcp || l) {
/* Create new binding */
- a = calloc(1, sizeof(*a));
+ a = alloc_assignment(0);
if (!a) {
- syslog(LOG_ERR, "Failed to calloc binding on interface %s",
- iface->ifname);
+ syslog(LOG_WARNING, "Failed to alloc assignment on interface %s",
+ iface->ifname);
return NULL;
}
memcpy(a->hwaddr, mac, sizeof(a->hwaddr));
- /* Don't consider new assignment as infinite */
- a->valid_until = now;
+ /* Set valid time to 0 for static lease indicating */
+ /* infinite lifetime otherwise current time */
+ a->valid_until = l ? 0 : now;
+ a->dhcp_free_cb = dhcpv4_free_assignment;
+ a->iface = iface;
+ a->flags = OAF_DHCPV4;
+ a->addr = l ? l->ipaddr : INADDR_ANY;
assigned = dhcpv4_assign(iface, a, reqaddr);
- if (assigned) {
- a->iface = iface;
- list_add(&a->head, &iface->dhcpv4_assignments);
+
+ if (l) {
+ a->flags |= OAF_STATIC;
+
+ if (l->hostname)
+ a->hostname = strdup(l->hostname);
+
+ if (l->leasetime)
+ a->leasetime = l->leasetime;
+
+ list_add(&a->lease_list, &l->assignments);
+ a->lease = l;
}
}
- } else if ((a->addr & iface->dhcpv4_mask.s_addr) !=
- (iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr)) {
- list_del(&a->head);
+ } else if (((a->addr & iface->dhcpv4_mask.s_addr) !=
+ (iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr)) &&
+ !(a->flags & OAF_STATIC)) {
+ list_del_init(&a->head);
+ a->addr = INADDR_ANY;
assigned = dhcpv4_assign(iface, a, reqaddr);
- if (assigned)
- list_add(&a->head, &iface->dhcpv4_assignments);
}
if (assigned) {
if (a->leasetime)
my_leasetime = a->leasetime;
else
- my_leasetime = iface->dhcpv4_leasetime;
+ my_leasetime = iface->dhcp_leasetime;
if ((*leasetime == 0) || (my_leasetime < *leasetime))
*leasetime = my_leasetime;
a->flags &= ~OAF_BOUND;
*incl_fr_opt = accept_fr_nonce;
- if (!(a->flags & OAF_STATIC))
- a->valid_until = now;
+ a->valid_until = now;
} else {
- if (hostname_len > 0) {
+ if ((!(a->flags & OAF_STATIC) || !a->hostname) && hostname_len > 0) {
a->hostname = realloc(a->hostname, hostname_len + 1);
if (a->hostname) {
memcpy(a->hostname, hostname, hostname_len);
a->hostname[hostname_len] = 0;
+
+ if (odhcpd_valid_hostname(a->hostname))
+ a->flags &= ~OAF_BROKEN_HOSTNAME;
+ else
+ a->flags |= OAF_BROKEN_HOSTNAME;
+ }
+ }
+
+ if (reqopts_len > 0) {
+ a->reqopts = realloc(a->reqopts, reqopts_len + 1);
+ if (a->reqopts) {
+ memcpy(a->reqopts, reqopts, reqopts_len);
+ a->reqopts[reqopts_len] = 0;
}
}
} else
*incl_fr_opt = false;
- if (!(a->flags & OAF_STATIC))
- a->valid_until = ((*leasetime == UINT32_MAX) ? 0 : (time_t)(now + *leasetime));
+ a->valid_until = ((*leasetime == UINT32_MAX) ? 0 : (time_t)(now + *leasetime));
}
} else if (!assigned && a) {
/* Cleanup failed assignment */
- free_dhcpv4_assignment(a);
+ free_assignment(a);
a = NULL;
}
- if (assigned && a)
- lease = a;
} else if (msg == DHCPV4_MSG_RELEASE && a) {
a->flags &= ~OAF_BOUND;
-
- if (!(a->flags & OAF_STATIC))
- a->valid_until = now - 1;
+ a->valid_until = now - 1;
} else if (msg == DHCPV4_MSG_DECLINE && a) {
a->flags &= ~OAF_BOUND;
- if (!(a->flags & OAF_STATIC)) {
+ if (!(a->flags & OAF_STATIC) || a->lease->ipaddr != a->addr) {
memset(a->hwaddr, 0, sizeof(a->hwaddr));
a->valid_until = now + 3600; /* Block address for 1h */
- }
+ } else
+ a->valid_until = now - 1;
}
- dhcpv6_write_statefile();
+ dhcpv6_ia_write_statefile();
- return lease;
+ return a;
}