summaryrefslogtreecommitdiff
path: root/src/server/server.c
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-09-27 09:24:51 +0200
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-10-01 10:21:33 +0200
commitcb2dba2c1257e0aa80edc9a171a9c5cd7b2822f8 (patch)
tree437e9be13be7c6c6880a878da7acc7d1eb35b9a6 /src/server/server.c
parent5a41435e45ae18c0823780382c214fb7324dbe7d (diff)
downloadopenocd+libswd-cb2dba2c1257e0aa80edc9a171a9c5cd7b2822f8.tar.gz
openocd+libswd-cb2dba2c1257e0aa80edc9a171a9c5cd7b2822f8.tar.bz2
openocd+libswd-cb2dba2c1257e0aa80edc9a171a9c5cd7b2822f8.tar.xz
openocd+libswd-cb2dba2c1257e0aa80edc9a171a9c5cd7b2822f8.zip
server: read/write now goes through connection fn's
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 <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/server/server.c')
-rw-r--r--src/server/server.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/server/server.c b/src/server/server.c
index e67be13e..1c556638 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -513,6 +513,33 @@ int server_quit(void)
return ERROR_OK;
}
+int connection_write(struct connection *connection, const void *data, int len)
+{
+ if (len == 0)
+ {
+ /* successful no-op. Sockets and pipes behave differently here... */
+ return 0;
+ }
+ if (connection->service->type == CONNECTION_TCP)
+ {
+ return write_socket(connection->fd_out, data, len);
+ } else
+ {
+ return write(connection->fd_out, data, len);
+ }
+}
+
+int connection_read(struct connection *connection, void *data, int len)
+{
+ if (connection->service->type == CONNECTION_TCP)
+ {
+ return read_socket(connection->fd, data, len);
+ } else
+ {
+ return read(connection->fd, data, len);
+ }
+}
+
/* tell the server we want to shut down */
COMMAND_HANDLER(handle_shutdown_command)
{