SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2023-12-03 20:46:03 +00:00
parent 02d83d01a6
commit 005bcb25db
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
29 changed files with 312 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sys/netinet6/in6_pcb.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: in6_pcb.c,v 1.128 2023/12/01 15:30:47 bluhm Exp $ */
/* $OpenBSD: in6_pcb.c,v 1.130 2023/12/03 20:36:24 bluhm Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -252,7 +252,7 @@ in6_pcbconnect(struct inpcb *inp, struct mbuf *nam)
int error;
struct sockaddr_in6 tmp;
KASSERT(inp->inp_flags & INP_IPV6);
KASSERT(ISSET(inp->inp_flags, INP_IPV6));
if ((error = in6_nam2sin6(nam, &sin6)))
return (error);
@ -373,10 +373,10 @@ in6_setpeeraddr(struct inpcb *inp, struct mbuf *nam)
int
in6_sockaddr(struct socket *so, struct mbuf *nam)
{
struct inpcb *in6p;
struct inpcb *inp;
in6p = sotoinpcb(so);
in6_setsockaddr(in6p, nam);
inp = sotoinpcb(so);
in6_setsockaddr(inp, nam);
return (0);
}
@ -384,10 +384,10 @@ in6_sockaddr(struct socket *so, struct mbuf *nam)
int
in6_peeraddr(struct socket *so, struct mbuf *nam)
{
struct inpcb *in6p;
struct inpcb *inp;
in6p = sotoinpcb(so);
in6_setpeeraddr(in6p, nam);
inp = sotoinpcb(so);
in6_setpeeraddr(inp, nam);
return (0);
}
@ -461,7 +461,7 @@ in6_pcbnotify(struct inpcbtable *table, struct sockaddr_in6 *dst,
rw_enter_write(&table->inpt_notify);
mtx_enter(&table->inpt_mtx);
TAILQ_FOREACH(inp, &table->inpt_queue, inp_queue) {
if ((inp->inp_flags & INP_IPV6) == 0)
if (!ISSET(inp->inp_flags, INP_IPV6))
continue;
/*