OK bluhm@
On Mon, Aug 29, 2022 at 01:14:26AM +0300, Vitaliy Makkoveev wrote:
> Index: sys/kern/uipc_usrreq.c
> ===================================================================
> RCS file: /cvs/src/sys/kern/uipc_usrreq.c,v
> retrieving revision 1.178
> diff -u -p -r1.178 uipc_usrreq.c
> --- sys/kern/uipc_usrreq.c 28 Aug 2022 21:35:11 -0000 1.178
> +++ sys/kern/uipc_usrreq.c 28 Aug 2022 22:12:04 -0000
> @@ -247,7 +247,6 @@ uipc_usrreq(struct socket *so, int req,
> }
> break;
>
> - case PRU_RCVOOB:
> case PRU_SENDOOB:
> error = EOPNOTSUPP;
> break;
> Index: sys/net/pfkeyv2.c
> ===================================================================
> RCS file: /cvs/src/sys/net/pfkeyv2.c,v
> retrieving revision 1.246
> diff -u -p -r1.246 pfkeyv2.c
> --- sys/net/pfkeyv2.c 28 Aug 2022 21:35:11 -0000 1.246
> +++ sys/net/pfkeyv2.c 28 Aug 2022 22:12:05 -0000
> @@ -426,7 +426,6 @@ pfkeyv2_usrreq(struct socket *so, int re
> nam->m_len = pfkey_addr.sa_len;
> break;
>
> - case PRU_RCVOOB:
> case PRU_SENDOOB:
> error = EOPNOTSUPP;
> break;
> Index: sys/net/rtsock.c
> ===================================================================
> RCS file: /cvs/src/sys/net/rtsock.c,v
> retrieving revision 1.346
> diff -u -p -r1.346 rtsock.c
> --- sys/net/rtsock.c 28 Aug 2022 21:35:12 -0000 1.346
> +++ sys/net/rtsock.c 28 Aug 2022 22:12:05 -0000
> @@ -251,7 +251,6 @@ route_usrreq(struct socket *so, int req,
> nam->m_len = route_src.sa_len;
> break;
>
> - case PRU_RCVOOB:
> case PRU_SENDOOB:
> error = EOPNOTSUPP;
> break;
> Index: sys/netinet/ip_divert.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/ip_divert.c,v
> retrieving revision 1.80
> diff -u -p -r1.80 ip_divert.c
> --- sys/netinet/ip_divert.c 28 Aug 2022 21:35:12 -0000 1.80
> +++ sys/netinet/ip_divert.c 28 Aug 2022 22:12:05 -0000
> @@ -285,7 +285,6 @@ divert_usrreq(struct socket *so, int req
> case PRU_SLOWTIMO:
> case PRU_PROTORCV:
> case PRU_PROTOSEND:
> - case PRU_RCVOOB:
> error = EOPNOTSUPP;
> break;
>
> Index: sys/netinet/raw_ip.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/raw_ip.c,v
> retrieving revision 1.141
> diff -u -p -r1.141 raw_ip.c
> --- sys/netinet/raw_ip.c 28 Aug 2022 21:35:12 -0000 1.141
> +++ sys/netinet/raw_ip.c 28 Aug 2022 22:12:05 -0000
> @@ -486,7 +486,6 @@ rip_usrreq(struct socket *so, int req, s
> * Not supported.
> */
> case PRU_SENDOOB:
> - case PRU_RCVOOB:
> error = EOPNOTSUPP;
> break;
>
> Index: sys/netinet/tcp_usrreq.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/tcp_usrreq.c,v
> retrieving revision 1.198
> diff -u -p -r1.198 tcp_usrreq.c
> --- sys/netinet/tcp_usrreq.c 28 Aug 2022 21:35:12 -0000 1.198
> +++ sys/netinet/tcp_usrreq.c 28 Aug 2022 22:12:05 -0000
> @@ -125,6 +125,7 @@ const struct pr_usrreqs tcp_usrreqs = {
> .pru_send = tcp_send,
> .pru_abort = tcp_abort,
> .pru_sense = tcp_sense,
> + .pru_rcvoob = tcp_rcvoob,
> };
>
> static int pr_slowhz = PR_SLOWHZ;
> @@ -228,24 +229,6 @@ tcp_usrreq(struct socket *so, int req, s
> error = EOPNOTSUPP;
> break;
>
> - case PRU_RCVOOB:
> - if ((so->so_oobmark == 0 &&
> - (so->so_state & SS_RCVATMARK) == 0) ||
> - so->so_options & SO_OOBINLINE ||
> - tp->t_oobflags & TCPOOB_HADDATA) {
> - error = EINVAL;
> - break;
> - }
> - if ((tp->t_oobflags & TCPOOB_HAVEDATA) == 0) {
> - error = EWOULDBLOCK;
> - break;
> - }
> - m->m_len = 1;
> - *mtod(m, caddr_t) = tp->t_iobc;
> - if (((long)nam & MSG_PEEK) == 0)
> - tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
> - break;
> -
> case PRU_SENDOOB:
> if (sbspace(so, &so->so_snd) < -512) {
> m_freem(m);
> @@ -998,6 +981,39 @@ tcp_sense(struct socket *so, struct stat
> if (so->so_options & SO_DEBUG)
> tcp_trace(TA_USER, tp->t_state, tp, tp, NULL, PRU_SENSE, 0);
> return (0);
> +}
> +
> +int
> +tcp_rcvoob(struct socket *so, struct mbuf *m, int flags)
> +{
> + struct inpcb *inp;
> + struct tcpcb *tp;
> + int error;
> +
> + soassertlocked(so);
> +
> + if ((error = tcp_sogetpcb(so, &inp, &tp)))
> + return (error);
> +
> + if ((so->so_oobmark == 0 &&
> + (so->so_state & SS_RCVATMARK) == 0) ||
> + so->so_options & SO_OOBINLINE ||
> + tp->t_oobflags & TCPOOB_HADDATA) {
> + error = EINVAL;
> + goto out;
> + }
> + if ((tp->t_oobflags & TCPOOB_HAVEDATA) == 0) {
> + error = EWOULDBLOCK;
> + goto out;
> + }
> + m->m_len = 1;
> + *mtod(m, caddr_t) = tp->t_iobc;
> + if ((flags & MSG_PEEK) == 0)
> + tp->t_oobflags ^= (TCPOOB_HAVEDATA | TCPOOB_HADDATA);
> +out:
> + if (so->so_options & SO_DEBUG)
> + tcp_trace(TA_USER, tp->t_state, tp, tp, NULL, PRU_RCVOOB, 0);
> + return (error);
> }
>
> /*
> Index: sys/netinet/tcp_var.h
> ===================================================================
> RCS file: /cvs/src/sys/netinet/tcp_var.h,v
> retrieving revision 1.151
> diff -u -p -r1.151 tcp_var.h
> --- sys/netinet/tcp_var.h 28 Aug 2022 21:35:12 -0000 1.151
> +++ sys/netinet/tcp_var.h 28 Aug 2022 22:12:05 -0000
> @@ -726,6 +726,7 @@ int tcp_send(struct socket *, struct mb
> struct mbuf *);
> int tcp_abort(struct socket *);
> int tcp_sense(struct socket *, struct stat *);
> +int tcp_rcvoob(struct socket *, struct mbuf *, int);
> void tcp_xmit_timer(struct tcpcb *, int);
> void tcpdropoldhalfopen(struct tcpcb *, u_int16_t);
> void tcp_sack_option(struct tcpcb *,struct tcphdr *,u_char *,int);
> Index: sys/netinet/udp_usrreq.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet/udp_usrreq.c,v
> retrieving revision 1.293
> diff -u -p -r1.293 udp_usrreq.c
> --- sys/netinet/udp_usrreq.c 28 Aug 2022 21:35:12 -0000 1.293
> +++ sys/netinet/udp_usrreq.c 28 Aug 2022 22:12:05 -0000
> @@ -1111,7 +1111,6 @@ udp_usrreq(struct socket *so, int req, s
> case PRU_SLOWTIMO:
> case PRU_PROTORCV:
> case PRU_PROTOSEND:
> - case PRU_RCVOOB:
> error = EOPNOTSUPP;
> break;
>
> Index: sys/netinet6/ip6_divert.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/ip6_divert.c,v
> retrieving revision 1.79
> diff -u -p -r1.79 ip6_divert.c
> --- sys/netinet6/ip6_divert.c 28 Aug 2022 21:35:12 -0000 1.79
> +++ sys/netinet6/ip6_divert.c 28 Aug 2022 22:12:05 -0000
> @@ -291,7 +291,6 @@ divert6_usrreq(struct socket *so, int re
> case PRU_SLOWTIMO:
> case PRU_PROTORCV:
> case PRU_PROTOSEND:
> - case PRU_RCVOOB:
> error = EOPNOTSUPP;
> break;
>
> Index: sys/netinet6/raw_ip6.c
> ===================================================================
> RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
> retrieving revision 1.161
> diff -u -p -r1.161 raw_ip6.c
> --- sys/netinet6/raw_ip6.c 28 Aug 2022 21:35:12 -0000 1.161
> +++ sys/netinet6/raw_ip6.c 28 Aug 2022 22:12:05 -0000
> @@ -601,7 +601,6 @@ rip6_usrreq(struct socket *so, int req,
> * Not supported.
> */
> case PRU_SENDOOB:
> - case PRU_RCVOOB:
> error = EOPNOTSUPP;
> break;
>
> Index: sys/sys/protosw.h
> ===================================================================
> RCS file: /cvs/src/sys/sys/protosw.h,v
> retrieving revision 1.48
> diff -u -p -r1.48 protosw.h
> --- sys/sys/protosw.h 28 Aug 2022 21:35:12 -0000 1.48
> +++ sys/sys/protosw.h 28 Aug 2022 22:12:06 -0000
> @@ -78,6 +78,7 @@ struct pr_usrreqs {
> struct mbuf *);
> int (*pru_abort)(struct socket *);
> int (*pru_sense)(struct socket *, struct stat *);
> + int (*pru_rcvoob)(struct socket *, struct mbuf *, int);
> };
>
> struct protosw {
> @@ -357,8 +358,9 @@ pru_sense(struct socket *so, struct stat
> static inline int
> pru_rcvoob(struct socket *so, struct mbuf *m, int flags)
> {
> - return (*so->so_proto->pr_usrreqs->pru_usrreq)(so,
> - PRU_RCVOOB, m, (struct mbuf *)(long)flags, NULL, curproc);
> + if (so->so_proto->pr_usrreqs->pru_rcvoob)
> + return (*so->so_proto->pr_usrreqs->pru_rcvoob)(so, m, flags);
> + return (EOPNOTSUPP);
> }
>
> static inline int
