diff options
| author |   bluhm <bluhm@openbsd.org> | 2014-01-08 22:38:29 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2014-01-08 22:38:29 +0000 |
| commit | 3e0567a8fba7d22d104aca1a6b212461df0fc583 (patch) | |
| tree | c4b27e71ca80ad2b5cda32aea203d97ccf143ade /sys/netinet6 | |
| parent | Use calloc() instead of malloc() + memset. Based on a diff from (diff) | |
| download | wireguard-openbsd-3e0567a8fba7d22d104aca1a6b212461df0fc583.tar.xz wireguard-openbsd-3e0567a8fba7d22d104aca1a6b212461df0fc583.zip | |
Name the local variables for struct ifaddr consistently "ifa".
OK mikeb@
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/in6_pcb.c | 10 | ||||
| -rw-r--r-- | sys/netinet6/raw_ip6.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 633b8586125..bbd3c50abab 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_pcb.c,v 1.58 2013/12/20 02:04:09 krw Exp $ */ +/* $OpenBSD: in6_pcb.c,v 1.59 2014/01/08 22:38:29 bluhm Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -218,7 +218,7 @@ in6_pcbbind(struct inpcb *inp, struct mbuf *nam, struct proc *p) if (so->so_options & SO_REUSEADDR) reuseport = SO_REUSEADDR | SO_REUSEPORT; } else if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - struct ifaddr *ia = NULL; + struct ifaddr *ifa = NULL; sin6->sin6_port = 0; /* * Yechhhh, because of upcoming @@ -228,7 +228,7 @@ in6_pcbbind(struct inpcb *inp, struct mbuf *nam, struct proc *p) */ sin6->sin6_flowinfo = 0; if (!(so->so_options & SO_BINDANY) && - (ia = ifa_ifwithaddr(sin6tosa(sin6), + (ifa = ifa_ifwithaddr(sin6tosa(sin6), inp->inp_rtableid)) == NULL) return EADDRNOTAVAIL; @@ -245,8 +245,8 @@ in6_pcbbind(struct inpcb *inp, struct mbuf *nam, struct proc *p) * flag to control the bind(2) behavior against * deprecated addresses (default: forbid bind(2)). */ - if (ia && - ifatoia6(ia)->ia6_flags & + if (ifa && + ifatoia6(ifa)->ia6_flags & (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY|IN6_IFF_DETACHED)) return (EADDRNOTAVAIL); } diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 80f8e9af9f3..93fe8a8b342 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_ip6.c,v 1.63 2013/12/20 02:04:09 krw Exp $ */ +/* $OpenBSD: raw_ip6.c,v 1.64 2014/01/08 22:38:29 bluhm Exp $ */ /* $KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $ */ /* @@ -661,7 +661,7 @@ rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, case PRU_BIND: { struct sockaddr_in6 *addr = mtod(nam, struct sockaddr_in6 *); - struct ifaddr *ia = NULL; + struct ifaddr *ifa = NULL; if (nam->m_len != sizeof(*addr)) { error = EINVAL; @@ -688,12 +688,12 @@ rip6_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, */ if (!IN6_IS_ADDR_UNSPECIFIED(&addr->sin6_addr) && !(so->so_options & SO_BINDANY) && - (ia = ifa_ifwithaddr(sin6tosa(addr), + (ifa = ifa_ifwithaddr(sin6tosa(addr), in6p->inp_rtableid)) == 0) { error = EADDRNOTAVAIL; break; } - if (ia && ifatoia6(ia)->ia6_flags & + if (ifa && ifatoia6(ifa)->ia6_flags & (IN6_IFF_ANYCAST|IN6_IFF_NOTREADY| IN6_IFF_DETACHED|IN6_IFF_DEPRECATED)) { error = EADDRNOTAVAIL; |