#include <stddef.h>
#include <stdlib.h>
#include <resolv.h>
+#include <limits.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <netinet/ip.h>
static void handle_dhcpv4(void *addr, void *data, size_t len,
- struct interface *iface);
+ 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);
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)
{
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;
// Assign to all interfaces
struct dhcpv4_assignment *c;
list_for_each_entry(c, &iface->dhcpv4_assignments, head) {
if (c->addr > a->addr) {
list_add_tail(&a->head, &c->head);
+ break;
} else if (c->addr == a->addr) {
// Already an assignment with that number
break;
}
}
+ if (&c->head == &iface->dhcpv4_assignments) {
+ list_add(&a->head, &iface->dhcpv4_assignments);
+ }
if (!a->head.next)
free(a);
struct dhcpv4_assignment *a, *n;
list_for_each_entry_safe(a, n, &iface->dhcpv4_assignments, head) {
if ((htonl(a->addr) & smask->sin_addr.s_addr) !=
- (saddr->sin_addr.s_addr & smask->sin_addr.s_addr)) {
+ (iface->dhcpv4_start.s_addr & smask->sin_addr.s_addr)) {
list_del(&a->head);
free(a);
}
// Simple DHCPv6-server for information requests
static void handle_dhcpv4(void *addr, void *data, size_t len,
- struct interface *iface)
+ struct interface *iface, _unused void *dest_addr)
{
if (!iface->dhcpv4)
return;
return;
} else if (reqmsg == DHCPV4_MSG_DISCOVER) {
msg = DHCPV4_MSG_OFFER;
+ } else if (reqmsg == DHCPV4_MSG_REQUEST && reqaddr.s_addr &&
+ reqaddr.s_addr != htonl(lease->addr)) {
+ msg = DHCPV4_MSG_NAK;
+ /*
+ * DHCP client requested an IP which we can't offer to him. Probably the
+ * client changed the network. The reply type is set to DHCPV4_MSG_NAK,
+ * because the client should not use that IP.
+ *
+ * For modern devices we build an answer that includes a valid IP, like
+ * a DHCPV4_MSG_ACK. The client will use that IP and doesn't need to
+ * perform additional DHCP round trips.
+ *
+ */
}
+ syslog(LOG_WARNING, "received %s from %x:%x:%x:%x:%x:%x",
+ dhcpv4_msg_to_string(reqmsg),
+ req->chaddr[0],req->chaddr[1],req->chaddr[2],
+ req->chaddr[3],req->chaddr[4],req->chaddr[5]);
+
if (reqmsg == DHCPV4_MSG_DECLINE || reqmsg == DHCPV4_MSG_RELEASE)
return;
len, search_buf);
}
- dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
-
+ if (iface->dhcpv4_router_cnt == 0)
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &ifaddr.sin_addr);
+ else
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER,
+ 4 * iface->dhcpv4_router_cnt, iface->dhcpv4_router);
if (iface->dhcpv4_dns_cnt == 0)
dest.sin_addr = req->ciaddr;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else if ((ntohs(req->flags) & DHCPV4_FLAG_BROADCAST) ||
- req->hlen != reply.hlen) {
+ req->hlen != reply.hlen || !reply.yiaddr.s_addr) {
dest.sin_addr.s_addr = INADDR_BROADCAST;
dest.sin_port = htons(DHCPV4_CLIENT_PORT);
} else {
ioctl(sock, SIOCSARP, &arp);
}
+ syslog(LOG_WARNING, "sending %s to %x:%x:%x:%x:%x:%x",
+ dhcpv4_msg_to_string(msg),
+ req->chaddr[0],req->chaddr[1],req->chaddr[2],
+ req->chaddr[3],req->chaddr[4],req->chaddr[5]);
+
sendto(sock, &reply, sizeof(reply), MSG_DONTWAIT,
(struct sockaddr*)&dest, sizeof(dest));
}
struct dhcpv4_assignment *c, *n, *a = NULL;
list_for_each_entry_safe(c, n, &iface->dhcpv4_assignments, head) {
- if (c->addr == raddr && !memcmp(c->hwaddr, mac, 6)) {
+ if (!memcmp(c->hwaddr, mac, 6)) {
a = c;
- break;
+ if (c->addr == raddr)
+ break;
} else if (c->valid_until < now) {
list_del(&c->head);
free(c);
}
}
- bool update_state = false;
if (msg == DHCPV4_MSG_DISCOVER || msg == DHCPV4_MSG_REQUEST) {
bool assigned = !!a;
size_t hostlen = strlen(hostname) + 1;
} else if (!assigned && a) { // Cleanup failed assignment
free(a);
a = NULL;
- } else {
- update_state = true;
}
if (assigned && a)
} else if (msg == DHCPV4_MSG_RELEASE) {
if (a) {
a->valid_until = 0;
- update_state = true;
}
} else if (msg == DHCPV4_MSG_DECLINE) {
memset(a->hwaddr, 0, sizeof(a->hwaddr));
a->valid_until = now + 3600; // Block address for 1h
- update_state = true;
}
- if (update_state)
- dhcpv6_write_statefile();
+ dhcpv6_write_statefile();
return lease;
}
projects / project / odhcpd.git / blobdiff