From cb2dba2c1257e0aa80edc9a171a9c5cd7b2822f8 Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Mon, 27 Sep 2010 09:24:51 +0200 Subject: server: read/write now goes through connection fn's MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit depending on whether the connection is over a socket or pipe, the read is done differently. pipes can return -1 when writing 0 bytes, make 0 byte writes a successful no-op. 0 byte writes falls out naturally of tcl server code. Signed-off-by: Øyvind Harboe --- src/server/telnet_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/telnet_server.c') diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index 92052ae8..ee8d3b16 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -51,7 +51,7 @@ static int telnet_write(struct connection *connection, const void *data, if (t_con->closed) return ERROR_SERVER_REMOTE_CLOSED; - if (write_socket(connection->fd_out, data, len) == len) + if (connection_write(connection, data, len) == len) { return ERROR_OK; } @@ -204,7 +204,7 @@ static int telnet_input(struct connection *connection) struct telnet_connection *t_con = connection->priv; struct command_context *command_context = connection->cmd_ctx; - bytes_read = read_socket(connection->fd, buffer, TELNET_BUFFER_SIZE); + bytes_read = connection_read(connection, buffer, TELNET_BUFFER_SIZE); if (bytes_read == 0) return ERROR_SERVER_REMOTE_CLOSED; -- cgit v1.2.3