summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dhcpv4.c66
-rw-r--r--src/odhcpd.h4
-rw-r--r--src/ubus.c74
3 files changed, 23 insertions, 121 deletions
diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 26cd5e1..a657e13 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -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;
@@ -230,8 +203,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);
}
@@ -285,6 +258,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 +270,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 +296,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));
@@ -345,7 +325,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];
@@ -397,7 +377,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, &iface->dhcpv4_addr);
+ dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, &ifaddr.sin_addr);
if (lease) {
reply.yiaddr.s_addr = htonl(lease->addr);
@@ -411,7 +391,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
val = htonl(875 * iface->dhcpv4_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 +421,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);
diff --git a/src/odhcpd.h b/src/odhcpd.h
index 759fb04..ab24674 100644
--- a/src/odhcpd.h
+++ b/src/odhcpd.h
@@ -146,8 +146,6 @@ struct interface {
int ra_maxinterval;
// DHCPv4
- struct in_addr dhcpv4_addr;
- struct in_addr dhcpv4_mask;
struct in_addr dhcpv4_start;
struct in_addr dhcpv4_end;
struct in_addr *dhcpv4_router;
@@ -213,8 +211,6 @@ int init_ubus(void);
const char* ubus_get_ifname(const char *name);
void ubus_apply_network(void);
bool ubus_has_prefix(const char *name, const char *ifname);
-const char* ubus_get_address4(const char *name);
-int ubus_get_mask4(const char *name);
#endif
diff --git a/src/ubus.c b/src/ubus.c
index 0ef3153..0b51183 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -163,7 +163,6 @@ enum {
IFACE_ATTR_DATA,
IFACE_ATTR_PREFIX,
IFACE_ATTR_ADDRESS,
- IFACE_ATTR_ADDRESS4,
IFACE_ATTR_MAX,
};
@@ -174,7 +173,6 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
[IFACE_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
[IFACE_ATTR_PREFIX] = { .name = "ipv6-prefix", .type = BLOBMSG_TYPE_ARRAY },
[IFACE_ATTR_ADDRESS] = { .name = "ipv6-address", .type = BLOBMSG_TYPE_ARRAY },
- [IFACE_ATTR_ADDRESS4] = { .name = "ipv4-address", .type = BLOBMSG_TYPE_ARRAY },
};
static void handle_dump(_unused struct ubus_request *req, _unused int type, struct blob_attr *msg)
@@ -361,78 +359,6 @@ bool ubus_has_prefix(const char *name, const char *ifname)
return false;
}
-const char* ubus_get_address4(const char *name)
-{
- struct blob_attr *c, *cur;
- unsigned rem;
-
- if (!dump)
- return NULL;
-
- blobmsg_for_each_attr(c, dump, rem) {
- struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
-
- if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
- blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
- continue;
-
- if ((cur = tb[IFACE_ATTR_ADDRESS4])) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
- continue;
-
- struct blob_attr *d;
- unsigned drem;
- blobmsg_for_each_attr(d, cur, drem) {
- struct blob_attr *ccur;
- unsigned ddrem;
- struct blob_attr *dict = blobmsg_data(cur);
- blobmsg_for_each_attr(ccur, dict, ddrem) {
- if (!strcmp(blobmsg_name(ccur), "address"))
- return blobmsg_get_string(ccur);
- }
- }
- }
- }
-
- return NULL;
-}
-
-int ubus_get_mask4(const char *name)
-{
- struct blob_attr *c, *cur;
- unsigned rem;
- if (!dump)
- return 0;
-
- blobmsg_for_each_attr(c, dump, rem) {
- struct blob_attr *tb[IFACE_ATTR_MAX];
- blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blobmsg_data(c), blobmsg_data_len(c));
-
- if (!tb[IFACE_ATTR_INTERFACE] || strcmp(name,
- blobmsg_get_string(tb[IFACE_ATTR_INTERFACE])))
- continue;
-
- if ((cur = tb[IFACE_ATTR_ADDRESS4])) {
- if (blobmsg_type(cur) != BLOBMSG_TYPE_ARRAY || !blobmsg_check_attr(cur, NULL))
- continue;
-
- struct blob_attr *d;
- unsigned drem;
- blobmsg_for_each_attr(d, cur, drem) {
- struct blob_attr *ccur;
- unsigned ddrem;
- struct blob_attr *dict = blobmsg_data(cur);
- blobmsg_for_each_attr(ccur, dict, ddrem) {
- if (!strcmp(blobmsg_name(ccur), "mask"))
- return blobmsg_get_u32(ccur);
- }
- }
- }
- }
-
- return 0;
-}
int init_ubus(void)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 03:03:43 +0000