diff options
author | shin <shin@FreeBSD.org> | 2000-01-13 14:52:53 +0000 |
---|---|---|
committer | shin <shin@FreeBSD.org> | 2000-01-13 14:52:53 +0000 |
commit | 8813e718dc87a6dcf42bd2743686c7a74df222ca (patch) | |
tree | 8e87172e88ca2bdbef8c5b66e7e88662d6cbfb0d /sys/netinet | |
parent | 67fa8a58e342435bbf9002af532193bba929725a (diff) | |
download | FreeBSD-src-8813e718dc87a6dcf42bd2743686c7a74df222ca.zip FreeBSD-src-8813e718dc87a6dcf42bd2743686c7a74df222ca.tar.gz |
Change struct sockaddr_storage member name, because following change
is very likely to become consensus as recent ietf/ipng mailing list
discussion. Also recent KAME repository and other KAME patched BSDs
also applied it.
s/__ss_family/ss_family/
s/__ss_len/ss_len/
Makeworld is confirmed, and no application should be affected by this change
yet.
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/in.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index b638143..1cb0170 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -480,16 +480,16 @@ in_lifaddr_ioctl(so, cmd, data, ifp, p) case SIOCALIFADDR: case SIOCDLIFADDR: /* address must be specified on ADD and DELETE */ - if (iflr->addr.__ss_family != AF_INET) + if (iflr->addr.ss_family != AF_INET) return EINVAL; - if (iflr->addr.__ss_len != sizeof(struct sockaddr_in)) + if (iflr->addr.ss_len != sizeof(struct sockaddr_in)) return EINVAL; /* XXX need improvement */ - if (iflr->dstaddr.__ss_family - && iflr->dstaddr.__ss_family != AF_INET) + if (iflr->dstaddr.ss_family + && iflr->dstaddr.ss_family != AF_INET) return EINVAL; - if (iflr->dstaddr.__ss_family - && iflr->dstaddr.__ss_len != sizeof(struct sockaddr_in)) + if (iflr->dstaddr.ss_family + && iflr->dstaddr.ss_len != sizeof(struct sockaddr_in)) return EINVAL; break; default: /*shouldn't happen*/ @@ -511,11 +511,11 @@ in_lifaddr_ioctl(so, cmd, data, ifp, p) bcopy(iflr->iflr_name, ifra.ifra_name, sizeof(ifra.ifra_name)); - bcopy(&iflr->addr, &ifra.ifra_addr, iflr->addr.__ss_len); + bcopy(&iflr->addr, &ifra.ifra_addr, iflr->addr.ss_len); - if (iflr->dstaddr.__ss_family) { /*XXX*/ + if (iflr->dstaddr.ss_family) { /*XXX*/ bcopy(&iflr->dstaddr, &ifra.ifra_dstaddr, - iflr->dstaddr.__ss_len); + iflr->dstaddr.ss_len); } ifra.ifra_mask.sin_family = AF_INET; |