diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2024-03-20 22:29:51 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-03-20 22:29:51 +0000 |
| commit | a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 (patch) | |
| tree | 418502562183fb5b5494dee2f0a82403cd629d5b /sys | |
| parent | eba13bbc37ab4f45a8a3502d59c37d56d9a04ca5 (diff) | |
| download | src-a16ff32f04b5b891a2d9b0427a2fd9c48e866da3.tar.gz src-a16ff32f04b5b891a2d9b0427a2fd9c48e866da3.zip | |
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/rpc/clnt_rc.c | 8 | ||||
| -rw-r--r-- | sys/rpc/svc.c | 20 | ||||
| -rw-r--r-- | sys/rpc/svc.h | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/sys/rpc/clnt_rc.c b/sys/rpc/clnt_rc.c index b2ee4551149b..ebd52d305a4b 100644 --- a/sys/rpc/clnt_rc.c +++ b/sys/rpc/clnt_rc.c @@ -42,6 +42,8 @@ #include <sys/time.h> #include <sys/uio.h> +#include <netinet/tcp.h> + #include <rpc/rpc.h> #include <rpc/rpc_com.h> #include <rpc/krpc.h> @@ -212,6 +214,12 @@ clnt_reconnect_connect(CLIENT *cl) goto out; } } + if (newclient != NULL) { + int optval = 1; + + (void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP, + &optval, sizeof(optval)); + } if (newclient != NULL && rc->rc_reconcall != NULL) (*rc->rc_reconcall)(newclient, rc->rc_reconarg, rc->rc_ucred); diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index f96c00dd2f2a..99678f693a3e 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -50,6 +50,7 @@ #include <sys/mbuf.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/protosw.h> #include <sys/queue.h> #include <sys/socketvar.h> #include <sys/systm.h> @@ -57,6 +58,8 @@ #include <sys/sx.h> #include <sys/ucred.h> +#include <netinet/tcp.h> + #include <rpc/rpc.h> #include <rpc/rpcb_clnt.h> #include <rpc/replay.h> @@ -988,6 +991,23 @@ svc_getreq(SVCXPRT *xprt, struct svc_req **rqstp_ret) } /* + * Defer enabling DDP until the first non-NULLPROC RPC + * is received to allow STARTTLS authentication to + * enable TLS offload first. + */ + if (xprt->xp_doneddp == 0 && r->rq_proc != NULLPROC && + atomic_cmpset_int(&xprt->xp_doneddp, 0, 1)) { + if (xprt->xp_socket->so_proto->pr_protocol == + IPPROTO_TCP) { + int optval = 1; + + (void)so_setsockopt(xprt->xp_socket, + IPPROTO_TCP, TCP_USE_DDP, &optval, + sizeof(optval)); + } + } + + /* * Everything checks out, return request to caller. */ *rqstp_ret = r; diff --git a/sys/rpc/svc.h b/sys/rpc/svc.h index 87862d4b9001..cfeb2a92c54e 100644 --- a/sys/rpc/svc.h +++ b/sys/rpc/svc.h @@ -185,6 +185,7 @@ typedef struct __rpc_svcxprt { int xp_ngrps; /* Cred. from TLS cert. */ uid_t xp_uid; gid_t *xp_gidp; + int xp_doneddp; #else int xp_fd; u_short xp_port; /* associated port number */ |