/**
* Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2016 Hans Dedecker <dedeckeh@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License v2 as published by
#include "dhcpv4.h"
#include "dhcpv6.h"
-
+static void free_dhcpv4_assignment(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,
- const char *hostname);
+ uint32_t *leasetime, const char *hostname, const size_t hostname_len);
// Create socket and register events
int init_dhcpv4(void)
return 0;
}
-char *dhcpv4_msg_to_string(uint8_t reqmsg)
-{
- switch (reqmsg) {
- case (DHCPV4_MSG_DISCOVER):
- return "DHCPV4_MSG_DISCOVER";
- case (DHCPV4_MSG_OFFER):
- return "DHCPV4_MSG_OFFER";
- case (DHCPV4_MSG_REQUEST):
- return "DHCPV4_MSG_REQUEST";
- case (DHCPV4_MSG_DECLINE):
- return "DHCPV4_MSG_DECLINE";
- case (DHCPV4_MSG_ACK):
- return "DHCPV4_MSG_ACK";
- case (DHCPV4_MSG_NAK):
- return "DHCPV4_MSG_NAK";
- case (DHCPV4_MSG_RELEASE):
- return "DHCPV4_MSG_RELEASE";
- case (DHCPV4_MSG_INFORM):
- return "DHCPV4_MSG_INFORM";
- default:
- return "UNKNOWN";
- }
-}
-
int setup_dhcpv4_interface(struct interface *iface, bool enable)
{
if (iface->dhcpv4_event.uloop.fd > 0) {
return -1;
}
- const char* saddr = ubus_get_address4(iface->name);
- struct in_addr addr;
- inet_pton(AF_INET,saddr, &addr);
- int bits = ubus_get_mask4(iface->name);
- struct in_addr mask;
- if (bits < -32 || bits > 32)
- bits = 0;
-
- mask.s_addr = bits ? htonl(~((1 << (32 - abs(bits))) - 1)) : 0;
- if (bits < 0)
- mask.s_addr = ~mask.s_addr;
-
-
// Create a range if not specified
+ struct ifreq ifreq;
+ strncpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_name));
+
+ struct sockaddr_in *saddr = (struct sockaddr_in*)&ifreq.ifr_addr;
+ struct sockaddr_in *smask = (struct sockaddr_in*)&ifreq.ifr_netmask;
if (!(iface->dhcpv4_start.s_addr & htonl(0xffff0000)) &&
- !(iface->dhcpv4_end.s_addr & htonl(0xffff0000))) {
+ !(iface->dhcpv4_end.s_addr & htonl(0xffff0000)) &&
+ !ioctl(sock, SIOCGIFADDR, &ifreq)) {
+ struct in_addr addr = saddr->sin_addr;
+ ioctl(sock, SIOCGIFNETMASK, &ifreq);
+ struct in_addr mask = smask->sin_addr;
uint32_t start = ntohl(iface->dhcpv4_start.s_addr);
uint32_t end = ntohl(iface->dhcpv4_end.s_addr);
struct lease *lease;
list_for_each_entry(lease, &leases, head) {
// Construct entry
- size_t hostlen = strlen(lease->hostname) + 1;
- struct dhcpv4_assignment *a = calloc(1, sizeof(*a) + hostlen);
+ struct dhcpv4_assignment *a = calloc(1, sizeof(*a));
if (!a) {
syslog(LOG_ERR, "Calloc failed for static lease on interface %s",
iface->ifname);
return -1;
}
+ if (lease->dhcpv4_leasetime >= 60)
+ a->leasetime = lease->dhcpv4_leasetime;
+
a->addr = ntohl(lease->ipaddr.s_addr);
memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
- memcpy(a->hostname, lease->hostname, hostlen);
- a->valid_until = LONG_MAX;
+ /* Static assignment */
+ a->flags |= OAF_STATIC;
+ /* Infinite valid */
+ a->valid_until = 0;
// Assign to all interfaces
struct dhcpv4_assignment *c;
list_add(&a->head, &iface->dhcpv4_assignments);
}
- if (!a->head.next)
- free(a);
+ if (a->head.next) {
+ if (lease->hostname[0]) {
+ free(a->hostname);
+ a->hostname = strdup(lease->hostname);
+ }
+ } else
+ free_dhcpv4_assignment(a);
}
// Clean invalid assignments
struct dhcpv4_assignment *a, *n;
list_for_each_entry_safe(a, n, &iface->dhcpv4_assignments, head) {
- if ((htonl(a->addr) & mask.s_addr) !=
- (iface->dhcpv4_start.s_addr & mask.s_addr)) {
- list_del(&a->head);
- free(a);
- }
+ if ((htonl(a->addr) & smask->sin_addr.s_addr) !=
+ (iface->dhcpv4_start.s_addr & smask->sin_addr.s_addr))
+ free_dhcpv4_assignment(a);
}
iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
odhcpd_register(&iface->dhcpv4_event);
} else if (iface->dhcpv4_assignments.next) {
- while (!list_empty(&iface->dhcpv4_assignments)) {
- struct dhcpv4_assignment *a = list_first_entry(&iface->dhcpv4_assignments,
- struct dhcpv4_assignment, head);
- list_del(&a->head);
- free(a);
- }
-
+ while (!list_empty(&iface->dhcpv4_assignments))
+ free_dhcpv4_assignment(list_first_entry(&iface->dhcpv4_assignments,
+ struct dhcpv4_assignment, head));
}
return 0;
}
+static char *dhcpv4_msg_to_string(uint8_t reqmsg)
+{
+ switch (reqmsg) {
+ case (DHCPV4_MSG_DISCOVER):
+ return "DHCPV4_MSG_DISCOVER";
+ case (DHCPV4_MSG_OFFER):
+ return "DHCPV4_MSG_OFFER";
+ case (DHCPV4_MSG_REQUEST):
+ return "DHCPV4_MSG_REQUEST";
+ case (DHCPV4_MSG_DECLINE):
+ return "DHCPV4_MSG_DECLINE";
+ case (DHCPV4_MSG_ACK):
+ return "DHCPV4_MSG_ACK";
+ case (DHCPV4_MSG_NAK):
+ return "DHCPV4_MSG_NAK";
+ case (DHCPV4_MSG_RELEASE):
+ return "DHCPV4_MSG_RELEASE";
+ case (DHCPV4_MSG_INFORM):
+ return "DHCPV4_MSG_INFORM";
+ default:
+ return "UNKNOWN";
+ }
+}
+
+static void free_dhcpv4_assignment(struct dhcpv4_assignment *a)
+{
+ if (a->head.next)
+ list_del(&a->head);
+
+ 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)
*cookie = c + len;
}
-
-// Simple DHCPv6-server for information requests
+// Handler for DHCPv4 messages
static void handle_dhcpv4(void *addr, void *data, size_t len,
struct interface *iface, _unused void *dest_addr)
{
uint8_t msg = DHCPV4_MSG_ACK;
struct in_addr reqaddr = {INADDR_ANY};
+ uint32_t leasetime = 0;
+ size_t hostname_len = 0;
char hostname[256];
- hostname[0] = 0;
uint8_t *start = &req->options[4];
uint8_t *end = ((uint8_t*)data) + len;
if (opt->type == DHCPV4_OPT_MESSAGE && opt->len == 1) {
reqmsg = opt->data[0];
} else if (opt->type == DHCPV4_OPT_HOSTNAME && opt->len > 0) {
- memcpy(hostname, opt->data, opt->len);
- hostname[opt->len] = 0;
+ hostname_len = opt->len;
+ memcpy(hostname, opt->data, hostname_len);
+ hostname[hostname_len] = 0;
} else if (opt->type == DHCPV4_OPT_IPADDRESS && opt->len == 4) {
memcpy(&reqaddr, opt->data, 4);
} else if (opt->type == DHCPV4_OPT_SERVERID && opt->len == 4) {
if (*c == elen && !memcmp(&c[1], iface->filter_class, elen))
return; // Ignore from homenet
}
- }
+ } else if (opt->type == DHCPV4_OPT_LEASETIME && opt->len == 4)
+ memcpy(&leasetime, opt->data, 4);
}
if (reqmsg != DHCPV4_MSG_DISCOVER && reqmsg != DHCPV4_MSG_REQUEST &&
struct dhcpv4_assignment *lease = NULL;
if (reqmsg != DHCPV4_MSG_INFORM)
- lease = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr, hostname);
+ lease = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr,
+ &leasetime, hostname, hostname_len);
if (!lease) {
if (reqmsg == DHCPV4_MSG_REQUEST)
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, &ifaddr.sin_addr);
if (lease) {
+ uint32_t val;
+
reply.yiaddr.s_addr = htonl(lease->addr);
- uint32_t val = htonl(iface->dhcpv4_leasetime);
+ val = htonl(leasetime);
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_LEASETIME, 4, &val);
- val = htonl(500 * iface->dhcpv4_leasetime / 1000);
- dhcpv4_put(&reply, &cookie, DHCPV4_OPT_RENEW, 4, &val);
+ if (leasetime != UINT32_MAX) {
+ val = htonl(500 * leasetime / 1000);
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_RENEW, 4, &val);
- val = htonl(875 * iface->dhcpv4_leasetime / 1000);
- dhcpv4_put(&reply, &cookie, DHCPV4_OPT_REBIND, 4, &val);
+ val = htonl(875 * leasetime / 1000);
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_REBIND, 4, &val);
+ }
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NETMASK, 4, &ifnetmask.sin_addr);
- if (lease->hostname[0])
+ if (lease->hostname)
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_HOSTNAME,
strlen(lease->hostname), lease->hostname);
static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
- const char *hostname)
+ uint32_t *leasetime, const char *hostname, const size_t hostname_len)
{
struct dhcpv4_assignment *lease = NULL;
uint32_t raddr = ntohl(reqaddr.s_addr);
a = c;
if (c->addr == raddr)
break;
- } else if (c->valid_until < now) {
- list_del(&c->head);
- free(c);
- }
+ } else if (!INFINITE_VALID(c->valid_until) && c->valid_until < now)
+ free_dhcpv4_assignment(c);
}
if (msg == DHCPV4_MSG_DISCOVER || msg == DHCPV4_MSG_REQUEST) {
bool assigned = !!a;
- size_t hostlen = strlen(hostname) + 1;
+ uint32_t my_leasetime;
if (!a && !iface->no_dynamic_dhcp) { // Create new binding
- a = calloc(1, sizeof(*a) + hostlen);
+ a = calloc(1, sizeof(*a));
if (!a) {
syslog(LOG_ERR, "Failed to calloc binding on interface %s", iface->ifname);
return NULL;
}
memcpy(a->hwaddr, mac, sizeof(a->hwaddr));
- memcpy(a->hostname, hostname, hostlen);
+ // Don't consider new assignment as infinite
+ a->valid_until = now;
assigned = dhcpv4_assign(iface, a, raddr);
}
- if (assigned && !a->hostname[0] && hostname) {
- a = realloc(a, sizeof(*a) + hostlen);
- if (!a) {
- syslog(LOG_ERR, "Failed to realloc binding on interface %s", iface->ifname);
- return NULL;
- }
- memcpy(a->hostname, hostname, hostlen);
-
- // Fixup list
- a->head.next->prev = &a->head;
- a->head.prev->next = &a->head;
+ if (a->leasetime >= 60) {
+ my_leasetime = a->leasetime;
+ } else {
+ my_leasetime = iface->dhcpv4_leasetime;
}
- // Was only a solicitation: mark binding for removal
- if (assigned && a->valid_until < now) {
- a->valid_until = (msg == DHCPV4_MSG_DISCOVER) ? 0 :
- (now + iface->dhcpv4_leasetime);
+ if ((*leasetime == 0) || (my_leasetime < *leasetime))
+ *leasetime = my_leasetime;
+
+ if (assigned) {
+ if (msg == DHCPV4_MSG_DISCOVER) {
+ a->flags &= ~OAF_BOUND;
+
+ if (!(a->flags & OAF_STATIC))
+ a->valid_until = now;
+ } else {
+ if (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;
+ }
+ }
+
+ a->flags |= OAF_BOUND;
+
+ if (!(a->flags & OAF_STATIC))
+ a->valid_until = ((*leasetime == UINT32_MAX) ? 0 : (time_t)(now + *leasetime));
+ }
} else if (!assigned && a) { // Cleanup failed assignment
- free(a);
+ free_dhcpv4_assignment(a);
a = NULL;
}
if (assigned && a)
lease = a;
- } else if (msg == DHCPV4_MSG_RELEASE) {
- if (a && a->valid_until != LONG_MAX)
- a->valid_until = 0;
- } else if (msg == DHCPV4_MSG_DECLINE && a && a->valid_until != LONG_MAX) {
- memset(a->hwaddr, 0, sizeof(a->hwaddr));
- a->valid_until = now + 3600; // Block address for 1h
+ } else if (msg == DHCPV4_MSG_RELEASE && a) {
+ a->flags &= ~OAF_BOUND;
+
+ if (!(a->flags & OAF_STATIC))
+ a->valid_until = now - 1;
+
+ } else if (msg == DHCPV4_MSG_DECLINE && a) {
+ a->flags &= ~OAF_BOUND;
+
+ if (!(a->flags & OAF_STATIC)) {
+ memset(a->hwaddr, 0, sizeof(a->hwaddr));
+ a->valid_until = now + 3600; // Block address for 1h
+ }
}
dhcpv6_write_statefile();
projects / project / odhcpd.git / blobdiff