From 028ab85da8ef40af43aeb48129ffa32c98503336 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Thu, 6 Jul 2017 09:41:10 +0200 Subject: dhcpv4: force renew nonce authentication support Support force renew nonce authentication support in the DHCPv4 server as described in RFC3203 and RFC6704. The interface uci arameter dhcpv4_forcereconf allows to supports DHCPv4 clients which support force renew without authentication. While at it align network byte order logic for simplicity. Signed-off-by: Hans Dedecker --- src/config.c | 5 + src/dhcpv4.c | 654 +++++++++++++++++++++++++++++++++++++++++++------------- src/dhcpv4.h | 25 ++- src/dhcpv6-ia.c | 4 +- src/ndp.c | 3 + src/odhcpd.c | 130 ++++++++++- src/odhcpd.h | 35 ++- src/ubus.c | 3 +- 8 files changed, 699 insertions(+), 160 deletions(-) (limited to 'src') diff --git a/src/config.c b/src/config.c index e79f9ce..2c35aab 100644 --- a/src/config.c +++ b/src/config.c @@ -42,6 +42,7 @@ enum { IFACE_ATTR_DNS, IFACE_ATTR_DOMAIN, IFACE_ATTR_FILTER_CLASS, + IFACE_ATTR_DHCPV4_FORCERECONF, IFACE_ATTR_DHCPV6_RAW, IFACE_ATTR_DHCPV6_ASSIGNALL, IFACE_ATTR_RA_DEFAULT, @@ -83,6 +84,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_DOMAIN] = { .name = "domain", .type = BLOBMSG_TYPE_ARRAY }, [IFACE_ATTR_FILTER_CLASS] = { .name = "filter_class", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_DHCPV4_FORCERECONF] = { .name = "dhcpv4_forcereconf", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_DHCPV6_RAW] = { .name = "dhcpv6_raw", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DHCPV6_ASSIGNALL] = { .name ="dhcpv6_assignall", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_PD_MANAGER] = { .name = "pd_manager", .type = BLOBMSG_TYPE_STRING }, @@ -621,6 +623,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr memcpy(iface->filter_class, blobmsg_get_string(c), blobmsg_data_len(c) + 1); } + if ((c = tb[IFACE_ATTR_DHCPV4_FORCERECONF])) + iface->dhcpv4_forcereconf = blobmsg_get_bool(c); + if ((c = tb[IFACE_ATTR_DHCPV6_RAW])) { iface->dhcpv6_raw_len = blobmsg_data_len(c) / 2; iface->dhcpv6_raw = realloc(iface->dhcpv6_raw, iface->dhcpv6_raw_len); diff --git a/src/dhcpv4.c b/src/dhcpv4.c index b0a4603..12e6336 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -29,16 +29,30 @@ #include #include +#include + #include "odhcpd.h" #include "dhcpv4.h" #include "dhcpv6.h" +static int setup_dhcpv4_addresses(struct interface *iface); +static void update_static_assignments(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, - uint32_t *leasetime, const char *hostname, const size_t hostname_len); + 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 uint32_t serial = 0; + +struct odhcpd_ref_ip { + struct list_head head; + int ref_cnt; + struct odhcpd_ipaddr addr; +}; /* Create socket and register events */ int init_dhcpv4(void) @@ -58,6 +72,9 @@ int setup_dhcpv4_interface(struct interface *iface, bool 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); + int sock = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, IPPROTO_UDP); if (sock < 0) { syslog(LOG_ERR, "Failed to create DHCPv4 server socket: %s", @@ -89,112 +106,265 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) return -1; } + iface->dhcpv4_event.uloop.fd = sock; + iface->dhcpv4_event.handle_dgram = handle_dhcpv4; + odhcpd_register(&iface->dhcpv4_event); - if (ntohl(iface->dhcpv4_start.s_addr) > ntohl(iface->dhcpv4_end.s_addr)) { - syslog(LOG_ERR, "Invalid DHCP range"); + if (setup_dhcpv4_addresses(iface) < 0) return -1; + + update_static_assignments(iface); + } else if (iface->dhcpv4_assignments.next) { + while (!list_empty(&iface->dhcpv4_assignments)) + free_dhcpv4_assignment(list_first_entry(&iface->dhcpv4_assignments, + struct dhcpv4_assignment, head)); + } + return 0; +} + +static struct dhcpv4_assignment *find_assignment_by_hwaddr(struct interface *iface, const uint8_t *hwaddr) +{ + struct dhcpv4_assignment *a; + + list_for_each_entry(a, &iface->dhcpv4_assignments, head) + if (!memcmp(a->hwaddr, hwaddr, 6)) + return a; + + 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; + iface->dhcpv4_end_ip.s_addr = INADDR_ANY; + iface->dhcpv4_local.s_addr = INADDR_ANY; + iface->dhcpv4_bcast.s_addr = INADDR_ANY; + iface->dhcpv4_mask.s_addr = INADDR_ANY; + + /* Sanity checks */ + 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); + return -1; + } + + if (!iface->addr4_len) { + syslog(LOG_WARNING, "no network(s) available on %s", iface->name); + return -1; + } + + uint32_t start = ntohl(iface->dhcpv4_start.s_addr); + uint32_t end = ntohl(iface->dhcpv4_end.s_addr); + + for (size_t i = 0; i < iface->addr4_len && start && end; i++) { + struct in_addr *addr = &iface->addr4[i].addr.in; + struct in_addr mask; + + odhcpd_bitlen2netmask(false, iface->addr4[i].prefix, &mask); + if ((start & ntohl(~mask.s_addr)) == start && + (end & ntohl(~mask.s_addr)) == end) { + iface->dhcpv4_start_ip.s_addr = htonl(start) | + (addr->s_addr & mask.s_addr); + iface->dhcpv4_end_ip.s_addr = htonl(end) | + (addr->s_addr & mask.s_addr); + iface->dhcpv4_local = *addr; + iface->dhcpv4_bcast = iface->addr4[i].broadcast; + iface->dhcpv4_mask = mask; + return 0; } + } - uint32_t mask = iface->addr4 && iface->addr4[0].prefix ? - htonl(~((1 << (32 - iface->addr4[0].prefix)) - 1)) : 0xffffffff; - - /* Create a range if not specified */ - if (!(iface->dhcpv4_start.s_addr & htonl(0xffff0000)) && - !(iface->dhcpv4_end.s_addr & htonl(0xffff0000)) && - iface->addr4_len) { - struct in_addr *addr = &iface->addr4[0].addr.in; - - uint32_t start = ntohl(iface->dhcpv4_start.s_addr); - uint32_t end = ntohl(iface->dhcpv4_end.s_addr); - - if (start && end && start < end && - start > ntohl(addr->s_addr & ~mask) && - (start & ntohl(~mask)) == start && - (end & ntohl(~mask)) == end) { - iface->dhcpv4_start.s_addr = htonl(start) | - (addr->s_addr & mask); - iface->dhcpv4_end.s_addr = htonl(end) | - (addr->s_addr & mask); - } else if (ntohl(mask) <= 0xfffffff0) { - start = addr->s_addr & mask; - end = addr->s_addr & mask; - - if (ntohl(mask) <= 0xffffff00) { - iface->dhcpv4_start.s_addr = start | htonl(100); - iface->dhcpv4_end.s_addr = end | htonl(250); - } else if (ntohl(mask) <= 0xffffffc0) { - iface->dhcpv4_start.s_addr = start | htonl(10); - iface->dhcpv4_end.s_addr = end | htonl(60); - } else if (ntohl(mask) <= 0xffffffe0) { - iface->dhcpv4_start.s_addr = start | htonl(10); - iface->dhcpv4_end.s_addr = end | htonl(30); - } else { - iface->dhcpv4_start.s_addr = start | htonl(3); - iface->dhcpv4_end.s_addr = end | htonl(12); - } - } + /* 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); + return -1; + } + + iface->dhcpv4_local = iface->addr4[0].addr.in; + iface->dhcpv4_bcast = iface->addr4[0].broadcast; + odhcpd_bitlen2netmask(false, iface->addr4[0].prefix, &iface->dhcpv4_mask); + end = start = iface->dhcpv4_local.s_addr & iface->dhcpv4_mask.s_addr; + + /* Auto allocate ranges */ + if (ntohl(iface->dhcpv4_mask.s_addr) <= 0xffffff00) { + 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_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_start_ip.s_addr = start | htonl(10); + iface->dhcpv4_end_ip.s_addr = end | htonl(30); + } else { + iface->dhcpv4_start_ip.s_addr = start | htonl(3); + iface->dhcpv4_end_ip.s_addr = end | htonl(12); + } + + 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; } - /* Parse static entries */ - struct lease *lease; - list_for_each_entry(lease, &leases, head) { + 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 */ - struct dhcpv4_assignment *a = calloc(1, sizeof(*a)); + a = calloc(1, sizeof(*a)); if (!a) { syslog(LOG_ERR, "Calloc failed for static lease on interface %s", iface->ifname); - return -1; + continue; } + memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr)); + } - a->leasetime = lease->dhcpv4_leasetime; + 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); + } - a->addr = ntohl(lease->ipaddr.s_addr); - memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr)); - /* Static assignment */ - a->flags |= OAF_STATIC; - /* Infinite valid */ - a->valid_until = 0; - - /* 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; + /* 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); + if (&c->head == &iface->dhcpv4_assignments) + list_add(&a->head, &iface->dhcpv4_assignments); + } +} - if (a->head.next) { - if (lease->hostname[0]) { - free(a->hostname); - a->hostname = strdup(lease->hostname); - } - } else - free_dhcpv4_assignment(a); - } +static void inc_ref_cnt_ip(struct odhcpd_ref_ip **ptr, struct odhcpd_ref_ip *ip) +{ + *ptr = ip; + ip->ref_cnt++; +} + +static void decr_ref_cnt_ip(struct odhcpd_ref_ip **ptr, struct interface *iface) +{ + struct odhcpd_ref_ip *ip = *ptr; + + if (--ip->ref_cnt == 0) { + odhcpd_setup_addr(&ip->addr, iface, false, false); + + list_del(&ip->head); + free(ip); + } + + *ptr = NULL; +} + +static bool leases_require_fr(struct interface *iface, struct odhcpd_ipaddr *addr, + uint32_t mask) +{ + struct dhcpv4_assignment *a = NULL; + struct odhcpd_ref_ip *fr_ip = NULL; + + list_for_each_entry(a, &iface->dhcpv4_assignments, head) { + if ((a->accept_fr_nonce || iface->dhcpv4_forcereconf) && + !a->fr_ip && + ((a->addr & mask) == (addr->addr.in.s_addr & mask))) { + if (!fr_ip) { + fr_ip = calloc(1, sizeof(*fr_ip)); + if (!fr_ip) + break; - // Clean invalid assignments - struct dhcpv4_assignment *a, *n; - list_for_each_entry_safe(a, n, &iface->dhcpv4_assignments, head) { - if ((htonl(a->addr) & mask) != - (iface->dhcpv4_start.s_addr & mask)) - free_dhcpv4_assignment(a); + list_add(&fr_ip->head, &iface->dhcpv4_fr_ips); + fr_ip->addr = *addr; + } + inc_ref_cnt_ip(&a->fr_ip, fr_ip); } + } - iface->dhcpv4_event.uloop.fd = sock; - iface->dhcpv4_event.handle_dgram = handle_dhcpv4; - odhcpd_register(&iface->dhcpv4_event); - } else if (iface->dhcpv4_assignments.next) { - while (!list_empty(&iface->dhcpv4_assignments)) - free_dhcpv4_assignment(list_first_entry(&iface->dhcpv4_assignments, - struct dhcpv4_assignment, head)); + return fr_ip ? true : false; +} + +void dhcpv4_addr_update(struct interface *iface) +{ + if (iface->dhcpv4 == MODE_DISABLED) + return; + + 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); + ip.addr.in = iface->dhcpv4_local; + ip.prefix = odhcpd_netmask2bitlen(false, &iface->dhcpv4_mask); + ip.broadcast = iface->dhcpv4_bcast; + + setup_dhcpv4_addresses(iface); + + if ((ip.addr.in.s_addr & mask) == + (iface->dhcpv4_local.s_addr & iface->dhcpv4_mask.s_addr)) + return; + + if (ip.addr.in.s_addr && !leases_require_fr(iface, &ip, mask)) + return; + + if (iface->dhcpv4_local.s_addr == INADDR_ANY || list_empty(&iface->dhcpv4_fr_ips)) + return; + + a = list_first_entry(&iface->dhcpv4_fr_ips, struct odhcpd_ref_ip, head); + + if (odhcpd_setup_addr(&a->addr, iface, false, true)) { + syslog(LOG_ERR, "Failed to add ip address"); + 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); + else + dhcpv4_fr_stop(c); + } } - return 0; } static char *dhcpv4_msg_to_string(uint8_t reqmsg) @@ -216,6 +386,8 @@ static char *dhcpv4_msg_to_string(uint8_t reqmsg) return "DHCPV4_MSG_RELEASE"; case (DHCPV4_MSG_INFORM): return "DHCPV4_MSG_INFORM"; + case (DHCPV4_MSG_FORCERENEW): + return "DHCPV4_MSG_FORCERENEW"; default: return "UNKNOWN"; } @@ -226,6 +398,9 @@ static void free_dhcpv4_assignment(struct dhcpv4_assignment *a) if (a->head.next) list_del(&a->head); + if (a->fr_ip) + dhcpv4_fr_stop(a); + free(a->hostname); free(a); } @@ -244,6 +419,123 @@ static void dhcpv4_put(struct dhcpv4_message *msg, uint8_t **cookie, *cookie = c + len; } +static void dhcpv4_fr_send(struct dhcpv4_assignment *a) +{ + struct dhcpv4_message fr_msg = { + .op = DHCPV4_BOOTREPLY, + .htype = 1, + .hlen = 6, + .hops = 0, + .secs = 0, + .flags = 0, + .ciaddr = {INADDR_ANY}, + .yiaddr = {INADDR_ANY}, + .siaddr = {INADDR_ANY}, + .giaddr = {INADDR_ANY}, + .chaddr = {0}, + .sname = {0}, + .file = {0}, + }; + struct dhcpv4_auth_forcerenew *auth_o, auth = { + .protocol = 3, + .algorithm = 1, + .rdm = 0, + .replay = {htonl(time(NULL)), htonl(++serial)}, + .type = 2, + .key = {0}, + }; + struct interface *iface = a->iface; + + odhcpd_urandom(&fr_msg.xid, sizeof(fr_msg.xid)); + memcpy(fr_msg.chaddr, a->hwaddr, fr_msg.hlen); + + fr_msg.options[0] = 0x63; + fr_msg.options[1] = 0x82; + fr_msg.options[2] = 0x53; + fr_msg.options[3] = 0x63; + + uint8_t *cookie = &fr_msg.options[4]; + uint8_t msg = DHCPV4_MSG_FORCERENEW; + + dhcpv4_put(&fr_msg, &cookie, DHCPV4_OPT_MESSAGE, 1, &msg); + if (a->accept_fr_nonce) { + dhcpv4_put(&fr_msg, &cookie, DHCPV4_OPT_AUTHENTICATION, sizeof(auth), &auth); + auth_o = (struct dhcpv4_auth_forcerenew *)(cookie - sizeof(auth)); + dhcpv4_put(&fr_msg, &cookie, DHCPV4_OPT_END, 0, NULL); + + md5_ctx_t md5; + uint8_t secretbytes[64]; + memset(secretbytes, 0, sizeof(secretbytes)); + memcpy(secretbytes, a->key, sizeof(a->key)); + + for (size_t i = 0; i < sizeof(secretbytes); ++i) + secretbytes[i] ^= 0x36; + + md5_begin(&md5); + md5_hash(secretbytes, sizeof(secretbytes), &md5); + md5_hash(&fr_msg, sizeof(fr_msg), &md5); + md5_end(auth_o->key, &md5); + + for (size_t i = 0; i < sizeof(secretbytes); ++i) { + secretbytes[i] ^= 0x36; + secretbytes[i] ^= 0x5c; + } + + md5_begin(&md5); + md5_hash(secretbytes, sizeof(secretbytes), &md5); + md5_hash(auth_o->key, sizeof(auth_o->key), &md5); + md5_end(auth_o->key, &md5); + } else { + dhcpv4_put(&fr_msg, &cookie, DHCPV4_OPT_SERVERID, 4, + &a->fr_ip->addr.addr.in.s_addr); + dhcpv4_put(&fr_msg, &cookie, DHCPV4_OPT_END, 0, NULL); + } + + struct sockaddr_in dest; + memset(&dest, 0, sizeof(dest)); + dest.sin_family = AF_INET; + 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)); +} + +static void dhcpv4_fr_timer(struct uloop_timeout *event) +{ + struct dhcpv4_assignment *a = container_of(event, struct dhcpv4_assignment, fr_timer); + + if (a->fr_cnt > 0 && a->fr_cnt < 8) { + dhcpv4_fr_send(a); + uloop_timeout_set(&a->fr_timer, 1000 << a->fr_cnt); + a->fr_cnt++; + } else + dhcpv4_fr_stop(a); +} + +static void dhcpv4_fr_start(struct dhcpv4_assignment *a) +{ + uloop_timeout_set(&a->fr_timer, 1000 << a->fr_cnt); + a->fr_timer.cb = dhcpv4_fr_timer; + a->fr_cnt++; + + dhcpv4_fr_send(a); +} + +static void dhcpv4_fr_stop(struct dhcpv4_assignment *a) +{ + uloop_timeout_cancel(&a->fr_timer); + decr_ref_cnt_ip(&a->fr_ip, a->iface); + a->fr_cnt = 0; + a->fr_timer.cb = NULL; +} + // Handler for DHCPv4 messages static void handle_dhcpv4(void *addr, void *data, size_t len, struct interface *iface, _unused void *dest_addr) @@ -259,34 +551,24 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, syslog(LOG_NOTICE, "Got DHCPv4 request"); - if (!iface->addr4_len) { - syslog(LOG_WARNING, "DHCPv4 no address found 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); return; } - struct in_addr *ifaddr = &iface->addr4[0].addr.in; - struct in_addr *ifbroadcast = &iface->addr4[0].broadcast; - uint32_t mask = iface->addr4[0].prefix ? htonl(~((1 << (32 - iface->addr4[0].prefix)) - 1)) : 0; - uint32_t network = iface->addr4[0].addr.in.s_addr & mask; int sock = iface->dhcpv4_event.uloop.fd; - if ((iface->dhcpv4_start.s_addr & mask) != network || - (iface->dhcpv4_end.s_addr & mask) != network) { - syslog(LOG_WARNING, "DHCPv4 range out of assigned network"); - return; - } - struct dhcpv4_message reply = { .op = DHCPV4_BOOTREPLY, - .htype = 1, - .hlen = 6, + .htype = req->htype, + .hlen = req->hlen, .hops = 0, .xid = req->xid, .secs = 0, .flags = req->flags, .ciaddr = {INADDR_ANY}, .giaddr = req->giaddr, - .siaddr = *ifaddr, + .siaddr = iface->dhcpv4_local, }; memcpy(reply.chaddr, req->chaddr, sizeof(reply.chaddr)); @@ -303,6 +585,8 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, uint32_t leasetime = 0; size_t hostname_len = 0; char hostname[256]; + bool accept_fr_nonce = false; + bool incl_fr_opt = false; uint8_t *start = &req->options[4]; uint8_t *end = ((uint8_t*)data) + len; @@ -317,7 +601,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, } 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 (memcmp(opt->data, ifaddr, 4)) + if (memcmp(opt->data, &iface->dhcpv4_local, 4)) return; } else if (iface->filter_class && opt->type == DHCPV4_OPT_USER_CLASS) { uint8_t *c = opt->data, *cend = &opt->data[opt->len]; @@ -328,6 +612,15 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, } } else if (opt->type == DHCPV4_OPT_LEASETIME && opt->len == 4) memcpy(&leasetime, opt->data, 4); + else if (opt->type == DHCPV4_OPT_FORCERENEW_NONCE_CAPABLE && opt->len > 0) { + for (uint8_t i = 0; i < opt->len; i++) { + if (opt->data[i] == 1) { + accept_fr_nonce = true; + break; + } + } + + } } if (reqmsg != DHCPV4_MSG_DISCOVER && reqmsg != DHCPV4_MSG_REQUEST && @@ -336,9 +629,13 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, return; struct dhcpv4_assignment *lease = 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); + &leasetime, hostname, hostname_len, + accept_fr_nonce, &incl_fr_opt, &fr_serverid); if (!lease) { if (reqmsg == DHCPV4_MSG_REQUEST) @@ -347,19 +644,35 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, 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)) { + else if (reqmsg == DHCPV4_MSG_REQUEST && + ((reqaddr.s_addr && reqaddr.s_addr != lease->addr) || + (req->ciaddr.s_addr && req->ciaddr.s_addr != 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. + * client changed the network or the network has been changed. 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. * */ + + /* + * + * Buggy clients do serverid checking in nack messages; therefore set the + * serverid in nack messages triggered by a previous force renew equal to + * the server id in use at that time by the server + * + */ + if (fr_serverid) + serverid = fr_serverid; + + if (req->ciaddr.s_addr && + ((iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr) != + (req->ciaddr.s_addr & iface->dhcpv4_mask.s_addr))) + req->ciaddr.s_addr = INADDR_ANY; } syslog(LOG_WARNING, "received %s from %02x:%02x:%02x:%02x:%02x:%02x", @@ -371,12 +684,12 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, return; dhcpv4_put(&reply, &cookie, DHCPV4_OPT_MESSAGE, 1, &msg); - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, ifaddr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, &serverid); if (lease) { uint32_t val; - reply.yiaddr.s_addr = htonl(lease->addr); + reply.yiaddr.s_addr = lease->addr; val = htonl(leasetime); dhcpv4_put(&reply, &cookie, DHCPV4_OPT_LEASETIME, 4, &val); @@ -389,14 +702,35 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, dhcpv4_put(&reply, &cookie, DHCPV4_OPT_REBIND, 4, &val); } - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NETMASK, 4, &mask); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NETMASK, 4, + &iface->dhcpv4_mask.s_addr); if (lease->hostname) dhcpv4_put(&reply, &cookie, DHCPV4_OPT_HOSTNAME, strlen(lease->hostname), lease->hostname); - if (ifbroadcast->s_addr != INADDR_ANY) - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_BROADCAST, 4, ifbroadcast); + if (iface->dhcpv4_bcast.s_addr != INADDR_ANY) + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_BROADCAST, 4, &iface->dhcpv4_bcast); + + if (incl_fr_opt) { + if (reqmsg == DHCPV4_MSG_REQUEST) { + struct dhcpv4_auth_forcerenew auth = { + .protocol = 3, + .algorithm = 1, + .rdm = 0, + .replay = {htonl(time(NULL)), htonl(++serial)}, + .type = 1, + .key = {0}, + }; + + memcpy(auth.key, lease->key, sizeof(auth.key)); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_AUTHENTICATION, sizeof(auth), &auth); + } else { + uint8_t one = 1; + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_FORCERENEW_NONCE_CAPABLE, + sizeof(one), &one); + } + } } struct ifreq ifr = {.ifr_name = ""}; @@ -420,14 +754,14 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, } if (iface->dhcpv4_router_cnt == 0) - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, ifaddr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, &iface->dhcpv4_local); else dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4 * iface->dhcpv4_router_cnt, iface->dhcpv4_router); if (iface->dhcpv4_dns_cnt == 0) - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, ifaddr); + 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); @@ -503,7 +837,6 @@ static bool dhcpv4_test(struct interface *iface, uint32_t try) list_for_each_entry(c, &iface->dhcpv4_assignments, head) { if (c->addr == try) return false; - } return true; @@ -512,18 +845,18 @@ static bool dhcpv4_test(struct interface *iface, uint32_t try) static bool dhcpv4_assign(struct interface *iface, struct dhcpv4_assignment *assign, uint32_t raddr) { - uint32_t start = ntohl(iface->dhcpv4_start.s_addr); - uint32_t end = ntohl(iface->dhcpv4_end.s_addr); + 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; // try to assign the IP the client asked for - if (start <= raddr && raddr <= end && dhcpv4_test(iface, raddr)) { + if (start <= ntohl(raddr) && ntohl(raddr) <= end && dhcpv4_test(iface, raddr)) { assign->addr = raddr; syslog(LOG_INFO, "assigning the IP the client asked for: %u.%u.%u.%u", - (assign->addr & 0xff000000) >> 24, - (assign->addr & 0x00ff0000) >> 16, - (assign->addr & 0x0000ff00) >> 8, - (assign->addr & 0x000000ff)); + ((uint8_t *)&assign->addr)[0], + ((uint8_t *)&assign->addr)[1], + ((uint8_t *)&assign->addr)[2], + ((uint8_t *)&assign->addr)[3]); return true; } @@ -540,24 +873,25 @@ static bool dhcpv4_assign(struct interface *iface, uint32_t try = (((uint32_t)rand()) % count) + start; if (list_empty(&iface->dhcpv4_assignments)) { - assign->addr = try; + assign->addr = htonl(try); syslog(LOG_INFO, "assigning mapped IP (empty list): %u.%u.%u.%u", - (assign->addr & 0xff000000) >> 24, - (assign->addr & 0x00ff0000) >> 16, - (assign->addr & 0x0000ff00) >> 8, - (assign->addr & 0x000000ff)); + ((uint8_t *)&assign->addr)[0], + ((uint8_t *)&assign->addr)[1], + ((uint8_t *)&assign->addr)[2], + ((uint8_t *)&assign->addr)[3]); return true; } for (uint32_t i = 0; i < count; ++i) { - if (dhcpv4_test(iface, try)) { + if (dhcpv4_test(iface, htonl(try))) { /* test was successful: IP address is not assigned, assign it */ - assign->addr = try; + assign->addr = htonl(try); syslog(LOG_DEBUG, "assigning mapped IP: %u.%u.%u.%u (try %u of %u)", - (assign->addr & 0xff000000) >> 24, - (assign->addr & 0x00ff0000) >> 16, - (assign->addr & 0x0000ff00) >> 8, - (assign->addr & 0x000000ff), i, count); + ((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; @@ -570,37 +904,54 @@ static bool dhcpv4_assign(struct interface *iface, static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr, - uint32_t *leasetime, const char *hostname, const size_t hostname_len) + 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 *lease = NULL; - uint32_t raddr = ntohl(reqaddr.s_addr); 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 == raddr) + 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); + } + if (msg == DHCPV4_MSG_DISCOVER || msg == DHCPV4_MSG_REQUEST) { bool assigned = !!a; - if (!a && !iface->no_dynamic_dhcp) { - /* Create new binding */ - a = calloc(1, sizeof(*a)); - if (!a) { - syslog(LOG_ERR, "Failed to calloc binding on interface %s", iface->ifname); - return NULL; + if (!a) { + if (!iface->no_dynamic_dhcp) { + /* Create new binding */ + 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)); + /* Don't consider new assignment as infinite */ + a->valid_until = now; + + assigned = dhcpv4_assign(iface, a, reqaddr.s_addr); + if (assigned) { + a->iface = iface; + list_add(&a->head, &iface->dhcpv4_assignments); + } } - memcpy(a->hwaddr, mac, sizeof(a->hwaddr)); - /* Don't consider new assignment as infinite */ - a->valid_until = now; + } else if ((a->addr & iface->dhcpv4_mask.s_addr) != + (iface->dhcpv4_start_ip.s_addr & iface->dhcpv4_mask.s_addr)) { + list_del(&a->head); - assigned = dhcpv4_assign(iface, a, raddr); + assigned = dhcpv4_assign(iface, a, reqaddr.s_addr); if (assigned) list_add(&a->head, &iface->dhcpv4_assignments); } @@ -619,6 +970,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, if (msg == DHCPV4_MSG_DISCOVER) { a->flags &= ~OAF_BOUND; + *incl_fr_opt = accept_fr_nonce; if (!(a->flags & OAF_STATIC)) a->valid_until = now; } else { @@ -630,7 +982,13 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, } } - a->flags |= OAF_BOUND; + if (!(a->flags & OAF_BOUND)) { + a->accept_fr_nonce = accept_fr_nonce; + *incl_fr_opt = accept_fr_nonce; + odhcpd_urandom(a->key, sizeof(a->key)); + a->flags |= OAF_BOUND; + } else + *incl_fr_opt = false; if (!(a->flags & OAF_STATIC)) a->valid_until = ((*leasetime == UINT32_MAX) ? 0 : (time_t)(now + *leasetime)); diff --git a/src/dhcpv4.h b/src/dhcpv4.h index 4d14f09..f48c005 100644 --- a/src/dhcpv4.h +++ b/src/dhcpv4.h @@ -33,6 +33,7 @@ enum dhcpv4_msg { DHCPV4_MSG_NAK = 6, DHCPV4_MSG_RELEASE = 7, DHCPV4_MSG_INFORM = 8, + DHCPV4_MSG_FORCERENEW = 9, }; enum dhcpv4_opt { @@ -52,7 +53,9 @@ enum dhcpv4_opt { DHCPV4_OPT_HOSTNAME = 12, DHCPV4_OPT_REQUEST = 17, DHCPV4_OPT_USER_CLASS = 77, + DHCPV4_OPT_AUTHENTICATION = 90, DHCPV4_OPT_SEARCH_DOMAIN = 119, + DHCPV4_OPT_FORCERENEW_NONCE_CAPABLE = 145, DHCPV4_OPT_END = 255, }; @@ -74,13 +77,33 @@ struct dhcpv4_message { uint8_t options[312]; }; +struct dhcpv4_auth_forcerenew { + uint8_t protocol; + uint8_t algorithm; + uint8_t rdm; + uint32_t replay[2]; + uint8_t type; + uint8_t key[16]; +} _packed; + +struct odhcpd_ref_ip; + struct dhcpv4_assignment { struct list_head head; + struct interface *iface; + + struct uloop_timeout fr_timer; + struct odhcpd_ref_ip *fr_ip; + bool accept_fr_nonce; + int fr_cnt; + uint8_t key[16]; + + unsigned int flags; + uint32_t addr; time_t valid_until; uint8_t hwaddr[6]; uint32_t leasetime; - unsigned int flags; char *hostname; }; diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index bd4342b..dd549e6 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -397,9 +397,9 @@ void dhcpv6_write_statefile(void) (c->valid_until > now ? (c->valid_until - now + wall_time) : (INFINITE_VALID(c->valid_until) ? -1 : 0)), - c->addr); + ntohl(c->addr)); - struct in_addr addr = {htonl(c->addr)}; + struct in_addr addr = {.s_addr = c->addr}; inet_ntop(AF_INET, &addr, ipbuf, sizeof(ipbuf) - 1); if (c->hostname) { diff --git a/src/ndp.c b/src/ndp.c index ec990ed..8ecc79b 100644 --- a/src/ndp.c +++ b/src/ndp.c @@ -341,6 +341,9 @@ static void check_addr_updates(struct interface *iface) free(iface->addr4); iface->addr4 = addr; iface->addr4_len = len; + + if (change) + dhcpv4_addr_update(iface); } // Check v6 address update diff --git a/src/odhcpd.c b/src/odhcpd.c index 837004b..f59d5a8 100644 --- a/src/odhcpd.c +++ b/src/odhcpd.c @@ -317,8 +317,15 @@ static int cb_error_handler(_unused struct sockaddr_nl *nla, struct nlmsgerr *er static int prefix_cmp(const void *va, const void *vb) { const struct odhcpd_ipaddr *a = va, *b = vb; - return (ntohl(a->addr.in.s_addr) < ntohl(b->addr.in.s_addr)) ? 1 : - (ntohl(a->addr.in.s_addr) > ntohl(b->addr.in.s_addr)) ? -1 : 0; + int ret = 0; + + if (a->prefix == b->prefix) { + ret = (ntohl(a->addr.in.s_addr) < ntohl(b->addr.in.s_addr)) ? 1 : + (ntohl(a->addr.in.s_addr) > ntohl(b->addr.in.s_addr)) ? -1 : 0; + } else + ret = a->prefix < b->prefix ? 1 : -1; + + return ret; } // compare IPv6 prefixes @@ -528,6 +535,74 @@ int odhcpd_setup_proxy_neigh(const struct in6_addr *addr, return nl_wait_for_ack(rtnl_socket); } +int odhcpd_setup_addr(struct odhcpd_ipaddr *addr, + const struct interface *iface, const bool v6, + const bool add) +{ + struct nl_msg *msg; + struct ifaddrmsg ifa = { + .ifa_family = v6 ? AF_INET6 : AF_INET, + .ifa_prefixlen = addr->prefix, + .ifa_flags = 0, + .ifa_scope = 0, + .ifa_index = iface->ifindex, }; + int ret = 0, flags = NLM_F_REQUEST; + + if (add) + flags |= NLM_F_REPLACE | NLM_F_CREATE; + + msg = nlmsg_alloc_simple(add ? RTM_NEWADDR : RTM_DELADDR, 0); + if (!msg) + return -1; + + nlmsg_append(msg, &ifa, sizeof(ifa), flags); + nla_put(msg, IFA_LOCAL, v6 ? 16 : 4, &addr->addr); + if (v6) { + struct ifa_cacheinfo cinfo = { .ifa_prefered = 0xffffffffU, + .ifa_valid = 0xffffffffU, + .cstamp = 0, + .tstamp = 0 }; + time_t now = odhcpd_time(); + + if (addr->preferred) { + int64_t preferred = addr->preferred - now; + if (preferred < 0) + preferred = 0; + else if (preferred > UINT32_MAX) + preferred = UINT32_MAX; + + cinfo.ifa_prefered = preferred; + } + + if (addr->valid) { + int64_t valid = addr->valid - now; + if (valid <= 0) { + nlmsg_free(msg); + return -1; + } + else if (valid > UINT32_MAX) + valid = UINT32_MAX; + + cinfo.ifa_valid = valid; + } + + nla_put(msg, IFA_CACHEINFO, sizeof(cinfo), &cinfo); + + nla_put_u32(msg, IFA_FLAGS, IFA_F_NOPREFIXROUTE); + } else { + if (addr->broadcast.s_addr) + nla_put_u32(msg, IFA_BROADCAST, addr->broadcast.s_addr); + } + + ret = nl_send_auto_complete(rtnl_socket, msg); + nlmsg_free(msg); + + if (ret < 0) + return ret; + + return nl_wait_for_ack(rtnl_socket); +} + struct interface* odhcpd_get_interface_by_index(int ifindex) { struct interface *iface; @@ -764,3 +839,54 @@ void odhcpd_bmemcpy(void *av, const void *bv, size_t bits) a[bytes] = (a[bytes] & mask) | ((~mask) & b[bytes]); } } + + +int odhcpd_netmask2bitlen(bool inet6, void *mask) +{ + int bits; + struct in_addr *v4; + struct in6_addr *v6; + + if (inet6) + for (bits = 0, v6 = mask; + bits < 128 && (v6->s6_addr[bits / 8] << (bits % 8)) & 128; + bits++); + else + for (bits = 0, v4 = mask; + bits < 32 && (ntohl(v4->s_addr) << bits) & 0x80000000; + bits++); + + return bits; +} + +bool odhcpd_bitlen2netmask(bool inet6, unsigned int bits, void *mask) +{ + uint8_t b; + struct in_addr *v4; + struct in6_addr *v6; + + if (inet6) + { + if (bits > 128) + return false; + + v6 = mask; + + for (unsigned int i = 0; i < sizeof(v6->s6_addr); i++) + { + b = (bits > 8) ? 8 : bits; + v6->s6_addr[i] = (uint8_t)(0xFF << (8 - b)); + bits -= b; + } + } + else + { + if (bits > 32) + return false; + + v4 = mask; + v4->s_addr = bits ? htonl(~((1 << (32 - bits)) - 1)) : 0; + } + + return true; +} diff --git a/src/odhcpd.h b/src/odhcpd.h index a240aa1..3d8f254 100644 --- a/src/odhcpd.h +++ b/src/odhcpd.h @@ -125,19 +125,28 @@ struct interface { char *ifname; const char *name; - // Runtime data + // IPv6 runtime data + struct odhcpd_ipaddr *ia_addr; + size_t ia_addr_len; + + // RA runtime data struct uloop_timeout timer_rs; + + // DHCPv6 runtime data + struct odhcpd_event dhcpv6_event; struct list_head ia_assignments; + + // NDP runtime data + struct odhcpd_event ndp_event; + + // IPv4 runtime data struct odhcpd_ipaddr *addr4; size_t addr4_len; - struct odhcpd_ipaddr *ia_addr; - size_t ia_addr_len; - // DHCPv4 - struct odhcpd_event dhcpv6_event; + // DHCPv4 runtime data struct odhcpd_event dhcpv4_event; - struct odhcpd_event ndp_event; struct list_head dhcpv4_assignments; + struct list_head dhcpv4_fr_ips; // Managed PD char dhcpv6_pd_manager[128]; @@ -176,11 +185,17 @@ struct interface { // DHCPv4 struct in_addr dhcpv4_start; struct in_addr dhcpv4_end; + struct in_addr dhcpv4_start_ip; + struct in_addr dhcpv4_end_ip; + struct in_addr dhcpv4_local; + struct in_addr dhcpv4_bcast; + struct in_addr dhcpv4_mask; struct in_addr *dhcpv4_router; size_t dhcpv4_router_cnt; struct in_addr *dhcpv4_dns; size_t dhcpv4_dns_cnt; uint32_t dhcpv4_leasetime; + bool dhcpv4_forcereconf; // DNS struct in6_addr *dns; @@ -230,6 +245,9 @@ int odhcpd_setup_route(const struct in6_addr *addr, const int prefixlen, const uint32_t metric, const bool add); int odhcpd_setup_proxy_neigh(const struct in6_addr *addr, const struct interface *iface, const bool add); +int odhcpd_setup_addr(struct odhcpd_ipaddr *addr, + const struct interface *iface, const bool v6, + const bool add); void odhcpd_run(void); time_t odhcpd_time(void); @@ -239,8 +257,13 @@ void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len); int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits); void odhcpd_bmemcpy(void *av, const void *bv, size_t bits); +int odhcpd_netmask2bitlen(bool v6, void *mask); +bool odhcpd_bitlen2netmask(bool v6, unsigned int bits, void *mask); + int config_parse_interface(void *data, size_t len, const char *iname, bool overwrite); +void dhcpv4_addr_update(struct interface *iface); + #ifdef WITH_UBUS int init_ubus(void); const char* ubus_get_ifname(const char *name); diff --git a/src/ubus.c b/src/ubus.c index 2ffa4e3..6fbb98f 100644 --- a/src/ubus.c +++ b/src/ubus.c @@ -45,6 +45,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob blobmsg_add_string_buffer(&b); blobmsg_add_string(&b, "hostname", (c->hostname) ? c->hostname : ""); + blobmsg_add_u8(&b, "accept-reconf-nonce", c->accept_fr_nonce); m = blobmsg_open_array(&b, "flags"); if (c->flags & OAF_BOUND) @@ -55,7 +56,7 @@ static int handle_dhcpv4_leases(struct ubus_context *ctx, _unused struct ubus_ob blobmsg_close_array(&b, m); buf = blobmsg_alloc_string_buffer(&b, "ip", INET_ADDRSTRLEN); - struct in_addr addr = {htonl(c->addr)}; + struct in_addr addr = {.s_addr = c->addr}; inet_ntop(AF_INET, &addr, buf, INET_ADDRSTRLEN); blobmsg_add_string_buffer(&b); -- cgit v1.2.3