X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=e8d65db1a8cfda924226ad1838d087ad01a176a9;hp=99226553451b2b5e8376954883d96e7cab5996f0;hb=ea11d357cc010351871392e433880fb2401161b2;hpb=9abb89bcf7940e2ada9d708f86a218a56334f68d

diff --git a/stream.cpp b/stream.cpp
index 9922655..e8d65db 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,9 +1,10 @@
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>
 
@@ -129,7 +130,8 @@ void Stream::put_client_to_sleep(Client *client)
 vector<iovec> collect_iovecs(const vector<iovec> &data, size_t bytes_wanted)
 {
 	vector<iovec> ret;
-	for (size_t i = 0; i < data.size() && bytes_wanted > 0; ++i) {
+	size_t max_iovecs = std::min<size_t>(data.size(), IOV_MAX);
+	for (size_t i = 0; i < max_iovecs && bytes_wanted > 0; ++i) {
 		if (data[i].iov_len <= bytes_wanted) {
 			// Consume the entire iovec.
 			ret.push_back(data[i]);
@@ -185,7 +187,7 @@ void Stream::add_data_raw(const vector<iovec> &orig_data)
 		} while (ret == -1 && errno == EINTR);
 
 		if (ret == -1) {
-			log_perror("pwrite");
+			log_perror("pwritev");
 			// Dazed and confused, but trying to continue...
 			return;
 		}
@@ -222,7 +224,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes)
 
 		queued_data.push_back(iov);
 	} else {
-		assert(encoding == Stream::STREAM_ENCODING_RAW);
+		assert(false);
 	}
 }