diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-06-16 19:37:09 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-06-16 19:37:09 +0000 |
| commit | 73bbc449db3739d48b4a91cb31d91cc44e87e05d (patch) | |
| tree | adc0757b5a8ad39ad48dc92a402646fbc99c662b /sbin/ifconfig | |
| parent | e2ba7862b0893a23536002bfd2ff3dd3d2f23bc2 (diff) | |
| download | src-73bbc449db3739d48b4a91cb31d91cc44e87e05d.tar.gz src-73bbc449db3739d48b4a91cb31d91cc44e87e05d.zip | |
only show a tunnel information of an adequate address family.
Approved by: re (dwhite)
Notes
Notes:
svn path=/head/; revision=147437
Diffstat (limited to 'sbin/ifconfig')
| -rw-r--r-- | sbin/ifconfig/af_inet.c | 4 | ||||
| -rw-r--r-- | sbin/ifconfig/af_inet6.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 4a8e3a1ae534..7678daa1aa97 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -153,11 +153,15 @@ in_status_tunnel(int s) if (ioctl(s, SIOCGIFPSRCADDR, (caddr_t)&ifr) < 0) return; + if (sa->sa_family != AF_INET) + return; if (getnameinfo(sa, sa->sa_len, src, sizeof(src), 0, 0, NI_NUMERICHOST) != 0) src[0] = '\0'; if (ioctl(s, SIOCGIFPDSTADDR, (caddr_t)&ifr) < 0) return; + if (sa->sa_family != AF_INET) + return; if (getnameinfo(sa, sa->sa_len, dst, sizeof(dst), 0, 0, NI_NUMERICHOST) != 0) dst[0] = '\0'; diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index 6112f2bd4462..2aae38225235 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -456,16 +456,18 @@ in6_status_tunnel(int s) if (ioctl(s, SIOCGIFPSRCADDR_IN6, (caddr_t)&in6_ifr) < 0) return; - if (sa->sa_family == AF_INET6) - in6_fillscopeid(&in6_ifr.ifr_addr); + if (sa->sa_family != AF_INET6) + return; + in6_fillscopeid(&in6_ifr.ifr_addr); if (getnameinfo(sa, sa->sa_len, src, sizeof(src), 0, 0, NI_NUMERICHOST) != 0) src[0] = '\0'; if (ioctl(s, SIOCGIFPDSTADDR_IN6, (caddr_t)&in6_ifr) < 0) return; - if (sa->sa_family == AF_INET6) - in6_fillscopeid(&in6_ifr.ifr_addr); + if (sa->sa_family != AF_INET6) + return; + in6_fillscopeid(&in6_ifr.ifr_addr); if (getnameinfo(sa, sa->sa_len, dst, sizeof(dst), 0, 0, NI_NUMERICHOST) != 0) dst[0] = '\0'; |