c8e934b276
* configure.ac (NEED_GPG_VERSION_DEFAULT): Bump to 1.4.0 as 1.3.0 was development versions only. tests/ 2009-10-26 Marcus Brinkmann <marcus@g10code.de> * opassuan/t-command.c: Update to new interface. src/ 2009-10-26 Marcus Brinkmann <marcus@g10code.de> * gpgme.h.in (struct gpgme_io_event_done_data) (gpgme_io_event_done_data_t): New types. (struct _gpgme_op_assuan_result): Deprecate the err member. (gpgme_op_assuan_result): Deprecate (for now). (gpgme_op_assuan_transact_ext): New prototype. (gpgme_op_assuan_transact): Deprecate. (struct _gpgme_op_g13_result): Replace with ... (struct _gpgme_op_vfs_mount_result): ... this. (gpgme_op_g13_mount): Replace with ... (gpgme_op_vfs_mount): ... this. * gpgme.def (gpgme_op_assuan_transact_ext, gpgme_wait_ext) (gpgme_op_vfs_mount_result, gpgme_op_vfs_mount): New. (gpgme_op_g13_mount): Remove. * libgpgme.vers: Likewise. * engine-backend.h (struct engine_ops): Remove RESULT_CB and RESULT_CB_VALUE args in opassuan_transact member. Add CANCEL_OP member. * ops.h (_gpgme_cancel_with_err, _gpgme_wait_on_condition): Add OP_ERR argument. (_gpgme_wait_one_ext): New prototype. * context.h (ctx_op_data_id_t): Add OPDATA_VFS_MOUNT. * engine-g13.c (g13_cancel_op): New function. (parse_status): Remove declaration. (g13_assuan_simple_command): Do nothing with status lines for now. (status_handler): Update opaque value access. (_gpgme_engine_ops_g13): Add new cancel_op member. * gpgme.c (_gpgme_cancel_with_err): Add new parameter OP_ERR. Handle operational errors. (gpgme_cancel, gpgme_io_read, gpgme_io_write): Add debug output. * data.c (_gpgme_data_inbound_handler) (_gpgme_data_outbound_handler): Adjust opaque value access. * engine-gpg.c (command_handler, status_handler) (colon_line_handler): Likewise. * engine-gpgsm.c (status_handler): Likewise. * engine-gpg.c (_gpgme_engine_ops_gpg): Add cancel_op member. * engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Likewise. * g13.c: Rewritten (and will be rewritten again). * engine.h (_gpgme_engine_op_assuan_transact): Remove result_cb and result_cb_value parameters from prototype. (_gpgme_engine_cancel_op): New prototype. * engine.c (engine_ops) [! ENABLE_ASSUAN]: Add missing comma. (_gpgme_engine_op_assuan_transact): Remove result_cb and result_cb_value parameter. (_gpgme_engine_cancel_op): New function. * wait.h (_gpgme_run_io_cb): Add new argument OP_ERR. (struct io_cb_data): New struct to pass opaque data and get a op_err return value. Needed because we can't modify I/O callback handler signature because it is exposed to the user. * wait.c (_gpgme_run_io_cb): Add OP_ERR parameter. Handle operational errors. * wait-user.c (_gpgme_user_io_cb_handler): Handle operational errors. * wait-private.c (_gpgme_wait_on_condition): New argument to retrieve the operational result. Handle operational errors in session based protocols. (_gpgme_wait_one_ext): New function. (_gpgme_wait_one): Pass argument in invocation of _gpgme_wait_on_condition. * wait-global.c (struct ctx_list_item): Add member OP_ERR. (ctx_done): New argument OP_ERR. (ctx_wait): New argument OP_ERR. (gpgme_wait_ext): New function based on gpgme_wait but handling operational errors. (gpgme_wait): Implement in term of gpgme_wait_ext. * keylist.c (gpgme_op_keylist_next): Pass argument in invocation of _gpgme_wait_on_condition. * trustlist.c (gpgme_op_trustlist_next): Pass argument in invocation of _gpgme_wait_on_condition. * engine-assuan.c (struct engine_llass): Replace members RESULT_CB and RESULT_CB_VALUE by LAST_OP_ERR. (_gpgme_engine_assuan_last_op_err): Add this hack function. (llass_cancel_op): New function. (_gpgme_engine_llass_ops): Add cancel_op member. (llass_status_handler): Update opaque value access. (llass_transact): Remove RESULT_CB and RESULT_CB_VALUE arguments. * opassuan.c: Move compat hacks to the end of file. (opassuan_start): Do not set OPD->result.err. Do not pass RESULT_Cb and CTX to _gpgme_engine_op_assuan_transact. (gpgme_op_assuan_transact_ext): New function.
401 lines
10 KiB
C
401 lines
10 KiB
C
/* wait-global.c
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH
|
||
|
||
This file is part of GPGME.
|
||
|
||
GPGME is free software; you can redistribute it and/or modify it
|
||
under the terms of the GNU Lesser General Public License as
|
||
published by the Free Software Foundation; either version 2.1 of
|
||
the License, or (at your option) any later version.
|
||
|
||
GPGME is distributed in the hope that it will be useful, but
|
||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with this program; if not, write to the Free Software
|
||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||
02111-1307, USA. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
#include <stdlib.h>
|
||
#include <assert.h>
|
||
#include <string.h>
|
||
#include <errno.h>
|
||
|
||
#include "gpgme.h"
|
||
#include "sema.h"
|
||
#include "util.h"
|
||
#include "context.h"
|
||
#include "wait.h"
|
||
#include "priv-io.h"
|
||
#include "ops.h"
|
||
|
||
/* The global event loop is used for all asynchronous operations
|
||
(except key listing) for which no user I/O callbacks are specified.
|
||
|
||
A context sets up its initial I/O callbacks and then sends the
|
||
GPGME_EVENT_START event. After that, it is added to the global
|
||
list of active contexts.
|
||
|
||
The gpgme_wait function contains a select() loop over all file
|
||
descriptors in all active contexts. If an error occurs, it closes
|
||
all fds in that context and moves the context to the global done
|
||
list. Likewise, if a context has removed all I/O callbacks, it is
|
||
moved to the global done list.
|
||
|
||
All contexts in the global done list are eligible for being
|
||
returned by gpgme_wait if requested by the caller. */
|
||
|
||
/* The ctx_list_lock protects the list of active and done contexts.
|
||
Insertion into any of these lists is only allowed when the lock is
|
||
held. This allows a muli-threaded program to loop over gpgme_wait
|
||
and in parallel start asynchronous gpgme operations.
|
||
|
||
However, the fd tables in the contexts are not protected by this
|
||
lock. They are only allowed to change either before the context is
|
||
added to the active list (ie, before the start event is signalled)
|
||
or in a callback handler. */
|
||
DEFINE_STATIC_LOCK (ctx_list_lock);
|
||
|
||
/* A ctx_list_item is an item in the global list of active or done
|
||
contexts. */
|
||
struct ctx_list_item
|
||
{
|
||
/* Every ctx_list_item is an element in a doubly linked list. The
|
||
list pointers are protected by the ctx_list_lock. */
|
||
struct ctx_list_item *next;
|
||
struct ctx_list_item *prev;
|
||
|
||
gpgme_ctx_t ctx;
|
||
/* The status is set when the ctx is moved to the done list. */
|
||
gpgme_error_t status;
|
||
gpgme_error_t op_err;
|
||
};
|
||
|
||
/* The active list contains all contexts that are in the global event
|
||
loop, have active I/O callbacks, and have already seen the start
|
||
event. */
|
||
static struct ctx_list_item *ctx_active_list;
|
||
|
||
/* The done list contains all contexts that have previously been
|
||
active but now are not active any longer, either because they
|
||
finished successfully or an I/O callback returned an error. The
|
||
status field in the list item contains the error value (or 0 if
|
||
successful). */
|
||
static struct ctx_list_item *ctx_done_list;
|
||
|
||
|
||
/* Enter the context CTX into the active list. */
|
||
static gpgme_error_t
|
||
ctx_active (gpgme_ctx_t ctx)
|
||
{
|
||
struct ctx_list_item *li = malloc (sizeof (struct ctx_list_item));
|
||
if (!li)
|
||
return gpg_error_from_errno (errno);
|
||
li->ctx = ctx;
|
||
|
||
LOCK (ctx_list_lock);
|
||
/* Add LI to active list. */
|
||
li->next = ctx_active_list;
|
||
li->prev = NULL;
|
||
if (ctx_active_list)
|
||
ctx_active_list->prev = li;
|
||
ctx_active_list = li;
|
||
UNLOCK (ctx_list_lock);
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Enter the context CTX into the done list with status STATUS. */
|
||
static void
|
||
ctx_done (gpgme_ctx_t ctx, gpgme_error_t status, gpgme_error_t op_err)
|
||
{
|
||
struct ctx_list_item *li;
|
||
|
||
LOCK (ctx_list_lock);
|
||
li = ctx_active_list;
|
||
while (li && li->ctx != ctx)
|
||
li = li->next;
|
||
assert (li);
|
||
|
||
/* Remove LI from active list. */
|
||
if (li->next)
|
||
li->next->prev = li->prev;
|
||
if (li->prev)
|
||
li->prev->next = li->next;
|
||
else
|
||
ctx_active_list = li->next;
|
||
|
||
li->status = status;
|
||
li->op_err = op_err;
|
||
|
||
/* Add LI to done list. */
|
||
li->next = ctx_done_list;
|
||
li->prev = NULL;
|
||
if (ctx_done_list)
|
||
ctx_done_list->prev = li;
|
||
ctx_done_list = li;
|
||
UNLOCK (ctx_list_lock);
|
||
}
|
||
|
||
|
||
/* Find finished context CTX (or any context if CTX is NULL) and
|
||
return its status in STATUS after removing it from the done list.
|
||
If a matching context could be found, return it. Return NULL if no
|
||
context could be found. */
|
||
static gpgme_ctx_t
|
||
ctx_wait (gpgme_ctx_t ctx, gpgme_error_t *status, gpgme_error_t *op_err)
|
||
{
|
||
struct ctx_list_item *li;
|
||
|
||
LOCK (ctx_list_lock);
|
||
li = ctx_done_list;
|
||
if (ctx)
|
||
{
|
||
/* A specific context is requested. */
|
||
while (li && li->ctx != ctx)
|
||
li = li->next;
|
||
}
|
||
if (li)
|
||
{
|
||
ctx = li->ctx;
|
||
if (status)
|
||
*status = li->status;
|
||
if (op_err)
|
||
*op_err = li->op_err;
|
||
|
||
/* Remove LI from done list. */
|
||
if (li->next)
|
||
li->next->prev = li->prev;
|
||
if (li->prev)
|
||
li->prev->next = li->next;
|
||
else
|
||
ctx_done_list = li->next;
|
||
free (li);
|
||
}
|
||
else
|
||
ctx = NULL;
|
||
UNLOCK (ctx_list_lock);
|
||
return ctx;
|
||
}
|
||
|
||
|
||
/* Internal I/O callback functions. */
|
||
|
||
/* The add_io_cb and remove_io_cb handlers are shared with the private
|
||
event loops. */
|
||
|
||
void
|
||
_gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type,
|
||
void *type_data)
|
||
{
|
||
gpgme_ctx_t ctx = (gpgme_ctx_t) data;
|
||
|
||
assert (ctx);
|
||
|
||
switch (type)
|
||
{
|
||
case GPGME_EVENT_START:
|
||
{
|
||
gpgme_error_t err = ctx_active (ctx);
|
||
|
||
if (err)
|
||
/* An error occured. Close all fds in this context, and
|
||
send the error in a done event. */
|
||
_gpgme_cancel_with_err (ctx, err, 0);
|
||
}
|
||
break;
|
||
|
||
case GPGME_EVENT_DONE:
|
||
{
|
||
gpgme_io_event_done_data_t done_data =
|
||
(gpgme_io_event_done_data_t) type_data;
|
||
|
||
ctx_done (ctx, done_data->err, done_data->op_err);
|
||
}
|
||
break;
|
||
|
||
case GPGME_EVENT_NEXT_KEY:
|
||
assert (!"Unexpected event GPGME_EVENT_NEXT_KEY");
|
||
break;
|
||
|
||
case GPGME_EVENT_NEXT_TRUSTITEM:
|
||
assert (!"Unexpected event GPGME_EVENT_NEXT_TRUSTITEM");
|
||
break;
|
||
|
||
default:
|
||
assert (!"Unexpected event");
|
||
break;
|
||
}
|
||
}
|
||
|
||
|
||
|
||
/* Perform asynchronous operations in the global event loop (ie, any
|
||
asynchronous operation except key listing and trustitem listing
|
||
operations). If CTX is not a null pointer, the function will
|
||
return if the asynchronous operation in the context CTX finished.
|
||
Otherwise the function will return if any asynchronous operation
|
||
finished. If HANG is zero, the function will not block for a long
|
||
time. Otherwise the function does not return until an operation
|
||
matching CTX finished.
|
||
|
||
If a matching context finished, it is returned, and *STATUS is set
|
||
to the error value of the operation in that context. Otherwise, if
|
||
the timeout expires, NULL is returned and *STATUS is 0. If an
|
||
error occurs, NULL is returned and *STATUS is set to the error
|
||
value. */
|
||
gpgme_ctx_t
|
||
gpgme_wait_ext (gpgme_ctx_t ctx, gpgme_error_t *status,
|
||
gpgme_error_t *op_err, int hang)
|
||
{
|
||
do
|
||
{
|
||
unsigned int i = 0;
|
||
struct ctx_list_item *li;
|
||
struct fd_table fdt;
|
||
int nr;
|
||
|
||
/* Collect the active file descriptors. */
|
||
LOCK (ctx_list_lock);
|
||
for (li = ctx_active_list; li; li = li->next)
|
||
i += li->ctx->fdt.size;
|
||
fdt.fds = malloc (i * sizeof (struct io_select_fd_s));
|
||
if (!fdt.fds)
|
||
{
|
||
int saved_errno = errno;
|
||
UNLOCK (ctx_list_lock);
|
||
if (status)
|
||
*status = gpg_error_from_errno (saved_errno);
|
||
if (op_err)
|
||
*op_err = 0;
|
||
return NULL;
|
||
}
|
||
fdt.size = i;
|
||
i = 0;
|
||
for (li = ctx_active_list; li; li = li->next)
|
||
{
|
||
memcpy (&fdt.fds[i], li->ctx->fdt.fds,
|
||
li->ctx->fdt.size * sizeof (struct io_select_fd_s));
|
||
i += li->ctx->fdt.size;
|
||
}
|
||
UNLOCK (ctx_list_lock);
|
||
|
||
nr = _gpgme_io_select (fdt.fds, fdt.size, 0);
|
||
if (nr < 0)
|
||
{
|
||
int saved_errno = errno;
|
||
free (fdt.fds);
|
||
if (status)
|
||
*status = gpg_error_from_errno (saved_errno);
|
||
if (op_err)
|
||
*op_err = 0;
|
||
return NULL;
|
||
}
|
||
|
||
for (i = 0; i < fdt.size && nr; i++)
|
||
{
|
||
if (fdt.fds[i].fd != -1 && fdt.fds[i].signaled)
|
||
{
|
||
gpgme_ctx_t ictx;
|
||
gpgme_error_t err = 0;
|
||
gpgme_error_t local_op_err = 0;
|
||
struct wait_item_s *item;
|
||
|
||
assert (nr);
|
||
nr--;
|
||
|
||
item = (struct wait_item_s *) fdt.fds[i].opaque;
|
||
assert (item);
|
||
ictx = item->ctx;
|
||
assert (ictx);
|
||
|
||
LOCK (ctx->lock);
|
||
if (ctx->canceled)
|
||
err = gpg_error (GPG_ERR_CANCELED);
|
||
UNLOCK (ctx->lock);
|
||
|
||
if (!err)
|
||
err = _gpgme_run_io_cb (&fdt.fds[i], 0, &local_op_err);
|
||
if (err || local_op_err)
|
||
{
|
||
/* An error occured. Close all fds in this context,
|
||
and signal it. */
|
||
_gpgme_cancel_with_err (ictx, err, local_op_err);
|
||
|
||
/* Break out of the loop, and retry the select()
|
||
from scratch, because now all fds should be
|
||
gone. */
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
free (fdt.fds);
|
||
|
||
/* Now some contexts might have finished successfully. */
|
||
LOCK (ctx_list_lock);
|
||
retry:
|
||
for (li = ctx_active_list; li; li = li->next)
|
||
{
|
||
gpgme_ctx_t actx = li->ctx;
|
||
|
||
for (i = 0; i < actx->fdt.size; i++)
|
||
if (actx->fdt.fds[i].fd != -1)
|
||
break;
|
||
if (i == actx->fdt.size)
|
||
{
|
||
struct gpgme_io_event_done_data data;
|
||
data.err = 0;
|
||
data.op_err = 0;
|
||
|
||
/* FIXME: This does not perform too well. We have to
|
||
release the lock because the I/O event handler
|
||
acquires it to remove the context from the active
|
||
list. Two alternative strategies are worth
|
||
considering: Either implement the DONE event handler
|
||
here in a lock-free manner, or save a list of all
|
||
contexts to be released and call the DONE events
|
||
afterwards. */
|
||
UNLOCK (ctx_list_lock);
|
||
_gpgme_engine_io_event (actx->engine, GPGME_EVENT_DONE, &data);
|
||
LOCK (ctx_list_lock);
|
||
goto retry;
|
||
}
|
||
}
|
||
UNLOCK (ctx_list_lock);
|
||
|
||
{
|
||
gpgme_ctx_t dctx = ctx_wait (ctx, status, op_err);
|
||
|
||
if (dctx)
|
||
{
|
||
ctx = dctx;
|
||
hang = 0;
|
||
}
|
||
else if (!hang)
|
||
{
|
||
ctx = NULL;
|
||
if (status)
|
||
*status = 0;
|
||
if (op_err)
|
||
*op_err = 0;
|
||
}
|
||
}
|
||
}
|
||
while (hang);
|
||
|
||
return ctx;
|
||
}
|
||
|
||
|
||
gpgme_ctx_t
|
||
gpgme_wait (gpgme_ctx_t ctx, gpgme_error_t *status, int hang)
|
||
{
|
||
return gpgme_wait_ext (ctx, status, NULL, hang);
|
||
}
|