X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=db900c138528a861052b972937575561fa2b3b44;hp=5ef99b13f317fedd6196455f81f54b0ed5461445;hb=e2d6eb4148d5c575cea23617e938982bd5d93abc;hpb=da660c752d1c177934a01e28c68368879523b74d diff --git a/src/dhcpv4.c b/src/dhcpv4.c index 5ef99b1..db900c1 100644 --- a/src/dhcpv4.c +++ b/src/dhcpv4.c @@ -95,42 +95,36 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) return -1; } - /* Create a range if not specified */ - struct ifreq ifreq; - strncpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_name)); + uint32_t mask = iface->addr4[0].prefix ? htonl(~((1 << (32 - iface->addr4[0].prefix)) - 1)) : 0; - struct sockaddr_in *saddr = (struct sockaddr_in*)&ifreq.ifr_addr; - struct sockaddr_in *smask = (struct sockaddr_in*)&ifreq.ifr_netmask; + /* Create a range if not specified */ 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; - - ioctl(sock, SIOCGIFNETMASK, &ifreq); - struct in_addr mask = smask->sin_addr; + 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.s_addr) && - (start & ntohl(~mask.s_addr)) == start && - (end & ntohl(~mask.s_addr)) == 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.s_addr); + (addr->s_addr & mask); iface->dhcpv4_end.s_addr = htonl(end) | - (addr.s_addr & mask.s_addr); - } else if (ntohl(mask.s_addr) <= 0xfffffff0) { - start = addr.s_addr & mask.s_addr; - end = addr.s_addr & mask.s_addr; + (addr->s_addr & mask); + } else if (ntohl(mask) <= 0xfffffff0) { + start = addr->s_addr & mask; + end = addr->s_addr & mask; - if (ntohl(mask.s_addr) <= 0xffffff00) { + if (ntohl(mask) <= 0xffffff00) { iface->dhcpv4_start.s_addr = start | htonl(100); iface->dhcpv4_end.s_addr = end | htonl(250); - } else if (ntohl(mask.s_addr) <= 0xffffffc0) { + } 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.s_addr) <= 0xffffffe0) { + } else if (ntohl(mask) <= 0xffffffe0) { iface->dhcpv4_start.s_addr = start | htonl(10); iface->dhcpv4_end.s_addr = end | htonl(30); } else { @@ -138,8 +132,6 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) iface->dhcpv4_end.s_addr = end | htonl(12); } } - - } /* Parse static entries */ @@ -153,8 +145,7 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable) return -1; } - if (lease->dhcpv4_leasetime >= 60) - a->leasetime = lease->dhcpv4_leasetime; + a->leasetime = lease->dhcpv4_leasetime; a->addr = ntohl(lease->ipaddr.s_addr); memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr)); @@ -189,15 +180,11 @@ 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) & smask->sin_addr.s_addr) != - (iface->dhcpv4_start.s_addr & smask->sin_addr.s_addr)) + if ((htonl(a->addr) & mask) != + (iface->dhcpv4_start.s_addr & mask)) free_dhcpv4_assignment(a); } - - if (iface->dhcpv4_leasetime < 60) - iface->dhcpv4_leasetime = 43200; - iface->dhcpv4_event.uloop.fd = sock; iface->dhcpv4_event.handle_dgram = handle_dhcpv4; odhcpd_register(&iface->dhcpv4_event); @@ -268,35 +255,26 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, req->op != DHCPV4_BOOTREQUEST || req->hlen != 6) return; - int sock = iface->dhcpv4_event.uloop.fd; - struct sockaddr_in ifaddr; - struct sockaddr_in ifnetmask; syslog(LOG_NOTICE, "Got DHCPv4 request"); - struct ifreq ifreq; - memcpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_name)); - if (ioctl(sock, SIOCGIFADDR, &ifreq)) { - syslog(LOG_WARNING, "DHCPv4 failed to detect address: %s", strerror(errno)); + if (!iface->addr4_len) { + syslog(LOG_WARNING, "DHCPv4 no address found on %s", iface->name); return; } - 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; + 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 & ifnetmask.sin_addr.s_addr) != network || - (iface->dhcpv4_end.s_addr & ifnetmask.sin_addr.s_addr) != network) { + 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 ifreq ifr = {.ifr_name = ""}; - strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name)); - struct dhcpv4_message reply = { .op = DHCPV4_BOOTREPLY, .htype = 1, @@ -307,7 +285,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, .flags = req->flags, .ciaddr = {INADDR_ANY}, .giaddr = req->giaddr, - .siaddr = ifaddr.sin_addr, + .siaddr = *ifaddr, }; memcpy(reply.chaddr, req->chaddr, sizeof(reply.chaddr)); @@ -338,7 +316,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.sin_addr, 4)) + if (memcmp(opt->data, ifaddr, 4)) return; } else if (iface->filter_class && opt->type == DHCPV4_OPT_USER_CLASS) { uint8_t *c = opt->data, *cend = &opt->data[opt->len]; @@ -383,7 +361,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, */ } - syslog(LOG_WARNING, "received %s from %x:%x:%x:%x:%x:%x", + syslog(LOG_WARNING, "received %s from %02x:%02x:%02x:%02x:%02x:%02x", dhcpv4_msg_to_string(reqmsg), req->chaddr[0],req->chaddr[1],req->chaddr[2], req->chaddr[3],req->chaddr[4],req->chaddr[5]); @@ -392,7 +370,7 @@ 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.sin_addr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, ifaddr); if (lease) { uint32_t val; @@ -410,18 +388,19 @@ 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, &ifnetmask.sin_addr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_NETMASK, 4, &mask); if (lease->hostname) dhcpv4_put(&reply, &cookie, DHCPV4_OPT_HOSTNAME, strlen(lease->hostname), lease->hostname); - if (!ioctl(sock, SIOCGIFBRDADDR, &ifr)) { - struct sockaddr_in *ina = (struct sockaddr_in*)&ifr.ifr_broadaddr; - dhcpv4_put(&reply, &cookie, DHCPV4_OPT_BROADCAST, 4, &ina->sin_addr); - } + if (ifbroadcast->s_addr != INADDR_ANY) + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_BROADCAST, 4, ifbroadcast); } + struct ifreq ifr = {.ifr_name = ""}; + strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name)); + if (!ioctl(sock, SIOCGIFMTU, &ifr)) { uint16_t mtu = htons(ifr.ifr_mtu); dhcpv4_put(&reply, &cookie, DHCPV4_OPT_MTU, 2, &mtu); @@ -440,14 +419,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.sin_addr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_ROUTER, 4, ifaddr); 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.sin_addr); + dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, ifaddr); else dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4 * iface->dhcpv4_dns_cnt, iface->dhcpv4_dns); @@ -507,7 +486,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len, * reply is send directly to IP, * MAC is assumed to be the same as the request */ - syslog(LOG_WARNING, "sending %s to %x:%x:%x:%x:%x:%x - %s", + syslog(LOG_WARNING, "sending %s to %02x:%02x:%02x:%02x:%02x:%02x - %s", dhcpv4_msg_to_string(msg), req->chaddr[0],req->chaddr[1],req->chaddr[2], req->chaddr[3],req->chaddr[4],req->chaddr[5], @@ -539,7 +518,6 @@ static bool dhcpv4_assign(struct interface *iface, // try to assign the IP the client asked for if (start <= raddr && raddr <= end && dhcpv4_test(iface, raddr)) { assign->addr = raddr; - list_add(&assign->head, &iface->dhcpv4_assignments); syslog(LOG_INFO, "assigning the IP the client asked for: %u.%u.%u.%u", (assign->addr & 0xff000000) >> 24, (assign->addr & 0x00ff0000) >> 16, @@ -562,7 +540,6 @@ static bool dhcpv4_assign(struct interface *iface, if (list_empty(&iface->dhcpv4_assignments)) { assign->addr = try; - list_add(&assign->head, &iface->dhcpv4_assignments); syslog(LOG_INFO, "assigning mapped IP (empty list): %u.%u.%u.%u", (assign->addr & 0xff000000) >> 24, (assign->addr & 0x00ff0000) >> 16, @@ -575,7 +552,6 @@ static bool dhcpv4_assign(struct interface *iface, if (dhcpv4_test(iface, try)) { /* test was successful: IP address is not assigned, assign it */ assign->addr = try; - list_add(&assign->head, &iface->dhcpv4_assignments); syslog(LOG_DEBUG, "assigning mapped IP: %u.%u.%u.%u (try %u of %u)", (assign->addr & 0xff000000) >> 24, (assign->addr & 0x00ff0000) >> 16, @@ -625,9 +601,11 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface, a->valid_until = now; assigned = dhcpv4_assign(iface, a, raddr); + if (assigned) + list_add(&a->head, &iface->dhcpv4_assignments); } - if (a->leasetime >= 60) + if (a->leasetime) my_leasetime = a->leasetime; else my_leasetime = iface->dhcpv4_leasetime;