X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=509b09230c5431d8582d1debc3415c082ccddd13;hp=26cd5e19856b5de90f721fa0d619109b993ef753;hb=4c89614ccf5d72ee0c0824e5050a8814748a32c3;hpb=fbe87a359cbe58c56ae56d7aac4f8e337e5c1ec6 diff --git a/src/dhcpv4.c b/src/dhcpv4.c index 26cd5e1..509b092 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -37,7 +37,7 @@ 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); // Create socket and register events int init_dhcpv4(void) @@ -118,41 +118,19 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) return -1; } -#ifndef WITH_UBUS + // 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 (!ioctl(sock, SIOCGIFADDR, &ifreq)) { + if (!(iface->dhcpv4_start.s_addr & htonl(0xffff0000)) && + !(iface->dhcpv4_end.s_addr & htonl(0xffff0000)) && + !ioctl(sock, SIOCGIFADDR, &ifreq)) { struct in_addr addr = saddr->sin_addr; - iface->dhcpv4_addr.s_addr = addr.s_addr; + ioctl(sock, SIOCGIFNETMASK, &ifreq); struct in_addr mask = smask->sin_addr; - iface->dhcpv4_mask.s_addr = mask.s_addr; - } -#else - const char* saddr = ubus_get_address4(iface->name); - struct in_addr addr; - inet_pton(AF_INET,saddr, &addr); - iface->dhcpv4_addr.s_addr = addr.s_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; - - iface->dhcpv4_mask.s_addr = mask.s_addr; -#endif - - // Create a range if not specified - if (!(iface->dhcpv4_start.s_addr & htonl(0xffff0000)) && - !(iface->dhcpv4_end.s_addr & htonl(0xffff0000)) && - iface->dhcpv4_addr.s_addr) { uint32_t start = ntohl(iface->dhcpv4_start.s_addr); uint32_t end = ntohl(iface->dhcpv4_end.s_addr); @@ -186,11 +164,6 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) } - syslog(LOG_WARNING, "DHCPv4 dhcp addr %s", inet_ntoa(iface->dhcpv4_addr)); - syslog(LOG_WARNING, "DHCPv4 dhcp mask %s", inet_ntoa(iface->dhcpv4_mask)); - syslog(LOG_WARNING, "DHCPv4 dhcp start %s", inet_ntoa(iface->dhcpv4_start)); - syslog(LOG_WARNING, "DHCPv4 dhcp end %s", inet_ntoa(iface->dhcpv4_end)); - // Parse static entries struct lease *lease; @@ -203,10 +176,15 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) 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; @@ -230,8 +208,8 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) // 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)) { + if ((htonl(a->addr) & smask->sin_addr.s_addr) != + (iface->dhcpv4_start.s_addr & smask->sin_addr.s_addr)) { list_del(&a->head); free(a); } @@ -271,8 +249,7 @@ static void dhcpv4_put(struct dhcpv4_message *msg, uint8_t **cookie, *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) { @@ -285,6 +262,8 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, return; int sock = iface->dhcpv4_event.uloop.fd; + struct sockaddr_in ifaddr; + struct sockaddr_in ifnetmask; syslog(LOG_NOTICE, "Got DHCPv4 request"); @@ -295,10 +274,15 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, return; } - uint32_t network = iface->dhcpv4_addr.s_addr & iface->dhcpv4_mask.s_addr; + memcpy(&ifaddr, &ifreq.ifr_addr, sizeof(ifaddr)); + if (ioctl(sock, SIOCGIFNETMASK, &ifreq)) + return; + + memcpy(&ifnetmask, &ifreq.ifr_netmask, sizeof(ifnetmask)); + uint32_t network = ifaddr.sin_addr.s_addr & ifnetmask.sin_addr.s_addr; - if ((iface->dhcpv4_start.s_addr & iface->dhcpv4_mask.s_addr) != network || - (iface->dhcpv4_end.s_addr & iface->dhcpv4_mask.s_addr) != network) { + if ((iface->dhcpv4_start.s_addr & ifnetmask.sin_addr.s_addr) != network || + (iface->dhcpv4_end.s_addr & ifnetmask.sin_addr.s_addr) != network) { syslog(LOG_WARNING, "DHCPv4 range out of assigned network"); return; } @@ -316,7 +300,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, .flags = req->flags, .ciaddr = {INADDR_ANY}, .giaddr = req->giaddr, - .siaddr = iface->dhcpv4_addr, + .siaddr = ifaddr.sin_addr, }; memcpy(reply.chaddr, req->chaddr, sizeof(reply.chaddr)); @@ -330,6 +314,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, uint8_t msg = DHCPV4_MSG_ACK; struct in_addr reqaddr = {INADDR_ANY}; + uint32_t leasetime = 0; char hostname[256]; hostname[0] = 0; @@ -345,7 +330,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, &iface->dhcpv4_addr, 4)) + if (memcmp(opt->data, &ifaddr.sin_addr, 4)) return; } else if (iface->filter_class && opt->type == DHCPV4_OPT_USER_CLASS) { uint8_t *c = opt->data, *cend = &opt->data[opt->len]; @@ -354,7 +339,8 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, 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 && @@ -364,7 +350,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, 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); if (!lease) { if (reqmsg == DHCPV4_MSG_REQUEST) @@ -397,21 +383,25 @@ 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, &iface->dhcpv4_addr); + 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, &iface->dhcpv4_mask); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NETMASK, 4, &ifnetmask.sin_addr); if (lease->hostname[0]) dhcpv4_put(&reply, &cookie, DHCPV4_OPT_HOSTNAME, @@ -441,14 +431,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, &iface->dhcpv4_addr); + 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) - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, &iface->dhcpv4_addr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, &ifaddr.sin_addr); else dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4 * iface->dhcpv4_dns_cnt, iface->dhcpv4_dns); @@ -595,7 +585,7 @@ 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, - const char *hostname) + uint32_t *leasetime, const char *hostname) { struct dhcpv4_assignment *lease = NULL; uint32_t raddr = ntohl(reqaddr.s_addr); @@ -607,7 +597,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, a = c; if (c->addr == raddr) break; - } else if (c->valid_until < now) { + } else if (!INFINITE_VALID(c->valid_until) && c->valid_until < now) { list_del(&c->head); free(c); } @@ -616,6 +606,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, 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); @@ -625,6 +616,8 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, } 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); } @@ -642,10 +635,27 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, a->head.prev->next = &a->head; } - // 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 (a->leasetime >= 60) { + my_leasetime = a->leasetime; + } else { + my_leasetime = 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 { + 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); a = NULL; @@ -653,12 +663,19 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, 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();