Fix style bugs in in_pcblookup_lbgroup().
No functional change intended. Reviewed by: bz, Johannes Lundberg <johalun0@gmail.com> Approved by: re (rgrimes) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17030
This commit is contained in:
parent
d5d21ad932
commit
8be02ee4da
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=338470
@ -1950,18 +1950,18 @@ in_pcblookup_local(struct inpcbinfo *pcbinfo, struct in_addr laddr,
|
|||||||
|
|
||||||
static struct inpcb *
|
static struct inpcb *
|
||||||
in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo,
|
in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo,
|
||||||
const struct in_addr *laddr, uint16_t lport, const struct in_addr *faddr,
|
const struct in_addr *laddr, uint16_t lport, const struct in_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;
|
||||||
|
|
||||||
INP_HASH_LOCK_ASSERT(pcbinfo);
|
INP_HASH_LOCK_ASSERT(pcbinfo);
|
||||||
|
|
||||||
hdr = &pcbinfo->ipi_lbgrouphashbase[
|
hdr = &pcbinfo->ipi_lbgrouphashbase[INP_PCBLBGROUP_PORTHASH(lport,
|
||||||
INP_PCBLBGROUP_PORTHASH(lport, pcbinfo->ipi_lbgrouphashmask)];
|
pcbinfo->ipi_lbgrouphashmask)];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Order of socket selection:
|
* Order of socket selection:
|
||||||
@ -1972,35 +1972,24 @@ in_pcblookup_lbgroup(const struct inpcbinfo *pcbinfo,
|
|||||||
* - Load balanced group does not contain jailed sockets
|
* - Load balanced group does not contain jailed sockets
|
||||||
* - Load balanced group does not contain IPv4 mapped INET6 wild sockets
|
* - Load balanced group does not contain IPv4 mapped INET6 wild sockets
|
||||||
*/
|
*/
|
||||||
|
local_wild = NULL;
|
||||||
LIST_FOREACH(grp, hdr, il_list) {
|
LIST_FOREACH(grp, hdr, il_list) {
|
||||||
#ifdef INET6
|
#ifdef INET6
|
||||||
if (!(grp->il_vflag & INP_IPV4))
|
if (!(grp->il_vflag & INP_IPV4))
|
||||||
continue;
|
continue;
|
||||||
#endif
|
#endif
|
||||||
|
if (grp->il_lport != lport)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (grp->il_lport == lport) {
|
idx = INP_PCBLBGROUP_PKTHASH(faddr->s_addr, lport, fport) %
|
||||||
|
grp->il_inpcnt;
|
||||||
uint32_t idx = 0;
|
if (grp->il_laddr.s_addr == laddr->s_addr)
|
||||||
int pkt_hash = INP_PCBLBGROUP_PKTHASH(faddr->s_addr,
|
return (grp->il_inp[idx]);
|
||||||
lport, fport);
|
if (grp->il_laddr.s_addr == INADDR_ANY &&
|
||||||
|
(lookupflags & INPLOOKUP_WILDCARD) != 0)
|
||||||
idx = pkt_hash % grp->il_inpcnt;
|
local_wild = grp->il_inp[idx];
|
||||||
|
|
||||||
if (grp->il_laddr.s_addr == laddr->s_addr) {
|
|
||||||
return (grp->il_inp[idx]);
|
|
||||||
} else {
|
|
||||||
if (grp->il_laddr.s_addr == INADDR_ANY &&
|
|
||||||
(lookupflags & INPLOOKUP_WILDCARD)) {
|
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user