[OpenWrt-Devel] [PATCH] [ustream-ssl][v2] polarssl: fix long writes

Luka Perkov luka at openwrt.org
Sat Apr 11 17:30:48 EDT 2015


Enable to write more data then defined in SSL_MAX_CONTENT_LEN.

Signed-off-by: Luka Perkov <luka at openwrt.org>
---
changes in v2:
* fix return value

 ustream-polarssl.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ustream-polarssl.c b/ustream-polarssl.c
index cbf24cb..66718f1 100644
--- a/ustream-polarssl.c
+++ b/ustream-polarssl.c
@@ -232,17 +232,23 @@ __hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us)
 __hidden int __ustream_ssl_write(struct ustream_ssl *us, const char *buf, int len)
 {
 	void *ssl = us->ssl;
-	int ret = ssl_write(ssl, (const unsigned char *) buf, len);
+	int done = 0, ret = 0;
 
-	if (ret < 0) {
-		if (ssl_do_wait(ret))
-			return 0;
+	while (done != len) {
+		ret = ssl_write(ssl, (const unsigned char *) buf + done, len - done);
 
-		ustream_ssl_error(us, ret);
-		return -1;
+		if (ret < 0) {
+			if (ssl_do_wait(ret))
+				return 0;
+
+			ustream_ssl_error(us, ret);
+			return -1;
+		}
+
+		done += ret;
 	}
 
-	return ret;
+	return done;
 }
 
 __hidden int __ustream_ssl_read(struct ustream_ssl *us, char *buf, int len)
-- 
2.3.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list