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

Use clearer variable names

Browse source
This commit is contained in:
Joseph C. Lehner 2021-05-25 18:02:33 +02:00
parent 7ea602015a
commit 86de6715b4
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ethsock.c
View file

@ -200,36 +200,34 @@ 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; struct nl_addr *laddr = NULL;
struct nl_addr *bcast = NULL;
int err = 1; int err = 1;
if (!(sk = xnl_socket_route())) { if (!(sk = xnl_socket_route())) {
return false; return false;
} }
if (!(laddr = build_ip(ipaddr))) {
goto out;
}
nl_addr_set_prefixlen(laddr, bitcount(ipmask));
if (!(bcast = build_ip((ipaddr & ipmask) | ~ipmask))) {
goto out;
}
if (!(ra = rtnl_addr_alloc())) { if (!(ra = rtnl_addr_alloc())) {
xperror("rtnl_addr_alloc"); xperror("rtnl_addr_alloc");
goto out; goto out;
} }
rtnl_addr_set_ifindex(ra, if_nametoindex(intf)); rtnl_addr_set_ifindex(ra, if_nametoindex(intf));
rtnl_addr_set_local(ra, laddr);
rtnl_addr_set_broadcast(ra, bcast);
if (!(na = build_ip(ipaddr))) { if ((err = ((add ? rtnl_addr_add(sk, ra, 0) : rtnl_addr_delete(sk, ra, 0)) < 0))) {
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 (add && err == -NLE_EXIST) { if (add && err == -NLE_EXIST) {
err = 0; err = 0;
} else if (add || verbosity > 1) { } else if (add || verbosity > 1) {
@ -239,6 +237,8 @@ static bool intf_add_del_ip(const char *intf, uint32_t ipaddr, uint32_t ipmask,
out: out:
rtnl_addr_put(ra); rtnl_addr_put(ra);
nl_addr_put(laddr);
nl_addr_put(bcast);
nl_socket_free(sk); nl_socket_free(sk);
return !err; return !err;