diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-14 13:56:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-14 13:56:42 +0200 |
| commit | 926d801fa51717b3af3faf33f9d686e92a20ecfd (patch) | |
| tree | be5d1e982d1ec0330055ebeb0e216eca9a07892f /networking/libiproute/iptunnel.c | |
| parent | 0f296a3a56b52842057e5a2bc653621a3a6c7bec (diff) | |
| download | busybox-926d801fa51717b3af3faf33f9d686e92a20ecfd.tar.gz | |
libiproute: make rt_addr_n2a() and format_host() return auto strings
function old new delta
rt_addr_n2a 56 53 -3
print_addrinfo 1227 1178 -49
print_neigh 933 881 -52
print_rule 689 617 -72
print_tunnel 640 560 -80
print_route 1727 1588 -139
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/6 up/down: 0/-395) Total: -395 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/libiproute/iptunnel.c')
| -rw-r--r-- | networking/libiproute/iptunnel.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index b88c3a401..eb136e435 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c @@ -404,22 +404,18 @@ static int do_del(char **argv) static void print_tunnel(struct ip_tunnel_parm *p) { - char s1[256]; - char s2[256]; - char s3[64]; - char s4[64]; - - format_host(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1)); - format_host(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2)); - inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3)); - inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4)); + char s3[INET_ADDRSTRLEN]; + char s4[INET_ADDRSTRLEN]; printf("%s: %s/ip remote %s local %s ", - p->name, - p->iph.protocol == IPPROTO_IPIP ? "ip" : - (p->iph.protocol == IPPROTO_GRE ? "gre" : - (p->iph.protocol == IPPROTO_IPV6 ? "ipv6" : "unknown")), - p->iph.daddr ? s1 : "any", p->iph.saddr ? s2 : "any"); + p->name, + p->iph.protocol == IPPROTO_IPIP ? "ip" : + p->iph.protocol == IPPROTO_GRE ? "gre" : + p->iph.protocol == IPPROTO_IPV6 ? "ipv6" : + "unknown", + p->iph.daddr ? format_host(AF_INET, 4, &p->iph.daddr) : "any", + p->iph.saddr ? format_host(AF_INET, 4, &p->iph.saddr) : "any" + ); if (p->link) { char *n = do_ioctl_get_ifname(p->link); if (n) { @@ -442,9 +438,11 @@ static void print_tunnel(struct ip_tunnel_parm *p) if (!(p->iph.frag_off & htons(IP_DF))) printf(" nopmtudisc"); + inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3)); + inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4)); if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key) printf(" key %s", s3); - else if ((p->i_flags | p->o_flags) & GRE_KEY) { + else { if (p->i_flags & GRE_KEY) printf(" ikey %s ", s3); if (p->o_flags & GRE_KEY) |