diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-11 14:55:46 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-11 14:55:46 +0100 |
| commit | ba3b9dbf065438402d89655d7baefb0ccc6f0663 (patch) | |
| tree | 4669edd0fb031940a794eaf8942bdbf314efea2e /networking/libiproute | |
| parent | d3162773d5c722cc1f5c5b1ea5171c8d3c208135 (diff) | |
| download | busybox-ba3b9dbf065438402d89655d7baefb0ccc6f0663.tar.gz | |
libbb: introduce and use bb_getsockname()
function old new delta
bb_getsockname - 18 +18
xrtnl_open 88 83 -5
do_iplink 1216 1209 -7
arping_main 1686 1668 -18
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 0/3 up/down: 18/-30) Total: -12 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/libiproute')
| -rw-r--r-- | networking/libiproute/iplink.c | 4 | ||||
| -rw-r--r-- | networking/libiproute/libnetlink.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index aef5f6490..f38fba055 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -132,7 +132,6 @@ static int get_address(char *dev, int *htype) { struct ifreq ifr; struct sockaddr_ll me; - socklen_t alen; int s; s = xsocket(PF_PACKET, SOCK_DGRAM, 0); @@ -146,8 +145,7 @@ static int get_address(char *dev, int *htype) me.sll_ifindex = ifr.ifr_ifindex; me.sll_protocol = htons(ETH_P_LOOP); xbind(s, (struct sockaddr*)&me, sizeof(me)); - alen = sizeof(me); - getsockname(s, (struct sockaddr*)&me, &alen); + bb_getsockname(s, (struct sockaddr*)&me, sizeof(me)); //never happens: //if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) // bb_perror_msg_and_die("getsockname"); diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index f08d862d0..40955fcae 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -15,16 +15,13 @@ void FAST_FUNC xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/) { - socklen_t addr_len; - memset(rth, 0, sizeof(*rth)); rth->fd = xsocket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); rth->local.nl_family = AF_NETLINK; /*rth->local.nl_groups = subscriptions;*/ xbind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)); - addr_len = sizeof(rth->local); - getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len); + bb_getsockname(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)); /* too much paranoia if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) |