From: Andre <maan@p133.(none)>
Date: Fri, 24 Mar 2006 23:15:03 +0000 (+0100)
Subject: dccp: avoid "message too long" errors.
X-Git-Tag: v0.2.12~143
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=206217ee7b6925f543ba21a7797a4dc32f0d84ab;p=paraslash.git

dccp: avoid "message too long" errors.

Break down the write into 1KB chunks as a workaround.
---

diff --git a/dccp_send.c b/dccp_send.c
index 57e2a70c..02e64a7a 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -104,11 +104,32 @@ static int dccp_open(void)
 
 static void dccp_shutdown_client(struct dccp_client *dc)
 {
+	PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr),
+		dc->fd);
 	close(dc->fd);
 	list_del(&dc->node);
 	free(dc);
 }
 
+static int dccp_write(int fd, const char *buf, size_t len)
+{
+	size_t send, written = 0;
+	int ret;
+again:
+	send = MIN(1024, len - written);
+	ret = write(fd, buf + written, send);
+	if (ret < 0)
+		goto err_out;
+	written += ret;
+	if (written >= len)
+		return written;
+	ret = write_ok(fd);
+	if (ret > 0)
+		goto again;
+err_out:
+	return -E_DCCP_WRITE;
+}
+
 static void dccp_send(__unused struct audio_format *af,
 		long unsigned current_chunk,
 		__unused long unsigned chunks_sent, const char *buf, size_t len)
@@ -132,7 +153,7 @@ static void dccp_send(__unused struct audio_format *af,
 			header_buf = af->get_header_info(&header_len);
 			if (!header_buf || header_len <= 0)
 				continue; /* header not yet available */
-			ret = write(dc->fd, header_buf, header_len);
+			ret = dccp_write(dc->fd, header_buf, header_len);
 			if (ret != header_len) {
 				int err = errno;
 				PARA_ERROR_LOG("header write: %d/%d (%s)\n",
@@ -150,7 +171,7 @@ static void dccp_send(__unused struct audio_format *af,
 				continue;
 		}
 //		PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
-		ret = write(dc->fd, buf, len);
+		ret = dccp_write(dc->fd, buf, len);
 		if (ret != len)
 			dccp_shutdown_client(dc);
 	}
diff --git a/error.h b/error.h
index 4b3cce28..b72f5fa6 100644
--- a/error.h
+++ b/error.h
@@ -284,6 +284,7 @@ extern const char **para_errlist[];
 #define DCCP_SEND_ERRORS \
 	PARA_ERROR(DCCP_BIND, "dccp bind error"), \
 	PARA_ERROR(DCCP_LISTEN, "dccp listen error"), \
+	PARA_ERROR(DCCP_WRITE, "dccp write error"), \
 
 
 /* these do not need error handling (yet) */