Attachment 152566 Details for Bug 227602 – patch 1 -- Increase size of rpc send/receive buffers (and skip portmap call)

[patch] patch 1 -- Increase size of rpc send/receive buffers (and skip portmap call)

nfs-utils-1.0.6-gss-rpc-bufsize.patch (text/plain), 4.07 KB, created by Jeff Layton on 2007-04-13 18:08:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-04-13 18:08:33 UTC

Size: 4.07 KB

patch

obsolete

>--- nfs-utils-1.0.6/utils/gssd/gssd_proc.c.~1~
>+++ nfs-utils-1.0.6/utils/gssd/gssd_proc.c
>@@ -431,8 +431,12 @@ int create_auth_rpc_client(struct clnt_i
> 	AUTH			*auth = NULL;
> 	uid_t			save_uid = -1;
> 	int			retval = -1;
>+	int			errcode;
> 	OM_uint32		min_stat;
> 	char			rpc_errmsg[1024];
>+	int			sockp = RPC_ANYSOCK;
>+	int			sendsz = 32768, recvsz = 32768;
>+	struct addrinfo		ai_hints, *a = NULL;
> 
> 	sec.qop = GSS_C_QOP_DEFAULT;
> 	sec.svc = RPCSEC_GSS_SVC_NONE;
>@@ -444,7 +448,10 @@ int create_auth_rpc_client(struct clnt_i
> 	}
> 	else if (authtype == AUTHTYPE_SPKM3) {
> 		sec.mech = (gss_OID)&spkm3oid;
>-		sec.req_flags = GSS_C_ANON_FLAG;
>+		/* XXX sec.req_flags = GSS_C_ANON_FLAG;
>+		 * Need a way to switch....
>+		 */
>+		sec.req_flags = GSS_C_MUTUAL_FLAG;
> 	}
> 	else {
> 		printerr(0, "ERROR: Invalid authentication type (%d) "
>@@ -482,21 +489,82 @@ int create_auth_rpc_client(struct clnt_i
> 
> 	printerr(2, "creating %s client for server %s\n", clp->protocol,
> 			clp->servername);
>-	if ((rpc_clnt = clnt_create(clp->servername, clp->prog, clp->vers,
>-					clp->protocol)) == NULL) {
>-		snprintf(rpc_errmsg, sizeof(rpc_errmsg),
>-			 "WARNING: can't create rpc_clnt for server "
>-			 "%s for user with uid %d", clp->servername, uid);
>-		printerr(0, "%s\n", clnt_spcreateerror(rpc_errmsg));
>+
>+	memset(&ai_hints, '\0', sizeof(ai_hints));
>+	ai_hints.ai_family = PF_INET;
>+	ai_hints.ai_flags |= AI_CANONNAME;
>+	if ((strcmp(clp->protocol, "tcp")) == 0) {
>+		ai_hints.ai_socktype = SOCK_STREAM;
>+		ai_hints.ai_protocol = IPPROTO_TCP;
>+	} else if ((strcmp(clp->protocol, "udp")) == 0) {
>+		ai_hints.ai_socktype = SOCK_DGRAM;
>+		ai_hints.ai_protocol = IPPROTO_UDP;
>+	} else {
>+		printerr(0, "WARNING: unrecognized protocol, '%s', requested "
>+			 "for connection to server %s for user with uid %d",
>+			 clp->protocol, clp->servername, uid);
> 		goto out_fail;
> 	}
>-
>+ 
>+	errcode = getaddrinfo(clp->servername, "nfs",
>+			      &ai_hints, &a);
>+	if (errcode) {
>+		printerr(0, "WARNING: Error from getaddrinfo for server "
>+			 "'%s': %s", clp->servername, gai_strerror(errcode));
>+		goto out_fail;
>+	}
>+ 
>+	if (a == NULL) {
>+		printerr(0, "WARNING: No address information found for "
>+			 "connection to server %s for user with uid %d",
>+			 clp->servername, uid);
>+		goto out_fail;
>+	}
>+	if (a->ai_protocol == IPPROTO_TCP) {
>+		if ((rpc_clnt = clnttcp_create(
>+					(struct sockaddr_in *) a->ai_addr,
>+					clp->prog, clp->vers, &sockp,
>+					sendsz, recvsz)) == NULL) {
>+			snprintf(rpc_errmsg, sizeof(rpc_errmsg),
>+				 "WARNING: can't create tcp rpc_clnt "
>+				 "for server %s for user with uid %d",
>+				 clp->servername, uid);
>+			printerr(0, "%s\n",
>+				 clnt_spcreateerror(rpc_errmsg));
>+			goto out_fail;
>+		}
>+	} else if (a->ai_protocol == IPPROTO_UDP) {
>+		const struct timeval timeout = {5, 0};
>+		if ((rpc_clnt = clntudp_bufcreate(
>+					(struct sockaddr_in *) a->ai_addr,
>+					clp->prog, clp->vers, timeout,
>+					&sockp, sendsz, recvsz)) == NULL) {
>+			snprintf(rpc_errmsg, sizeof(rpc_errmsg),
>+				 "WARNING: can't create udp rpc_clnt "
>+				 "for server %s for user with uid %d",
>+				 clp->servername, uid);
>+			printerr(0, "%s\n",
>+				 clnt_spcreateerror(rpc_errmsg));
>+			goto out_fail;
>+		}
>+	} else {
>+		/* Shouldn't happen! */
>+		printerr(0, "ERROR: requested protocol '%s', but "
>+			 "got addrinfo with protocol %d",
>+			 clp->protocol, a->ai_protocol);
>+		goto out_fail;
>+	}
>+	/* We're done with this */
>+	freeaddrinfo(a);
>+	a = NULL;
>+  
> 	printerr(2, "creating context with server %s\n", clp->servicename);
> 	auth = authgss_create_default(rpc_clnt, clp->servicename, &sec);
> 	if (!auth) {
> 		/* Our caller should print appropriate message */
>-		printerr(2, "WARNING: Failed to create krb5 context for "
>+		printerr(2, "WARNING: Failed to create %s context for "
> 			    "user with uid %d for server %s\n",
>+			(authtype == AUTHTYPE_KRB5 ? "krb5":"spkm3"),
> 			 uid, clp->servername);
> 		goto out_fail;
> 	}
>@@ -521,6 +589,7 @@ int create_auth_rpc_client(struct clnt_i
> 	if (sec.cred != GSS_C_NO_CREDENTIAL)
> 		gss_release_cred(&min_stat, &sec.cred);
> 	if (rpc_clnt) clnt_destroy(rpc_clnt);
>+	if (a != NULL) freeaddrinfo(a);
> 
> 	return retval;
> }

Actions: View | Diff

Attachments on bug 227602: 152566 | 152568