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

Fix style bugs in in6_pcblookup_lbgroup().

Browse Source 
This should have been a part of r338470.  No functional changes
intended.

Reported by:	gallatin
Reviewed by:	gallatin, Johannes Lundberg <johalun0@gmail.com>
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D17109
This commit is contained in:
markj 2018-10-22 16:09:01 +00:00
parent e30533f381
commit 741a850d6c
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/netinet6/in6_pcb.c
View File

@ -873,10 +873,9 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo,
const struct in6_addr *laddr, uint16_t lport, const struct in6_addr *faddr, const struct in6_addr *laddr, uint16_t lport, const struct in6_addr *faddr,
uint16_t fport, int lookupflags) uint16_t fport, int lookupflags)
{ {
struct inpcb *local_wild = NULL; struct inpcb *local_wild;
const struct inpcblbgrouphead *hdr; const struct inpcblbgrouphead *hdr;
struct inpcblbgroup *grp; struct inpcblbgroup *grp;
struct inpcblbgroup *grp_local_wild;
uint32_t idx; uint32_t idx;
INP_HASH_LOCK_ASSERT(pcbinfo); INP_HASH_LOCK_ASSERT(pcbinfo);
@ -893,33 +892,24 @@ in6_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo,
* - Load balanced group does not contain jailed sockets. * - Load balanced group does not contain jailed sockets.
* - Load balanced does not contain IPv4 mapped INET6 wild sockets. * - Load balanced does not contain IPv4 mapped INET6 wild sockets.
*/ */
local_wild = NULL;
CK_LIST_FOREACH(grp, hdr, il_list) { CK_LIST_FOREACH(grp, hdr, il_list) {
#ifdef INET #ifdef INET
if (!(grp->il_vflag & INP_IPV6)) if (!(grp->il_vflag & INP_IPV6))
continue; continue;
#endif #endif
if (grp->il_lport == lport) { if (grp->il_lport != lport)
idx = 0; continue;
int pkt_hash = INP_PCBLBGROUP_PKTHASH(
INP6_PCBHASHKEY(faddr), lport, fport);
idx = pkt_hash % grp->il_inpcnt; idx = INP_PCBLBGROUP_PKTHASH(INP6_PCBHASHKEY(faddr), lport,
fport) % grp->il_inpcnt;
if (IN6_ARE_ADDR_EQUAL(&grp->il6_laddr, laddr)) { if (IN6_ARE_ADDR_EQUAL(&grp->il6_laddr, laddr))
return (grp->il_inp[idx]); return (grp->il_inp[idx]);
} else { if (IN6_IS_ADDR_UNSPECIFIED(&grp->il6_laddr) &&
if (IN6_IS_ADDR_UNSPECIFIED(&grp->il6_laddr) && (lookupflags & INPLOOKUP_WILDCARD) != 0)
(lookupflags & INPLOOKUP_WILDCARD)) { local_wild = grp->il_inp[idx];
local_wild = grp->il_inp[idx];
grp_local_wild = grp;
}
}
}
} }
if (local_wild != NULL) { return (local_wild);
return (local_wild);
}
return (NULL);
} }
#ifdef PCBGROUP #ifdef PCBGROUP