d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only show a tunnel information of an adequate address family.

Browse Source 
Approved by:	re (dwhite)
This commit is contained in:
ume 2005-06-16 19:37:09 +00:00
parent f48af43d04
commit 729c89a985
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/ifconfig/af_inet.c
View File

@ -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';

10
sbin/ifconfig/af_inet6.c
View File

@ -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';