Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00
Code Releases Activity

rtnlutil: Simplify error handling

Browse Source
This commit is contained in:
Denis Kenzior 2019-07-31 03:53:01 -05:00
parent cce59ad7f1
commit be5219883c
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/rtnlutil.c
View File

@ -330,11 +330,10 @@ static uint32_t rtnl_route_add(struct l_netlink *rtnl, int ifindex,
void *user_data, void *user_data,
l_netlink_destroy_func_t destroy) l_netlink_destroy_func_t destroy)
{ {
struct rtmsg *rtmmsg; L_AUTO_FREE_VAR(struct rtmsg *, rtmmsg);
struct in_addr in_addr; struct in_addr in_addr;
size_t bufsize; size_t bufsize;
void *rta_buf; void *rta_buf;
uint32_t id;
uint16_t flags; uint16_t flags;
if (!dst && !gateway) if (!dst && !gateway)
@ -358,7 +357,6 @@ static uint32_t rtnl_route_add(struct l_netlink *rtnl, int ifindex,
flags = NLM_F_CREATE | NLM_F_REPLACE; flags = NLM_F_CREATE | NLM_F_REPLACE;
rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct rtmsg)); rta_buf = (void *) rtmmsg + NLMSG_ALIGN(sizeof(struct rtmsg));
rta_buf += rta_add_u32(rta_buf, RTA_OIF, ifindex); rta_buf += rta_add_u32(rta_buf, RTA_OIF, ifindex);
@ -367,11 +365,8 @@ static uint32_t rtnl_route_add(struct l_netlink *rtnl, int ifindex,
priority_offset + ifindex); priority_offset + ifindex);
if (dst) { if (dst) {
if (inet_pton(AF_INET, dst, &in_addr) < 1) { if (inet_pton(AF_INET, dst, &in_addr) < 1)
l_free(rtmmsg);
return 0; return 0;
}
rtmmsg->rtm_dst_len = dst_len; rtmmsg->rtm_dst_len = dst_len;
rta_buf += rta_add_data(rta_buf, RTA_DST, &in_addr, rta_buf += rta_add_data(rta_buf, RTA_DST, &in_addr,
@ -379,35 +374,25 @@ static uint32_t rtnl_route_add(struct l_netlink *rtnl, int ifindex,
} }
if (gateway) { if (gateway) {
if (inet_pton(AF_INET, gateway, &in_addr) < 1) { if (inet_pton(AF_INET, gateway, &in_addr) < 1)
l_free(rtmmsg);
return 0; return 0;
}
rta_buf += rta_add_data(rta_buf, RTA_GATEWAY, &in_addr, rta_buf += rta_add_data(rta_buf, RTA_GATEWAY, &in_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
} }
if (src) { if (src) {
if (inet_pton(AF_INET, src, &in_addr) < 1) { if (inet_pton(AF_INET, src, &in_addr) < 1)
l_free(rtmmsg);
return 0; return 0;
}
rtmmsg->rtm_src_len = 32; rtmmsg->rtm_src_len = 32;
rta_buf += rta_add_data(rta_buf, RTA_PREFSRC, &in_addr, rta_buf += rta_add_data(rta_buf, RTA_PREFSRC, &in_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
} }
id = l_netlink_send(rtnl, RTM_NEWROUTE, flags, rtmmsg, return l_netlink_send(rtnl, RTM_NEWROUTE, flags, rtmmsg,
rta_buf - (void *) rtmmsg, cb, user_data, rta_buf - (void *) rtmmsg, cb, user_data,
destroy); destroy);
l_free(rtmmsg);
return id;
} }
uint32_t rtnl_route_ipv4_add_connected(struct l_netlink *rtnl, int ifindex, uint32_t rtnl_route_ipv4_add_connected(struct l_netlink *rtnl, int ifindex,