Mercurial > dovecot > core-2.2

changeset 4036:bb6a724a3396 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor cleanups
author Timo Sirainen <tss@iki.fi>
date Mon, 20 Feb 2006 19:14:42 +0200
parents 335ac59efffd
children 3531cc5270b5
files src/login-common/login-proxy.c
diffstat 1 files changed, 6 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/login-common/login-proxy.c	Mon Feb 20 18:31:46 2006 +0200
+++ b/src/login-common/login-proxy.c	Mon Feb 20 19:14:42 2006 +0200
@@ -39,14 +39,11 @@
 		/* client's output buffer is already quite full.
 		   don't send more until we're below threshold. */
 		io_remove(&proxy->server_io);
-		proxy->server_io = NULL;
 		return;
 	}
 
 	ret = net_receive(proxy->server_fd, buf, sizeof(buf));
-	if (ret > 0)
-		(void)o_stream_send(proxy->client_output, buf, ret);
-	else if (ret < 0)
+	if (ret > 0 || o_stream_send(proxy->client_output, buf, ret) != ret)
                 login_proxy_free(proxy);
 }
 
@@ -61,14 +58,11 @@
 		/* proxy's output buffer is already quite full.
 		   don't send more until we're below threshold. */
 		io_remove(&proxy->client_io);
-		proxy->client_io = NULL;
 		return;
 	}
 
 	ret = net_receive(proxy->client_fd, buf, sizeof(buf));
-	if (ret > 0)
-		(void)o_stream_send(proxy->server_output, buf, ret);
-	else if (ret < 0)
+	if (ret > 0 || o_stream_send(proxy->server_output, buf, ret) != ret)
                 login_proxy_free(proxy);
 }
 
@@ -247,13 +241,12 @@
 
 	/* from now on, just do dummy proxying */
 	io_remove(&proxy->server_io);
-	proxy->server_io = io_add(proxy->server_fd, IO_READ, server_input, proxy);
-	proxy->client_io = io_add(proxy->client_fd, IO_READ,
-				  proxy_client_input, proxy);
+	proxy->server_io =
+		io_add(proxy->server_fd, IO_READ, server_input, proxy);
+	proxy->client_io =
+		io_add(proxy->client_fd, IO_READ, proxy_client_input, proxy);
 	o_stream_set_flush_callback(proxy->server_output, server_output, proxy);
-
 	i_stream_unref(&proxy->server_input);
-        proxy->server_input = NULL;
 
 	if (login_proxies == NULL) {
 		login_proxies = hash_create(default_pool, default_pool,