#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)
+
static void dhcpv4_netevent_cb(unsigned long event, struct netevent_handler_info *info);
static int setup_dhcpv4_addresses(struct interface *iface);
static bool addr_is_fr_ip(struct interface *iface, struct in_addr *addr);
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 ret = 0;
- if (iface->dhcpv4_event.uloop.fd > 0) {
+ 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;
{INADDR_ANY}, {0}};
int val = 1;
- if (!iface->dhcpv4_assignments.next)
- INIT_LIST_HEAD(&iface->dhcpv4_assignments);
-
- if (!iface->dhcpv4_fr_ips.next)
- INIT_LIST_HEAD(&iface->dhcpv4_fr_ips);
-
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");
iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
odhcpd_register(&iface->dhcpv4_event);
- } else if (iface->dhcpv4_assignments.next) {
+ } else {
while (!list_empty(&iface->dhcpv4_assignments))
free_assignment(list_first_entry(&iface->dhcpv4_assignments,
struct dhcp_assignment, head));
}
out:
- if (ret < 0 && iface->dhcpv4_event.uloop.fd > 0) {
+ if (ret < 0 && iface->dhcpv4_event.uloop.fd >= 0) {
close(iface->dhcpv4_event.uloop.fd);
iface->dhcpv4_event.uloop.fd = -1;
}
}
if (!iface->addr4_len) {
- syslog(LOG_WARNING, "No network(s) available on %s", iface->name);
+ syslog(LOG_ERR, "No network(s) available on %s", iface->name);
return -1;
}
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);
+ syslog(LOG_ERR, "Auto allocation of DHCP range fails on %s", iface->name);
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;
time_t now = odhcpd_time();
avl_for_each_element(&interfaces, iface, avl) {
- if (iface->dhcpv4 != MODE_SERVER || iface->dhcpv4_assignments.next == NULL)
+ struct dhcp_assignment *a, *n;
+
+ if (iface->dhcpv4 != MODE_SERVER)
continue;
- struct dhcp_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_assignment(a);
{
uint8_t *c = *cookie;
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 + 2 + len > end)
+ 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 dhcp_assignment *a)
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
dest.sin_addr.s_addr = a->addr;
- if (sendto(iface->dhcpv4_event.uloop.fd, &fr_msg, sizeof(fr_msg),
+ 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_WARNING, "Sent %s to %s - %s", dhcpv4_msg_to_string(msg),
+ syslog(LOG_NOTICE, "Sent %s to %s - %s", dhcpv4_msg_to_string(msg),
odhcpd_print_mac(a->hwaddr, sizeof(a->hwaddr)), inet_ntoa(dest.sin_addr));
}
syslog(LOG_NOTICE, "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);
+ syslog(LOG_ERR, "No DHCP range available on %s", iface->name);
return;
}
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_INFORM)
a = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr,
&leasetime, hostname, hostname_len,
- accept_fr_nonce, &incl_fr_opt, &fr_serverid);
+ accept_fr_nonce, &incl_fr_opt, &fr_serverid,
+ reqopts, reqopts_len);
if (!a) {
if (reqmsg == DHCPV4_MSG_REQUEST)
req->ciaddr.s_addr = INADDR_ANY;
}
- syslog(LOG_WARNING, "Received %s from %s on %s", dhcpv4_msg_to_string(reqmsg),
+ syslog(LOG_NOTICE, "Received %s from %s on %s", dhcpv4_msg_to_string(reqmsg),
odhcpd_print_mac(req->chaddr, req->hlen), iface->name);
#ifdef WITH_UBUS
syslog(LOG_ERR, "ioctl(SIOCSARP): %m");
}
- if (sendto(sock, &reply, sizeof(reply), MSG_DONTWAIT,
+ if (sendto(sock, &reply, PACKET_SIZE(&reply, 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),
"ff:ff:ff:ff:ff:ff": odhcpd_print_mac(req->chaddr, req->hlen),
inet_ntoa(dest.sin_addr));
else
- syslog(LOG_ERR, "Sent %s to %s - %s",
+ syslog(LOG_NOTICE, "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),
#endif
}
+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)
{
- struct dhcp_assignment *c;
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) {
- if (list_empty(&iface->dhcpv4_assignments)) {
- list_add(&a->head, &iface->dhcpv4_assignments);
- return true;
- }
+ assigned = dhcpv4_insert_assignment(&iface->dhcpv4_assignments,
+ a, a->addr);
- list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
- if (ntohl(c->addr) > ntohl(a->addr)) {
- list_add_tail(&a->head, &c->head);
- return true;
- } else if (ntohl(a->addr) == ntohl(c->addr))
- return false;
- }
+ if (assigned)
+ syslog(LOG_INFO, "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 &&
!config_find_lease_by_ipaddr(raddr)) {
- if (list_empty(&iface->dhcpv4_assignments)) {
- list_add(&a->head, &iface->dhcpv4_assignments);
- goto raddr_out;
- }
+ assigned = dhcpv4_insert_assignment(&iface->dhcpv4_assignments,
+ a, raddr);
- list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
- if (ntohl(raddr) == ntohl(c->addr))
- break;
-
- if (ntohl(c->addr) > ntohl(raddr) || list_is_last(&c->head, &iface->dhcpv4_assignments)) {
- list_add_tail(&a->head,
- ntohl(c->addr) > ntohl(raddr) ? &c->head : &iface->dhcpv4_assignments);
-raddr_out:
- a->addr = raddr;
-
- syslog(LOG_INFO, "Assigning the IP the client asked for: %u.%u.%u.%u",
- ((uint8_t *)&a->addr)[0], ((uint8_t *)&a->addr)[1],
- ((uint8_t *)&a->addr)[2], ((uint8_t *)&a->addr)[3]);
+ if (assigned) {
+ syslog(LOG_INFO, "Assigning the IP the client asked for: %s",
+ ip4toa(a->addr));
- return true;
- }
+ return true;
}
}
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 (config_find_lease_by_ipaddr(htonl(try)))
+ if (config_find_lease_by_ipaddr(n_try))
continue;
- if (list_empty(&iface->dhcpv4_assignments)) {
- list_add(&a->head, &iface->dhcpv4_assignments);
- a->addr = htonl(try);
+ assigned = dhcpv4_insert_assignment(&iface->dhcpv4_assignments,
+ a, n_try);
- syslog(LOG_INFO, "Assigning mapped IP (empty list): %u.%u.%u.%u",
- ((uint8_t *)&a->addr)[0], ((uint8_t *)&a->addr)[1],
- ((uint8_t *)&a->addr)[2], ((uint8_t *)&a->addr)[3]);
+ if (assigned) {
+ syslog(LOG_INFO, "Assigning mapped IP: %s (try %u of %u)",
+ ip4toa(a->addr), i + 1, count);
return true;
}
-
- list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
- if (try == ntohl(c->addr))
- break;
-
- if (ntohl(c->addr) > try || list_is_last(&c->head, &iface->dhcpv4_assignments)) {
- list_add_tail(&a->head,
- ntohl(c->addr) > try ? &c->head : &iface->dhcpv4_assignments);
- a->addr = htonl(try);
-
- syslog(LOG_DEBUG, "Assigning mapped IP: %u.%u.%u.%u (try %u of %u)",
- ((uint8_t *)&a->addr)[0], ((uint8_t *)&a->addr)[1],
- ((uint8_t *)&a->addr)[2], ((uint8_t *)&a->addr)[3],
- i, count);
-
- return true;
- }
- }
}
syslog(LOG_WARNING, "Can't assign any IP address -> address space is full");
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)
+ uint32_t *fr_serverid, const char* reqopts, const size_t reqopts_len)
{
struct dhcp_assignment *a = find_assignment_by_hwaddr(iface, mac);
struct lease *l = config_find_lease_by_mac(mac);
}
}
+ 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;
+ }
+ }
+
if (!(a->flags & OAF_BOUND)) {
a->accept_fr_nonce = accept_fr_nonce;
*incl_fr_opt = accept_fr_nonce;
projects / project / odhcpd.git / blobdiff