guenther@ said, that sys/protosw.h hunk on top of the diff makes it
easier to review. Is it really helpful?
ok?
Index: sys/sys/protosw.h
===================================================================
RCS file: /cvs/src/sys/sys/protosw.h,v
retrieving revision 1.40
diff -u -p -r1.40 protosw.h
--- sys/sys/protosw.h 21 Aug 2022 22:45:55 -0000 1.40
+++ sys/sys/protosw.h 21 Aug 2022 23:19:23 -0000
@@ -69,6 +69,7 @@ struct pr_usrreqs {
int (*pru_bind)(struct socket *, struct mbuf *, struct proc *);
int (*pru_listen)(struct socket *);
int (*pru_connect)(struct socket *, struct mbuf *);
+ int (*pru_accept)(struct socket *, struct mbuf *);
};
struct protosw {
@@ -291,8 +292,9 @@ pru_connect(struct socket *so, struct mb
static inline int
pru_accept(struct socket *so, struct mbuf *nam)
{
- return (*so->so_proto->pr_usrreqs->pru_usrreq)(so,
- PRU_ACCEPT, NULL, nam, NULL, curproc);
+ if (so->so_proto->pr_usrreqs->pru_accept)
+ return (*so->so_proto->pr_usrreqs->pru_accept)(so, nam);
+ return (EOPNOTSUPP);
}
static inline int
Index: sys/kern/uipc_usrreq.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.171
diff -u -p -r1.171 uipc_usrreq.c
--- sys/kern/uipc_usrreq.c 21 Aug 2022 22:45:55 -0000 1.171
+++ sys/kern/uipc_usrreq.c 21 Aug 2022 23:19:23 -0000
@@ -133,6 +133,7 @@ const struct pr_usrreqs uipc_usrreqs = {
.pru_bind = uipc_bind,
.pru_listen = uipc_listen,
.pru_connect = uipc_connect,
+ .pru_accept = uipc_accept,
};
void
@@ -244,18 +245,6 @@ uipc_usrreq(struct socket *so, int req,
unp_disconnect(unp);
break;
- case PRU_ACCEPT:
- /*
- * Pass back name of connected socket,
- * if it was bound and we are still connected
- * (our peer may have closed already!).
- */
- so2 = unp_solock_peer(so);
- uipc_setaddr(unp->unp_conn, nam);
- if (so2 != NULL && so2 != so)
- sounlock(so2);
- break;
-
case PRU_SHUTDOWN:
socantsendmore(so);
unp_shutdown(unp);
@@ -549,6 +538,24 @@ int
uipc_connect(struct socket *so, struct mbuf *nam)
{
return unp_connect(so, nam, curproc);
+}
+
+int
+uipc_accept(struct socket *so, struct mbuf *nam)
+{
+ struct socket *so2;
+ struct unpcb *unp = sotounpcb(so);
+
+ /*
+ * Pass back name of connected socket, if it was bound and
+ * we are still connected (our peer may have closed already!).
+ */
+ so2 = unp_solock_peer(so);
+ uipc_setaddr(unp->unp_conn, nam);
+
+ if (so2 != NULL && so2 != so)
+ sounlock(so2);
+ return (0);
}
int
Index: sys/net/pfkeyv2.c
===================================================================
RCS file: /cvs/src/sys/net/pfkeyv2.c,v
retrieving revision 1.238
diff -u -p -r1.238 pfkeyv2.c
--- sys/net/pfkeyv2.c 21 Aug 2022 22:45:55 -0000 1.238
+++ sys/net/pfkeyv2.c 21 Aug 2022 23:19:23 -0000
@@ -358,7 +358,6 @@ pfkeyv2_usrreq(struct socket *so, int re
switch (req) {
/* no connect, bind, accept. Socket is connected from the start */
case PRU_CONNECT2:
- case PRU_ACCEPT:
error = EOPNOTSUPP;
break;
Index: sys/net/rtsock.c
===================================================================
RCS file: /cvs/src/sys/net/rtsock.c,v
retrieving revision 1.338
diff -u -p -r1.338 rtsock.c
--- sys/net/rtsock.c 21 Aug 2022 22:45:55 -0000 1.338
+++ sys/net/rtsock.c 21 Aug 2022 23:19:23 -0000
@@ -234,7 +234,6 @@ route_usrreq(struct socket *so, int req,
switch (req) {
/* no connect, bind, accept. Socket is connected from the start */
case PRU_CONNECT2:
- case PRU_ACCEPT:
error = EOPNOTSUPP;
break;
Index: sys/netinet/ip_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_divert.c,v
retrieving revision 1.73
diff -u -p -r1.73 ip_divert.c
--- sys/netinet/ip_divert.c 21 Aug 2022 22:45:55 -0000 1.73
+++ sys/netinet/ip_divert.c 21 Aug 2022 23:19:23 -0000
@@ -292,7 +292,6 @@ divert_usrreq(struct socket *so, int req
break;
case PRU_CONNECT2:
- case PRU_ACCEPT:
case PRU_DISCONNECT:
case PRU_SENDOOB:
case PRU_FASTTIMO:
Index: sys/netinet/raw_ip.c
===================================================================
RCS file: /cvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.133
diff -u -p -r1.133 raw_ip.c
--- sys/netinet/raw_ip.c 21 Aug 2022 22:45:55 -0000 1.133
+++ sys/netinet/raw_ip.c 21 Aug 2022 23:19:23 -0000
@@ -543,7 +543,6 @@ rip_usrreq(struct socket *so, int req, s
/*
* Not supported.
*/
- case PRU_ACCEPT:
case PRU_SENDOOB:
case PRU_RCVD:
case PRU_RCVOOB:
Index: sys/netinet/tcp_usrreq.c
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.191
diff -u -p -r1.191 tcp_usrreq.c
--- sys/netinet/tcp_usrreq.c 21 Aug 2022 22:45:55 -0000 1.191
+++ sys/netinet/tcp_usrreq.c 21 Aug 2022 23:19:23 -0000
@@ -118,6 +118,7 @@ const struct pr_usrreqs tcp_usrreqs = {
.pru_bind = tcp_bind,
.pru_listen = tcp_listen,
.pru_connect = tcp_connect,
+ .pru_accept = tcp_accept,
};
static int pr_slowhz = PR_SLOWHZ;
@@ -237,20 +238,6 @@ tcp_usrreq(struct socket *so, int req, s
break;
/*
- * Accept a connection. Essentially all the work is
- * done at higher levels; just return the address
- * of the peer, storing through addr.
- */
- case PRU_ACCEPT:
-#ifdef INET6
- if (inp->inp_flags & INP_IPV6)
- in6_setpeeraddr(inp, nam);
- else
-#endif
- in_setpeeraddr(inp, nam);
- break;
-
- /*
* Mark the connection as being incapable of further output.
*/
case PRU_SHUTDOWN:
@@ -849,6 +836,37 @@ out:
return (error);
}
+/*
+ * Accept a connection. Essentially all the work is done at higher
+ * levels; just return the address of the peer, storing through addr.
+ */
+int
+tcp_accept(struct socket *so, struct mbuf *nam)
+{
+ struct inpcb *inp;
+ struct tcpcb *tp;
+ int error;
+ short ostate;
+
+ soassertlocked(so);
+
+ if ((error = tcp_sogetpcb(so, &inp, &tp)))
+ return (error);
+
+ if (so->so_options & SO_DEBUG)
+ ostate = tp->t_state;
+
+#ifdef INET6
+ if (inp->inp_flags & INP_IPV6)
+ in6_setpeeraddr(inp, nam);
+ else
+#endif
+ in_setpeeraddr(inp, nam);
+
+ if (so->so_options & SO_DEBUG)
+ tcp_trace(TA_USER, ostate, tp, tp, NULL, PRU_ACCEPT, 0);
+ return (error);
+}
/*
* Initiate (or continue) disconnect.
Index: sys/netinet/tcp_var.h
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_var.h,v
retrieving revision 1.144
diff -u -p -r1.144 tcp_var.h
--- sys/netinet/tcp_var.h 21 Aug 2022 22:45:55 -0000 1.144
+++ sys/netinet/tcp_var.h 21 Aug 2022 23:19:23 -0000
@@ -717,6 +717,7 @@ int tcp_detach(struct socket *);
int tcp_bind(struct socket *, struct mbuf *, struct proc *);
int tcp_listen(struct socket *);
int tcp_connect(struct socket *, struct mbuf *);
+int tcp_accept(struct socket *, struct mbuf *);
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.285
diff -u -p -r1.285 udp_usrreq.c
--- sys/netinet/udp_usrreq.c 21 Aug 2022 22:45:55 -0000 1.285
+++ sys/netinet/udp_usrreq.c 21 Aug 2022 23:19:23 -0000
@@ -1080,10 +1080,6 @@ udp_usrreq(struct socket *so, int req, s
error = EOPNOTSUPP;
break;
- case PRU_ACCEPT:
- error = EOPNOTSUPP;
- break;
-
case PRU_DISCONNECT:
#ifdef INET6
if (inp->inp_flags & INP_IPV6) {
Index: sys/netinet6/ip6_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_divert.c,v
retrieving revision 1.72
diff -u -p -r1.72 ip6_divert.c
--- sys/netinet6/ip6_divert.c 21 Aug 2022 22:45:55 -0000 1.72
+++ sys/netinet6/ip6_divert.c 21 Aug 2022 23:19:23 -0000
@@ -298,7 +298,6 @@ divert6_usrreq(struct socket *so, int re
break;
case PRU_CONNECT2:
- case PRU_ACCEPT:
case PRU_DISCONNECT:
case PRU_SENDOOB:
case PRU_FASTTIMO:
Index: sys/netinet6/raw_ip6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.153
diff -u -p -r1.153 raw_ip6.c
--- sys/netinet6/raw_ip6.c 21 Aug 2022 22:45:55 -0000 1.153
+++ sys/netinet6/raw_ip6.c 21 Aug 2022 23:19:23 -0000
@@ -660,7 +660,6 @@ rip6_usrreq(struct socket *so, int req,
/*
* Not supported.
*/
- case PRU_ACCEPT:
case PRU_SENDOOB:
case PRU_RCVD:
case PRU_RCVOOB:
Index: sys/sys/unpcb.h
===================================================================
RCS file: /cvs/src/sys/sys/unpcb.h,v
retrieving revision 1.30
diff -u -p -r1.30 unpcb.h
--- sys/sys/unpcb.h 21 Aug 2022 22:45:55 -0000 1.30
+++ sys/sys/unpcb.h 21 Aug 2022 23:19:23 -0000
@@ -116,6 +116,7 @@ int uipc_detach(struct socket *);
int uipc_bind(struct socket *, struct mbuf *, struct proc *);
int uipc_listen(struct socket *);
int uipc_connect(struct socket *, struct mbuf *);
+int uipc_accept(struct socket *, struct mbuf *);
void unp_init(void);
int unp_bind(struct unpcb *, struct mbuf *, struct proc *);
