proto_wss: write all TLS chunks under a single lock

Reported by Eric Tamme from OnSIP

(cherry picked from commit e113e14)

modules/proto_tls/proto_tls.c

@@ -116,7 +116,12 @@ static struct mi_root* tls_trace_mi(struct mi_root* cmd, void* param );
 static int w_tls_blocking_write(struct tcp_connection *c, int fd, const char *buf,
 																	size_t len)
 {
-	return tls_blocking_write(c, fd, buf, len, &tls_mgm_api);
+	int ret;
+
+	lock_get(&c->write_lock);
+	ret = tls_blocking_write(c, fd, buf, len, &tls_mgm_api);
+	lock_release(&c->write_lock);
+	return ret;
 }
 
 /* buffer to be used for reading all TCP SIP messages
@@ -482,7 +487,9 @@ static int proto_tls_send(struct socket_info* send_sock,
 
 	LM_DBG("sending via fd %d...\n",fd);
 
+	lock_get(&c->write_lock);
 	n = tls_blocking_write(c, fd, buf, len, &tls_mgm_api);
+	lock_release(&c->write_lock);
 	tcp_conn_set_lifetime( c, tcp_con_lifetime);
 
 	LM_DBG("after write: c= %p n=%d fd=%d\n",c, n, fd);

modules/proto_wss/proto_wss.c

@@ -608,6 +608,7 @@ static int wss_raw_writev(struct tcp_connection *c, int fd,
 #endif
 
 #ifndef TLS_DONT_WRITE_FRAGMENTS
+	lock_get(&c->write_lock);
 	for (i = 0; i < iovcnt; i++) {
 		n = tls_blocking_write(c, fd, iov[i].iov_base, iov[i].iov_len, &tls_mgm_api);
 		if (n < 0) {
@@ -616,6 +617,7 @@ static int wss_raw_writev(struct tcp_connection *c, int fd,
 		}
 		ret += n;
 	}
+	lock_release(&c->write_lock);
 #else
 	n = 0;
 	for (i = 0; i < iovcnt; i++)
@@ -630,7 +632,9 @@ static int wss_raw_writev(struct tcp_connection *c, int fd,
 		memcpy(buf + n, iov[i].iov_base, iov[i].iov_len);
 		n += iov[i].iov_len;
 	}
+	lock_get(&c->write_lock);
 	n = tls_blocking_write(c, fd, buf, n, &tls_mgm_api);
+	lock_release(&c->write_lock);
 
 #endif /* TLS_DONT_WRITE_FRAGMENTS */
 

modules/tls_mgm/tls_conn_server.h

@@ -558,8 +558,6 @@ static int tls_blocking_write(struct tcp_connection *c, int fd, const char *buf,
 		goto error;
 	}
 
-	lock_get(&c->write_lock);
-
 	if (tls_update_fd(c, fd) < 0)
 		goto error;
 
@@ -610,7 +608,6 @@ static int tls_blocking_write(struct tcp_connection *c, int fd, const char *buf,
 		/*
 		* successful full write
 		*/
-		lock_release(&c->write_lock);
 		return written;
 	}
 
@@ -652,7 +649,6 @@ static int tls_blocking_write(struct tcp_connection *c, int fd, const char *buf,
 	}
 
 error:
-	lock_release(&c->write_lock);
 	return -1;
 }