diff options
| author | Marcus Brinkmann <[email protected]> | 2009-11-27 19:12:01 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-11-27 19:12:01 +0000 |
| commit | 4b6374bc374428ac71c43e1158ff75a027a1eb72 (patch) | |
| tree | 124bd553fc3481405fd1e573b978fb2a1f362d19 /src/assuan-pipe-connect.c | |
| parent | doc/ (diff) | |
| download | libassuan-4b6374bc374428ac71c43e1158ff75a027a1eb72.tar.gz libassuan-4b6374bc374428ac71c43e1158ff75a027a1eb72.zip | |
2009-11-27 Marcus Brinkmann <[email protected]>
* assuan.h (assuan_set_assuan_log_stream): Add prototype.
* libassuan.def, libassuan.vers: Add back
assuan_set_assuan_log_stream.
* assuan-logging.c (assuan_set_assuan_log_stream): Add back.
* context.c (assuan_get_pointer): Don't output debug info here.
(assuan_get_peercred, assuan_get_pid): But do here.
* system.c: Improve debug output.
* assuan-defs.h (struct assuan_context_s): Rename pipe_mode to
max_accepts.
* assuan-listen.c (assuan_accept): Rework max accepts logic.
* assuan-socket-server.c (assuan_init_socket_server),
assuan-socket-connect.c (assuan_socket_connect),
assuan-pipe-server.c (assuan_init_pipe_server),
assuan-pipe-connect.c (socketpair_connect): Add debug output, set
max_accepts instead of pipe_mode.
Diffstat (limited to 'src/assuan-pipe-connect.c')
| -rw-r--r-- | src/assuan-pipe-connect.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c index 74f85f2..c1dfe94 100644 --- a/src/assuan-pipe-connect.c +++ b/src/assuan-pipe-connect.c @@ -196,7 +196,8 @@ pipe_connect (assuan_context_t ctx, ctx->engine.sendfd = NULL; ctx->engine.receivefd = NULL; ctx->finish_handler = _assuan_client_finish; - ctx->pipe_mode = 1; + ctx->max_accepts = 1; + ctx->accept_handler = NULL; ctx->inbound.fd = rp[0]; /* Our inbound is read end of read pipe. */ ctx->outbound.fd = wp[1]; /* Our outbound is write end of write pipe. */ ctx->pid = pid; @@ -341,7 +342,7 @@ socketpair_connect (assuan_context_t ctx, ctx->engine.release = _assuan_client_release; ctx->finish_handler = _assuan_client_finish; - ctx->pipe_mode = 1; + ctx->max_accepts = 1; ctx->inbound.fd = fds[0]; ctx->outbound.fd = fds[0]; _assuan_init_uds_io (ctx); @@ -390,8 +391,8 @@ assuan_pipe_connect (assuan_context_t ctx, void (*atfork) (void *opaque, int reserved), void *atforkvalue, unsigned int flags) { - TRACE2 (ctx, ASSUAN_LOG_CTX, "assuan_pipe_connect_ext", ctx, - "name=%s,flags=0x%x", name ? name : "(null)", flags); + TRACE2 (ctx, ASSUAN_LOG_CTX, "assuan_pipe_connect", ctx, + "name=%s, flags=0x%x", name ? name : "(null)", flags); if (flags & ASSUAN_PIPE_CONNECT_FDPASSING) { |