Skip to contentSkip to conversation

svc: Modify svc_create_xprt to return local port

RFC PATCH New Tom Tucker 1 participant 1 message Oct 9, 2007

Subsystems (3)
Networking NFS client NFS server
lore
Share & tools
lore

Tom Tucker

author
#0 lore raw

RFC PATCH 1/1 svc: Modify svc_create_xprt to return local port

This patch fixes a regression introduced by the svc transport switch as follows:

- Listening endpoints need to have their local address set properly.

- svc_create_xprt needs to return the local port number since the the nfs4 callback service uses the return value to determine the local port elected by the transport when binding to zero.

Signed-off-by Tom Tucker <[email protected]>

---

 net/sunrpc/svc_xprt.c |   19 ++++++++++++++++++-
 net/sunrpc/svcsock.c  |    8 ++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
net/sunrpc/svc_xprt.c +18 -1
index b580d4c..d35195e 100644
@@ -159,6 +159,23 @@ void svc_xprt_init(struct svc_xprt_class
 }
 EXPORT_SYMBOL_GPL(svc_xprt_init);
 
+static int svc_local_port(struct svc_xprt *xprt)
+{
+	int ret = 0;
+	switch (xprt->xpt_local.ss_family) {
+	case AF_INET:
+		ret = ntohs(((struct sockaddr_in *)
+			     &xprt->xpt_local)->sin_port);
+		break;
+	case AF_INET6:
+		ret = ntohs(((struct sockaddr_in6 *)
+			     &xprt->xpt_local)->sin6_port);
+		break;
+	}
+	dprintk("svc: local port for xprt %p is %d\n", xprt, ret);
+	return ret;
+}
+
 int svc_create_xprt(struct svc_serv *serv, char *xprt_name, unsigned short port,
 		    int flags)
 {

@@ -176,7 +193,6 @@ int svc_create_xprt(struct svc_serv *ser
 			spin_unlock(&svc_xprt_class_lock);
 			if (try_module_get(xcl->xcl_owner)) {
 				struct svc_xprt *newxprt;
-				ret = 0;
 				newxprt = xcl->xcl_ops->xpo_create
 					(serv,
 					 (struct sockaddr *)&sin, sizeof(sin),

@@ -191,6 +207,7 @@ int svc_create_xprt(struct svc_serv *ser
 					list_add(&newxprt->xpt_list,
 						 &serv->sv_permsocks);
 					spin_unlock_bh(&serv->sv_lock);
+					ret = svc_local_port(newxprt);
 				}
 			}
 			goto out;
net/sunrpc/svcsock.c +8 -0
index 7838b27..e906ce1 100644
@@ -1278,6 +1278,8 @@ svc_create_socket(struct svc_serv *serv,
 	int		error;
 	int		type;
 	char		buf[RPC_MAX_ADDRBUFLEN];
+	struct sockaddr	newsin;
+	int		newlen;
 
 	dprintk("svc: svc_create_socket(%s, %d, %s)\n",
 			serv->sv_program->pg_name, protocol,

@@ -1301,6 +1303,11 @@ svc_create_socket(struct svc_serv *serv,
 	error = kernel_bind(sock, sin, len);
 	if (error < 0)
 		goto bummer;
+	
+	newlen = len;
+	error = kernel_getsockname(sock, &newsin, &newlen);
+	if (error < 0)
+		goto bummer;
 
 	if (protocol == IPPROTO_TCP) {
 		if ((error = kernel_listen(sock, 64)) < 0)

@@ -1308,6 +1315,7 @@ svc_create_socket(struct svc_serv *serv,
 	}
 
 	if ((svsk = svc_setup_socket(serv, sock, &error, flags)) != NULL) {
+		memcpy(&svsk->sk_xprt.xpt_local, &newsin, newlen);
 		svc_xprt_received(&svsk->sk_xprt);
 		return (struct svc_xprt *)svsk;
 	}

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs