From dcee93dcf9a9413876bb2ff2be2c8bf5d984f66f Mon Sep 17 00:00:00 2001 From: David Malone Date: Mon, 12 Jul 2004 21:42:33 +0000 Subject: [PATCH] Rename Alfred's kern_setsockopt to so_setsockopt, as this seems a a better name. I have a kern_[sg]etsockopt which I plan to commit shortly, but the arguments to these function will be quite different from so_setsockopt. Approved by: alfred --- sys/kern/uipc_socket.c | 2 +- sys/nfsclient/nfs_socket.c | 4 ++-- sys/sys/socketvar.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 6787573ef1a..4d58bbc33d8 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1546,7 +1546,7 @@ sooptcopyin(sopt, buf, len, minlen) * XXX: optlen is size_t, not socklen_t */ int -kern_setsockopt(struct socket *so, int level, int optname, void *optval, +so_setsockopt(struct socket *so, int level, int optname, void *optval, size_t optlen) { struct sockopt sopt; diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 191d5d27350..e875f5ca964 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -176,8 +176,8 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep) nmp->nm_soflags = so->so_proto->pr_flags; opt = 1; - (void)kern_setsockopt(so, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); - (void)kern_setsockopt(so, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)); + (void)so_setsockopt(so, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); + (void)so_setsockopt(so, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)); /* * Some servers require that the client port be a reserved port number. diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index cfe061b14fc..8fad3673cd2 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -438,8 +438,8 @@ struct uio; /* * From uipc_socket and friends */ -int kern_setsockopt(struct socket *so, int level, int optname, - void *optval, size_t optlen); +int so_setsockopt(struct socket *so, int level, int optname, + void *optval, size_t optlen); int sockargs(struct mbuf **mp, caddr_t buf, int buflen, int type); int getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len); void sbappend(struct sockbuf *sb, struct mbuf *m);