sync with OpenBSD -current
This commit is contained in:
parent
7d66fd8cb0
commit
3f3212838f
GPG key ID:
F42C07F07E2E35B7
122 changed files with 1363 additions and 8580 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ip_divert.c,v 1.92 2023/09/16 09:33:27 mpi Exp $ */
|
||||
/* $OpenBSD: ip_divert.c,v 1.93 2024/02/03 22:50:09 mvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
|
||||
|
|
@ -67,6 +67,7 @@ const struct pr_usrreqs divert_usrreqs = {
|
|||
.pru_detach = divert_detach,
|
||||
.pru_lock = divert_lock,
|
||||
.pru_unlock = divert_unlock,
|
||||
.pru_locked = divert_locked,
|
||||
.pru_bind = divert_bind,
|
||||
.pru_shutdown = divert_shutdown,
|
||||
.pru_send = divert_send,
|
||||
|
|
@ -313,6 +314,14 @@ divert_unlock(struct socket *so)
|
|||
mtx_leave(&inp->inp_mtx);
|
||||
}
|
||||
|
||||
int
|
||||
divert_locked(struct socket *so)
|
||||
{
|
||||
struct inpcb *inp = sotoinpcb(so);
|
||||
|
||||
return mtx_owned(&inp->inp_mtx);
|
||||
}
|
||||
|
||||
int
|
||||
divert_bind(struct socket *so, struct mbuf *addr, struct proc *p)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ip_divert.h,v 1.24 2022/10/17 14:49:02 mvs Exp $ */
|
||||
/* $OpenBSD: ip_divert.h,v 1.25 2024/02/03 22:50:09 mvs Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
|
||||
|
|
@ -74,6 +74,7 @@ int divert_attach(struct socket *, int, int);
|
|||
int divert_detach(struct socket *);
|
||||
void divert_lock(struct socket *);
|
||||
void divert_unlock(struct socket *);
|
||||
int divert_locked(struct socket *);
|
||||
int divert_bind(struct socket *, struct mbuf *, struct proc *);
|
||||
int divert_shutdown(struct socket *);
|
||||
int divert_send(struct socket *, struct mbuf *, struct mbuf *,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: ip_var.h,v 1.110 2023/11/26 22:08:10 bluhm Exp $ */
|
||||
/* $OpenBSD: ip_var.h,v 1.111 2024/02/03 22:50:09 mvs Exp $ */
|
||||
/* $NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -260,6 +260,7 @@ int rip_attach(struct socket *, int, int);
|
|||
int rip_detach(struct socket *);
|
||||
void rip_lock(struct socket *);
|
||||
void rip_unlock(struct socket *);
|
||||
int rip_locked(struct socket *);
|
||||
int rip_bind(struct socket *, struct mbuf *, struct proc *);
|
||||
int rip_connect(struct socket *, struct mbuf *);
|
||||
int rip_disconnect(struct socket *);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: raw_ip.c,v 1.154 2024/01/21 01:17:20 bluhm Exp $ */
|
||||
/* $OpenBSD: raw_ip.c,v 1.155 2024/02/03 22:50:09 mvs Exp $ */
|
||||
/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -108,6 +108,7 @@ const struct pr_usrreqs rip_usrreqs = {
|
|||
.pru_detach = rip_detach,
|
||||
.pru_lock = rip_lock,
|
||||
.pru_unlock = rip_unlock,
|
||||
.pru_locked = rip_locked,
|
||||
.pru_bind = rip_bind,
|
||||
.pru_connect = rip_connect,
|
||||
.pru_disconnect = rip_disconnect,
|
||||
|
|
@ -524,6 +525,14 @@ rip_unlock(struct socket *so)
|
|||
mtx_leave(&inp->inp_mtx);
|
||||
}
|
||||
|
||||
int
|
||||
rip_locked(struct socket *so)
|
||||
{
|
||||
struct inpcb *inp = sotoinpcb(so);
|
||||
|
||||
return mtx_owned(&inp->inp_mtx);
|
||||
}
|
||||
|
||||
int
|
||||
rip_bind(struct socket *so, struct mbuf *nam, struct proc *p)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: udp_usrreq.c,v 1.316 2024/01/28 20:34:25 bluhm Exp $ */
|
||||
/* $OpenBSD: udp_usrreq.c,v 1.317 2024/02/03 22:50:09 mvs Exp $ */
|
||||
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -127,6 +127,7 @@ const struct pr_usrreqs udp_usrreqs = {
|
|||
.pru_detach = udp_detach,
|
||||
.pru_lock = udp_lock,
|
||||
.pru_unlock = udp_unlock,
|
||||
.pru_locked = udp_locked,
|
||||
.pru_bind = udp_bind,
|
||||
.pru_connect = udp_connect,
|
||||
.pru_disconnect = udp_disconnect,
|
||||
|
|
@ -143,6 +144,7 @@ const struct pr_usrreqs udp6_usrreqs = {
|
|||
.pru_detach = udp_detach,
|
||||
.pru_lock = udp_lock,
|
||||
.pru_unlock = udp_unlock,
|
||||
.pru_locked = udp_locked,
|
||||
.pru_bind = udp_bind,
|
||||
.pru_connect = udp_connect,
|
||||
.pru_disconnect = udp_disconnect,
|
||||
|
|
@ -1156,6 +1158,14 @@ udp_unlock(struct socket *so)
|
|||
mtx_leave(&inp->inp_mtx);
|
||||
}
|
||||
|
||||
int
|
||||
udp_locked(struct socket *so)
|
||||
{
|
||||
struct inpcb *inp = sotoinpcb(so);
|
||||
|
||||
return mtx_owned(&inp->inp_mtx);
|
||||
}
|
||||
|
||||
int
|
||||
udp_bind(struct socket *so, struct mbuf *addr, struct proc *p)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: udp_var.h,v 1.50 2024/01/10 16:44:30 bluhm Exp $ */
|
||||
/* $OpenBSD: udp_var.h,v 1.51 2024/02/03 22:50:09 mvs Exp $ */
|
||||
/* $NetBSD: udp_var.h,v 1.12 1996/02/13 23:44:41 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -147,6 +147,7 @@ int udp_attach(struct socket *, int, int);
|
|||
int udp_detach(struct socket *);
|
||||
void udp_lock(struct socket *);
|
||||
void udp_unlock(struct socket *);
|
||||
int udp_locked(struct socket *);
|
||||
int udp_bind(struct socket *, struct mbuf *, struct proc *);
|
||||
int udp_connect(struct socket *, struct mbuf *);
|
||||
int udp_disconnect(struct socket *);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue