return -1;
}
- // Create a range if not specified
- struct ifreq ifreq;
- strncpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_name));
+ 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;
- struct sockaddr_in *saddr = (struct sockaddr_in*)&ifreq.ifr_addr;
- struct sockaddr_in *smask = (struct sockaddr_in*)&ifreq.ifr_netmask;
+ iface->dhcpv4_mask.s_addr = mask.s_addr;
+
+ // 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;
+ !(iface->dhcpv4_end.s_addr & htonl(0xffff0000))) {
- 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);
}
+ 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;
// 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.s_addr) !=
+ (iface->dhcpv4_start.s_addr & mask.s_addr)) {
list_del(&a->head);
free(a);
}
struct dhcpv4_assignment *a = list_first_entry(&iface->dhcpv4_assignments,
struct dhcpv4_assignment, head);
list_del(&a->head);
- free(a->hostname);
free(a);
}
return;
int sock = iface->dhcpv4_event.uloop.fd;
- struct sockaddr_in ifaddr;
- struct sockaddr_in ifnetmask;
- syslog(LOG_NOTICE, "Got DHCPv4 request");
+ syslog(LOG_WARNING, "Got DHCPv4 request");
struct ifreq ifreq;
memcpy(ifreq.ifr_name, iface->ifname, sizeof(ifreq.ifr_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;
+ uint32_t network = iface->dhcpv4_addr.s_addr & iface->dhcpv4_mask.s_addr;
- 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 & iface->dhcpv4_mask.s_addr) != network ||
+ (iface->dhcpv4_end.s_addr & iface->dhcpv4_mask.s_addr) != network) {
syslog(LOG_WARNING, "DHCPv4 range out of assigned network");
return;
}
.flags = req->flags,
.ciaddr = {INADDR_ANY},
.giaddr = req->giaddr,
- .siaddr = ifaddr.sin_addr,
+ .siaddr = iface->dhcpv4_addr,
};
memcpy(reply.chaddr, req->chaddr, sizeof(reply.chaddr));
} 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, &iface->dhcpv4_addr, 4))
return;
} else if (iface->filter_class && opt->type == DHCPV4_OPT_USER_CLASS) {
uint8_t *c = opt->data, *cend = &opt->data[opt->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, &iface->dhcpv4_addr);
if (lease) {
reply.yiaddr.s_addr = htonl(lease->addr);
val = htonl(875 * iface->dhcpv4_leasetime / 1000);
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, &iface->dhcpv4_mask);
if (lease->hostname[0])
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_HOSTNAME,
}
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, &iface->dhcpv4_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, &ifaddr.sin_addr);
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER, 4, &iface->dhcpv4_addr);
else
dhcpv4_put(&reply, &cookie, DHCPV4_OPT_DNSSERVER,
4 * iface->dhcpv4_dns_cnt, iface->dhcpv4_dns);
return true;
}
- for (size_t i = 0; i < count; ++i) {
+ for (uint32_t i = 0; i < count; ++i) {
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 %d of %d)",
+ 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,
} else if (msg == DHCPV4_MSG_RELEASE) {
if (a && a->valid_until != LONG_MAX)
a->valid_until = 0;
- } else if (msg == DHCPV4_MSG_DECLINE && a->valid_until != LONG_MAX) {
+ } 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
}