summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeff <jeff@FreeBSD.org>2003-10-04 17:41:59 +0000
committerjeff <jeff@FreeBSD.org>2003-10-04 17:41:59 +0000
commitdaf04438572f986b4e7158eb0be7b2f17ba95a78 (patch)
tree77f7930403fdfb1ddffb6a44f724e24867c6e7e8
parent1fc48676923e2ae6881c21a44cff8df82d10fabb (diff)
downloadFreeBSD-src-daf04438572f986b4e7158eb0be7b2f17ba95a78.zip
FreeBSD-src-daf04438572f986b4e7158eb0be7b2f17ba95a78.tar.gz
- Consistently set sopt_dir.
Pointed out by: pete@isilon.com
-rw-r--r--sys/nfsclient/bootp_subr.c1
-rw-r--r--sys/nfsclient/krpc_subr.c1
-rw-r--r--sys/nfsclient/nfs_socket.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index d5ba661..d79ecf8 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -599,6 +599,7 @@ bootpc_call(struct bootpc_globalcontext *gctx, struct thread *td)
tv.tv_sec = 1;
tv.tv_usec = 0;
bzero(&sopt, sizeof(sopt));
+ sopt.sopt_dir = SOPT_SET;
sopt.sopt_level = SOL_SOCKET;
sopt.sopt_name = SO_RCVTIMEO;
sopt.sopt_val = &tv;
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index 4690104..ee401a2 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -222,6 +222,7 @@ krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
tv.tv_sec = 1;
tv.tv_usec = 0;
bzero(&sopt, sizeof sopt);
+ sopt.sopt_dir = SOPT_SET;
sopt.sopt_level = SOL_SOCKET;
sopt.sopt_name = SO_RCVTIMEO;
sopt.sopt_val = &tv;
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index aaa2f7a..43c28d3 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -288,6 +288,7 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep)
int val;
bzero(&sopt, sizeof sopt);
+ sopt.sopt_dir = SOPT_SET;
sopt.sopt_level = SOL_SOCKET;
sopt.sopt_name = SO_KEEPALIVE;
sopt.sopt_val = &val;
@@ -300,6 +301,7 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep)
int val;
bzero(&sopt, sizeof sopt);
+ sopt.sopt_dir = SOPT_SET;
sopt.sopt_level = IPPROTO_TCP;
sopt.sopt_name = TCP_NODELAY;
sopt.sopt_val = &val;
OpenPOWER on IntegriCloud