ok?
Index: sys/kern/uipc_usrreq.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.170
diff -u -p -r1.170 uipc_usrreq.c
--- sys/kern/uipc_usrreq.c 21 Aug 2022 17:30:21 -0000 1.170
+++ sys/kern/uipc_usrreq.c 21 Aug 2022 18:57:03 -0000
@@ -132,6 +132,7 @@ const struct pr_usrreqs uipc_usrreqs = {
.pru_detach = uipc_detach,
.pru_bind = uipc_bind,
.pru_listen = uipc_listen,
+ .pru_connect = uipc_connect,
};
void
@@ -224,10 +225,6 @@ uipc_usrreq(struct socket *so, int req,
switch (req) {
- case PRU_CONNECT:
- error = unp_connect(so, nam, p);
- break;
-
case PRU_CONNECT2:
error = unp_connect2(so, (struct socket *)nam);
if (!error) {
@@ -546,6 +543,12 @@ uipc_listen(struct socket *so)
if (unp->unp_vnode == NULL)
return (EINVAL);
return (0);
+}
+
+int
+uipc_connect(struct socket *so, struct mbuf *nam)
+{
+ return unp_connect(so, nam, curproc);
}
int
Index: sys/net/pfkeyv2.c
===================================================================
RCS file: /cvs/src/sys/net/pfkeyv2.c,v
retrieving revision 1.237
diff -u -p -r1.237 pfkeyv2.c
--- sys/net/pfkeyv2.c 21 Aug 2022 17:30:21 -0000 1.237
+++ sys/net/pfkeyv2.c 21 Aug 2022 18:57:03 -0000
@@ -357,7 +357,6 @@ pfkeyv2_usrreq(struct socket *so, int re
switch (req) {
/* no connect, bind, accept. Socket is connected from the start */
- case PRU_CONNECT:
case PRU_CONNECT2:
case PRU_ACCEPT:
error = EOPNOTSUPP;
Index: sys/net/rtsock.c
===================================================================
RCS file: /cvs/src/sys/net/rtsock.c,v
retrieving revision 1.337
diff -u -p -r1.337 rtsock.c
--- sys/net/rtsock.c 21 Aug 2022 17:30:21 -0000 1.337
+++ sys/net/rtsock.c 21 Aug 2022 18:57:03 -0000
@@ -233,7 +233,6 @@ route_usrreq(struct socket *so, int req,
switch (req) {
/* no connect, bind, accept. Socket is connected from the start */
- case PRU_CONNECT:
case PRU_CONNECT2:
case PRU_ACCEPT:
error = EOPNOTSUPP;
Index: sys/netinet/ip_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_divert.c,v
retrieving revision 1.72
diff -u -p -r1.72 ip_divert.c
--- sys/netinet/ip_divert.c 21 Aug 2022 17:30:21 -0000 1.72
+++ sys/netinet/ip_divert.c 21 Aug 2022 18:57:03 -0000
@@ -291,7 +291,6 @@ divert_usrreq(struct socket *so, int req
case PRU_SENSE:
break;
- case PRU_CONNECT:
case PRU_CONNECT2:
case PRU_ACCEPT:
case PRU_DISCONNECT:
Index: sys/netinet/ip_gre.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_gre.c,v
retrieving revision 1.76
diff -u -p -r1.76 ip_gre.c
--- sys/netinet/ip_gre.c 20 Aug 2022 23:48:58 -0000 1.76
+++ sys/netinet/ip_gre.c 21 Aug 2022 18:57:03 -0000
@@ -66,6 +66,7 @@ const struct pr_usrreqs gre_usrreqs = {
.pru_attach = rip_attach,
.pru_detach = rip_detach,
.pru_bind = rip_bind,
+ .pru_connect = rip_connect,
};
int
Index: sys/netinet/ip_var.h
===================================================================
RCS file: /cvs/src/sys/netinet/ip_var.h,v
retrieving revision 1.98
diff -u -p -r1.98 ip_var.h
--- sys/netinet/ip_var.h 20 Aug 2022 23:48:58 -0000 1.98
+++ sys/netinet/ip_var.h 21 Aug 2022 18:57:03 -0000
@@ -261,6 +261,7 @@ int rip_usrreq(struct socket *,
int rip_attach(struct socket *, int);
int rip_detach(struct socket *);
int rip_bind(struct socket *so, struct mbuf *, struct proc *);
+int rip_connect(struct socket *, struct mbuf *);
#ifdef MROUTING
extern struct socket *ip_mrouter[]; /* multicast routing daemon */
#endif
Index: sys/netinet/raw_ip.c
===================================================================
RCS file: /cvs/src/sys/netinet/raw_ip.c,v
retrieving revision 1.132
diff -u -p -r1.132 raw_ip.c
--- sys/netinet/raw_ip.c 21 Aug 2022 17:30:21 -0000 1.132
+++ sys/netinet/raw_ip.c 21 Aug 2022 18:57:03 -0000
@@ -108,6 +108,7 @@ const struct pr_usrreqs rip_usrreqs = {
.pru_attach = rip_attach,
.pru_detach = rip_detach,
.pru_bind = rip_bind,
+ .pru_connect = rip_connect,
};
/*
@@ -486,17 +487,6 @@ rip_usrreq(struct socket *so, int req, s
in_pcbdetach(inp);
break;
- case PRU_CONNECT:
- {
- struct sockaddr_in *addr;
-
- if ((error = in_nam2sin(nam, &addr)))
- break;
- inp->inp_faddr = addr->sin_addr;
- soisconnected(so);
- break;
- }
-
case PRU_CONNECT2:
error = EOPNOTSUPP;
break;
@@ -642,5 +632,23 @@ rip_bind(struct socket *so, struct mbuf
inp->inp_laddr = addr->sin_addr;
+ return (0);
+}
+
+int
+rip_connect(struct socket *so, struct mbuf *nam)
+{
+ struct inpcb *inp = sotoinpcb(so);
+ struct sockaddr_in *addr;
+ int error;
+
+ soassertlocked(so);
+
+ if ((error = in_nam2sin(nam, &addr)))
+ return (error);
+
+ inp->inp_faddr = addr->sin_addr;
+ soisconnected(so);
+
return (0);
}
Index: sys/netinet/tcp_usrreq.c
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_usrreq.c,v
retrieving revision 1.190
diff -u -p -r1.190 tcp_usrreq.c
--- sys/netinet/tcp_usrreq.c 21 Aug 2022 17:30:21 -0000 1.190
+++ sys/netinet/tcp_usrreq.c 21 Aug 2022 18:57:03 -0000
@@ -117,6 +117,7 @@ const struct pr_usrreqs tcp_usrreqs = {
.pru_detach = tcp_detach,
.pru_bind = tcp_bind,
.pru_listen = tcp_listen,
+ .pru_connect = tcp_connect,
};
static int pr_slowhz = PR_SLOWHZ;
@@ -214,67 +215,6 @@ tcp_usrreq(struct socket *so, int req, s
switch (req) {
/*
- * Initiate connection to peer.
- * Create a template for use in transmissions on this connection.
- * Enter SYN_SENT state, and mark socket as connecting.
- * Start keep-alive timer, and seed output sequence space.
- * Send initial segment on connection.
- */
- case PRU_CONNECT:
-#ifdef INET6
- if (inp->inp_flags & INP_IPV6) {
- struct sockaddr_in6 *sin6;
-
- if ((error = in6_nam2sin6(nam, &sin6)))
- break;
- if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) ||
- IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) {
- error = EINVAL;
- break;
- }
- error = in6_pcbconnect(inp, nam);
- } else
-#endif /* INET6 */
- {
- struct sockaddr_in *sin;
-
- if ((error = in_nam2sin(nam, &sin)))
- break;
- if ((sin->sin_addr.s_addr == INADDR_ANY) ||
- (sin->sin_addr.s_addr == INADDR_BROADCAST) ||
- IN_MULTICAST(sin->sin_addr.s_addr) ||
- in_broadcast(sin->sin_addr, inp->inp_rtableid)) {
- error = EINVAL;
- break;
- }
- error = in_pcbconnect(inp, nam);
- }
- if (error)
- break;
-
- tp->t_template = tcp_template(tp);
- if (tp->t_template == 0) {
- in_pcbdisconnect(inp);
- error = ENOBUFS;
- break;
- }
-
- so->so_state |= SS_CONNECTOUT;
-
- /* Compute window scaling to request. */
- tcp_rscale(tp, sb_max);
-
- soisconnecting(so);
- tcpstat_inc(tcps_connattempt);
- tp->t_state = TCPS_SYN_SENT;
- TCP_TIMER_ARM(tp, TCPT_KEEP, tcptv_keep_init);
- tcp_set_iss_tsm(tp);
- tcp_sendseqinit(tp);
- tp->snd_last = tp->snd_una;
- error = tcp_output(tp);
- break;
-
- /*
* Create a TCP connection between two sockets.
*/
case PRU_CONNECT2:
@@ -825,6 +765,90 @@ out:
tcp_trace(TA_USER, ostate, tp, otp, NULL, PRU_LISTEN, 0);
return (error);
}
+
+/*
+ * Initiate connection to peer.
+ * Create a template for use in transmissions on this connection.
+ * Enter SYN_SENT state, and mark socket as connecting.
+ * Start keep-alive timer, and seed output sequence space.
+ * Send initial segment on connection.
+ */
+int
+tcp_connect(struct socket *so, struct mbuf *nam)
+{
+ struct inpcb *inp;
+ struct tcpcb *tp, *otp = NULL;
+ int error;
+ short ostate;
+
+ soassertlocked(so);
+
+ if ((error = tcp_sogetpcb(so, &inp, &tp)))
+ return (error);
+
+ if (so->so_options & SO_DEBUG) {
+ otp = tp;
+ ostate = tp->t_state;
+ }
+
+#ifdef INET6
+ if (inp->inp_flags & INP_IPV6) {
+ struct sockaddr_in6 *sin6;
+
+ if ((error = in6_nam2sin6(nam, &sin6)))
+ goto out;
+ if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr) ||
+ IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) {
+ error = EINVAL;
+ goto out;
+ }
+ error = in6_pcbconnect(inp, nam);
+ } else
+#endif /* INET6 */
+ {
+ struct sockaddr_in *sin;
+
+ if ((error = in_nam2sin(nam, &sin)))
+ goto out;
+ if ((sin->sin_addr.s_addr == INADDR_ANY) ||
+ (sin->sin_addr.s_addr == INADDR_BROADCAST) ||
+ IN_MULTICAST(sin->sin_addr.s_addr) ||
+ in_broadcast(sin->sin_addr, inp->inp_rtableid)) {
+ error = EINVAL;
+ goto out;
+ }
+ error = in_pcbconnect(inp, nam);
+ }
+ if (error)
+ goto out;
+
+ tp->t_template = tcp_template(tp);
+ if (tp->t_template == 0) {
+ in_pcbdisconnect(inp);
+ error = ENOBUFS;
+ goto out;
+ }
+
+ so->so_state |= SS_CONNECTOUT;
+
+ /* Compute window scaling to request. */
+ tcp_rscale(tp, sb_max);
+
+ soisconnecting(so);
+ tcpstat_inc(tcps_connattempt);
+ tp->t_state = TCPS_SYN_SENT;
+ TCP_TIMER_ARM(tp, TCPT_KEEP, tcptv_keep_init);
+ tcp_set_iss_tsm(tp);
+ tcp_sendseqinit(tp);
+ tp->snd_last = tp->snd_una;
+ error = tcp_output(tp);
+
+out:
+ if (otp)
+ tcp_trace(TA_USER, ostate, tp, otp, NULL, PRU_CONNECT, 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.143
diff -u -p -r1.143 tcp_var.h
--- sys/netinet/tcp_var.h 21 Aug 2022 17:30:21 -0000 1.143
+++ sys/netinet/tcp_var.h 21 Aug 2022 18:57:03 -0000
@@ -716,6 +716,7 @@ int tcp_attach(struct socket *, int);
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 *);
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.284
diff -u -p -r1.284 udp_usrreq.c
--- sys/netinet/udp_usrreq.c 21 Aug 2022 17:30:21 -0000 1.284
+++ sys/netinet/udp_usrreq.c 21 Aug 2022 18:57:03 -0000
@@ -127,6 +127,7 @@ const struct pr_usrreqs udp_usrreqs = {
.pru_attach = udp_attach,
.pru_detach = udp_detach,
.pru_bind = udp_bind,
+ .pru_connect = udp_connect,
};
const struct sysctl_bounded_args udpctl_vars[] = {
@@ -1075,28 +1076,6 @@ udp_usrreq(struct socket *so, int req, s
*/
switch (req) {
- case PRU_CONNECT:
-#ifdef INET6
- if (inp->inp_flags & INP_IPV6) {
- if (!IN6_IS_ADDR_UNSPECIFIED(&inp->inp_faddr6)) {
- error = EISCONN;
- break;
- }
- error = in6_pcbconnect(inp, addr);
- } else
-#endif /* INET6 */
- {
- if (inp->inp_faddr.s_addr != INADDR_ANY) {
- error = EISCONN;
- break;
- }
- error = in_pcbconnect(inp, addr);
- }
-
- if (error == 0)
- soisconnected(so);
- break;
-
case PRU_CONNECT2:
error = EOPNOTSUPP;
break;
@@ -1275,6 +1254,34 @@ udp_bind(struct socket *so, struct mbuf
soassertlocked(so);
return in_pcbbind(inp, addr, p);
+}
+
+int
+udp_connect(struct socket *so, struct mbuf *addr)
+{
+ struct inpcb *inp = sotoinpcb(so);
+ int error;
+
+ soassertlocked(so);
+
+#ifdef INET6
+ if (inp->inp_flags & INP_IPV6) {
+ if (!IN6_IS_ADDR_UNSPECIFIED(&inp->inp_faddr6))
+ return (EISCONN);
+ error = in6_pcbconnect(inp, addr);
+ } else
+#endif /* INET6 */
+ {
+ if (inp->inp_faddr.s_addr != INADDR_ANY)
+ return (EISCONN);
+ error = in_pcbconnect(inp, addr);
+ }
+
+ if (error)
+ return (error);
+
+ soisconnected(so);
+ return (0);
}
/*
Index: sys/netinet/udp_var.h
===================================================================
RCS file: /cvs/src/sys/netinet/udp_var.h,v
retrieving revision 1.39
diff -u -p -r1.39 udp_var.h
--- sys/netinet/udp_var.h 20 Aug 2022 23:48:58 -0000 1.39
+++ sys/netinet/udp_var.h 21 Aug 2022 18:57:03 -0000
@@ -144,5 +144,6 @@ int udp_usrreq(struct socket *,
int udp_attach(struct socket *, int);
int udp_detach(struct socket *);
int udp_bind(struct socket *, struct mbuf *, struct proc *);
+int udp_connect(struct socket *, struct mbuf *);
#endif /* _KERNEL */
#endif /* _NETINET_UDP_VAR_H_ */
Index: sys/netinet6/ip6_divert.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_divert.c,v
retrieving revision 1.71
diff -u -p -r1.71 ip6_divert.c
--- sys/netinet6/ip6_divert.c 21 Aug 2022 17:30:21 -0000 1.71
+++ sys/netinet6/ip6_divert.c 21 Aug 2022 18:57:03 -0000
@@ -297,7 +297,6 @@ divert6_usrreq(struct socket *so, int re
case PRU_SENSE:
break;
- case PRU_CONNECT:
case PRU_CONNECT2:
case PRU_ACCEPT:
case PRU_DISCONNECT:
Index: sys/netinet6/ip6_var.h
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_var.h,v
retrieving revision 1.96
diff -u -p -r1.96 ip6_var.h
--- sys/netinet6/ip6_var.h 20 Aug 2022 23:48:58 -0000 1.96
+++ sys/netinet6/ip6_var.h 21 Aug 2022 18:57:03 -0000
@@ -356,6 +356,7 @@ int rip6_usrreq(struct socket *,
int rip6_attach(struct socket *, int);
int rip6_detach(struct socket *);
int rip6_bind(struct socket *, struct mbuf *, struct proc *);
+int rip6_connect(struct socket *, struct mbuf *);
int rip6_sysctl(int *, u_int, void *, size_t *, void *, size_t);
int dest6_input(struct mbuf **, int *, int, int);
Index: sys/netinet6/raw_ip6.c
===================================================================
RCS file: /cvs/src/sys/netinet6/raw_ip6.c,v
retrieving revision 1.152
diff -u -p -r1.152 raw_ip6.c
--- sys/netinet6/raw_ip6.c 21 Aug 2022 17:30:21 -0000 1.152
+++ sys/netinet6/raw_ip6.c 21 Aug 2022 18:57:03 -0000
@@ -110,6 +110,7 @@ const struct pr_usrreqs rip6_usrreqs = {
.pru_attach = rip6_attach,
.pru_detach = rip6_detach,
.pru_bind = rip6_bind,
+ .pru_connect = rip6_connect,
};
/*
@@ -605,23 +606,6 @@ rip6_usrreq(struct socket *so, int req,
in_pcbdetach(in6p);
break;
- case PRU_CONNECT:
- {
- struct sockaddr_in6 *addr;
- struct in6_addr *in6a = NULL;
-
- if ((error = in6_nam2sin6(nam, &addr)))
- break;
- /* Source address selection. XXX: need pcblookup? */
- error = in6_pcbselsrc(&in6a, addr, in6p, in6p->inp_outputopts6);
- if (error)
- break;
- in6p->inp_laddr6 = *in6a;
- in6p->inp_faddr6 = addr->sin6_addr;
- soisconnected(so);
- break;
- }
-
case PRU_CONNECT2:
error = EOPNOTSUPP;
break;
@@ -778,6 +762,30 @@ rip6_bind(struct socket *so, struct mbuf
return (error);
in6p->inp_laddr6 = addr->sin6_addr;
+ return (0);
+}
+
+int
+rip6_connect(struct socket *so, struct mbuf *nam)
+{
+ struct inpcb *in6p = sotoinpcb(so);
+ struct sockaddr_in6 *addr;
+ struct in6_addr *in6a = NULL;
+ int error;
+
+ soassertlocked(so);
+
+ if ((error = in6_nam2sin6(nam, &addr)))
+ return (error);
+
+ /* Source address selection. XXX: need pcblookup? */
+ error = in6_pcbselsrc(&in6a, addr, in6p, in6p->inp_outputopts6);
+ if (error)
+ return (error);
+
+ in6p->inp_laddr6 = *in6a;
+ in6p->inp_faddr6 = addr->sin6_addr;
+ soisconnected(so);
return (0);
}
Index: sys/sys/protosw.h
===================================================================
RCS file: /cvs/src/sys/sys/protosw.h,v
retrieving revision 1.39
diff -u -p -r1.39 protosw.h
--- sys/sys/protosw.h 21 Aug 2022 17:30:21 -0000 1.39
+++ sys/sys/protosw.h 21 Aug 2022 18:57:04 -0000
@@ -68,6 +68,7 @@ struct pr_usrreqs {
int (*pru_detach)(struct socket *);
int (*pru_bind)(struct socket *, struct mbuf *, struct proc *);
int (*pru_listen)(struct socket *);
+ int (*pru_connect)(struct socket *, struct mbuf *);
};
struct protosw {
@@ -282,8 +283,9 @@ pru_listen(struct socket *so)
static inline int
pru_connect(struct socket *so, struct mbuf *nam)
{
- return (*so->so_proto->pr_usrreqs->pru_usrreq)(so,
- PRU_CONNECT, NULL, nam, NULL, curproc);
+ if (so->so_proto->pr_usrreqs->pru_connect)
+ return (*so->so_proto->pr_usrreqs->pru_connect)(so, nam);
+ return (EOPNOTSUPP);
}
static inline int
Index: sys/sys/unpcb.h
===================================================================
RCS file: /cvs/src/sys/sys/unpcb.h,v
retrieving revision 1.29
diff -u -p -r1.29 unpcb.h
--- sys/sys/unpcb.h 21 Aug 2022 17:30:21 -0000 1.29
+++ sys/sys/unpcb.h 21 Aug 2022 18:57:04 -0000
@@ -115,6 +115,7 @@ int uipc_attach(struct socket *, int);
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 *);
void unp_init(void);
int unp_bind(struct unpcb *, struct mbuf *, struct proc *);
