You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.3 KiB
68 lines
2.3 KiB
7 years ago
|
diff --git a/src/clnt_vc.c b/src/clnt_vc.c
|
||
|
|
index 61264d4..ebe28f8 100644
|
||
|
|
--- a/src/clnt_vc.c
|
||
|
|
+++ b/src/clnt_vc.c
|
||
|
|
@@ -72,6 +72,8 @@
|
||
|
|
#define CMGROUP_MAX 16
|
||
|
|
#define SCM_CREDS 0x03 /* process creds (struct cmsgcred) */
|
||
|
|
|
||
|
|
+#undef rpc_createerr /* make it clear it is a thread safe variable */
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Credentials structure, used to verify the identity of a peer
|
||
|
|
* process that has sent us a message. This is allocated by the
|
||
|
|
@@ -188,10 +190,11 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz)
|
||
|
|
cl = (CLIENT *)mem_alloc(sizeof (*cl));
|
||
|
|
ct = (struct ct_data *)mem_alloc(sizeof (*ct));
|
||
|
|
if ((cl == (CLIENT *)NULL) || (ct == (struct ct_data *)NULL)) {
|
||
|
|
+ struct rpc_createerr *ce = &get_rpc_createerr();
|
||
|
|
+ ce->cf_stat = RPC_SYSTEMERROR;
|
||
|
|
+ ce->cf_error.re_errno = errno;
|
||
|
|
(void) syslog(LOG_ERR, clnt_vc_errstr,
|
||
|
|
clnt_vc_str, __no_mem_str);
|
||
|
|
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
|
||
|
|
- rpc_createerr.cf_error.re_errno = errno;
|
||
|
|
goto err;
|
||
|
|
}
|
||
|
|
ct->ct_addr.buf = NULL;
|
||
|
|
@@ -230,26 +233,29 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz)
|
||
|
|
assert(vc_cv != (cond_t *) NULL);
|
||
|
|
|
||
|
|
/*
|
||
|
|
- * XXX - fvdl connecting while holding a mutex?
|
||
|
|
+ * Do not hold mutex during connect
|
||
|
|
*/
|
||
|
|
+ mutex_unlock(&clnt_fd_lock);
|
||
|
|
+
|
||
|
|
slen = sizeof ss;
|
||
|
|
if (getpeername(fd, (struct sockaddr *)&ss, &slen) < 0) {
|
||
|
|
if (errno != ENOTCONN) {
|
||
|
|
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
|
||
|
|
- rpc_createerr.cf_error.re_errno = errno;
|
||
|
|
- mutex_unlock(&clnt_fd_lock);
|
||
|
|
+ struct rpc_createerr *ce = &get_rpc_createerr();
|
||
|
|
+ ce->cf_stat = RPC_SYSTEMERROR;
|
||
|
|
+ ce->cf_error.re_errno = errno;
|
||
|
|
thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
|
||
|
|
goto err;
|
||
|
|
}
|
||
|
|
if (connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){
|
||
|
|
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
|
||
|
|
- rpc_createerr.cf_error.re_errno = errno;
|
||
|
|
- mutex_unlock(&clnt_fd_lock);
|
||
|
|
- thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
|
||
|
|
- goto err;
|
||
|
|
+ if (errno != EISCONN) {
|
||
|
|
+ struct rpc_createerr *ce = &get_rpc_createerr();
|
||
|
|
+ ce->cf_stat = RPC_SYSTEMERROR;
|
||
|
|
+ ce->cf_error.re_errno = errno;
|
||
|
|
+ thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
|
||
|
|
+ goto err;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- mutex_unlock(&clnt_fd_lock);
|
||
|
|
if (!__rpc_fd2sockinfo(fd, &si))
|
||
|
|
goto err;
|
||
|
|
thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
|