From bcce4af00413691f516383bb0a8b8a5ce91a0ea3 Mon Sep 17 00:00:00 2001 From: Neal Walfield Date: Sat, 23 Nov 2002 19:55:23 +0000 Subject: 2002-11-23 Neal H. Walfield * Makefile.am (libassuan_a_SOURCES): Add assuan-io.c. * assuan-io.c: Restore. (_assuan_simple_read): Rename from _assuan_read. (_assuan_simple_write): Rename from _assuan_write. * assuan-defs.h (_assuan_simple_read): New prototype. (_assuan_simple_write): Likewise. * assuan-pipe-server.c (pipe_reader): Remove. (pipe_writer): Remove. (_assuan_new_context): Initialize IO is with _assuan_simple_read and _assuan_simple_write. * assuan-socket-connect.c (socket_reader): Remove. (socket_writer): Remove. (assuan_socket_connect): Initialize IO is with _assuan_simple_read and _assuan_simple_write. * assuan-socket-server.c (io): New local variable. (assuan_init_socket_server): Initialize CTX->io. (assuan_init_connected_socket_server): Likewise. --- src/assuan-socket-server.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/assuan-socket-server.c') diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c index c0a9a25..8d23a6b 100644 --- a/src/assuan-socket-server.c +++ b/src/assuan-socket-server.c @@ -98,7 +98,8 @@ deinit_socket_server (ASSUAN_CONTEXT ctx) finish_connection (ctx); } - +static struct assuan_io io = { _assuan_simple_read, + _assuan_simple_write }; /* Initialize a server for the socket LISTEN_FD which has already be put into listen mode */ @@ -125,6 +126,8 @@ assuan_init_socket_server (ASSUAN_CONTEXT *r_ctx, int listen_fd) ctx->accept_handler = accept_connection; ctx->finish_handler = finish_connection; + ctx->io = &io; + rc = _assuan_register_std_commands (ctx); if (rc) xfree (ctx); @@ -152,6 +155,8 @@ assuan_init_connected_socket_server (ASSUAN_CONTEXT *r_ctx, int fd) ctx->inbound.fd = -1; ctx->outbound.fd = -1; + ctx->io = &io; + ctx->listen_fd = -1; ctx->connected_fd = fd; ctx->deinit_handler = deinit_socket_server; -- cgit v1.2.3