pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly set subnet mask on Linux

Browse source
This commit is contained in:
Joseph C. Lehner 2018-09-11 16:31:31 +02:00
parent c7106becb1
commit 83bd41b67a
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ethsock.c
View file

@ -180,22 +180,14 @@ static bool bridge_stp(const char *intf, bool enabled)
return ret; return ret;
} }
static bool xrtnl_addr_set(struct rtnl_addr *ra, uint32_t addr, int (*cb)(struct rtnl_addr*, struct nl_addr*)) static struct nl_addr *build_ip(uint32_t ip)
{ {
int err; struct nl_addr *na = nl_addr_build(AF_INET, &ip, 4);
struct nl_addr *na = nl_addr_build(AF_INET, &addr, 4);
if (!na) { if (!na) {
xperror("nl_addr_build"); xperror("nl_addr_build");
return false;
} }
if ((err = cb(ra, na)) != 0 && verbosity) { return na;
nl_perror(err, __func__);
}
nl_addr_put(na);
return true;
} }
static struct nl_sock *xnl_socket_route() static struct nl_sock *xnl_socket_route()
@ -219,6 +211,7 @@ static bool intf_add_del_ip(const char *intf, uint32_t ipaddr, uint32_t ipmask,
{ {
struct rtnl_addr *ra = NULL; struct rtnl_addr *ra = NULL;
struct nl_sock *sk = NULL; struct nl_sock *sk = NULL;
struct nl_addr *na = NULL;
int err = 1; int err = 1;
if (!(sk = xnl_socket_route())) { if (!(sk = xnl_socket_route())) {
@ -231,13 +224,22 @@ static bool intf_add_del_ip(const char *intf, uint32_t ipaddr, uint32_t ipmask,
} }
rtnl_addr_set_ifindex(ra, if_nametoindex(intf)); rtnl_addr_set_ifindex(ra, if_nametoindex(intf));
rtnl_addr_set_prefixlen(ra, bitcount(ipmask));
if (!xrtnl_addr_set(ra, (ipaddr & ipmask) | ~ipmask, &rtnl_addr_set_broadcast) if (!(na = build_ip(ipaddr))) {
|| !xrtnl_addr_set(ra, ipaddr, &rtnl_addr_set_local)) {
goto out; goto out;
} }
nl_addr_set_prefixlen(na, bitcount(ipmask));
rtnl_addr_set_local(ra, na);
nl_addr_put(na);
if (!(na = build_ip((ipaddr & ipmask) | ~ipmask))) {
goto out;
}
rtnl_addr_set_broadcast(ra, na);
nl_addr_put(na);
if ((err = add ? rtnl_addr_add(sk, ra, 0) : rtnl_addr_delete(sk, ra, 0)) < 0) { if ((err = add ? rtnl_addr_add(sk, ra, 0) : rtnl_addr_delete(sk, ra, 0)) < 0) {
if (add && err == -NLE_EXIST) { if (add && err == -NLE_EXIST) {
err = 0; err = 0;