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.
222 lines
5.2 KiB
C
222 lines
5.2 KiB
C
/* wait.c
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 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 <string.h>
|
||
#include <assert.h>
|
||
#include <errno.h>
|
||
#include <sys/types.h>
|
||
|
||
#include "util.h"
|
||
#include "context.h"
|
||
#include "ops.h"
|
||
#include "wait.h"
|
||
#include "sema.h"
|
||
#include "priv-io.h"
|
||
#include "engine.h"
|
||
#include "debug.h"
|
||
|
||
|
||
void
|
||
_gpgme_fd_table_init (fd_table_t fdt)
|
||
{
|
||
fdt->fds = NULL;
|
||
fdt->size = 0;
|
||
}
|
||
|
||
void
|
||
_gpgme_fd_table_deinit (fd_table_t fdt)
|
||
{
|
||
if (fdt->fds)
|
||
free (fdt->fds);
|
||
}
|
||
|
||
|
||
/* XXX We should keep a marker and roll over for speed. */
|
||
static gpgme_error_t
|
||
fd_table_put (fd_table_t fdt, int fd, int dir, void *opaque, int *idx)
|
||
{
|
||
unsigned int i, j;
|
||
struct io_select_fd_s *new_fds;
|
||
|
||
for (i = 0; i < fdt->size; i++)
|
||
{
|
||
if (fdt->fds[i].fd == -1)
|
||
break;
|
||
}
|
||
if (i == fdt->size)
|
||
{
|
||
#define FDT_ALLOCSIZE 10
|
||
new_fds = realloc (fdt->fds, (fdt->size + FDT_ALLOCSIZE)
|
||
* sizeof (*new_fds));
|
||
if (!new_fds)
|
||
return gpg_error_from_errno (errno);
|
||
|
||
fdt->fds = new_fds;
|
||
fdt->size += FDT_ALLOCSIZE;
|
||
for (j = 0; j < FDT_ALLOCSIZE; j++)
|
||
fdt->fds[i + j].fd = -1;
|
||
}
|
||
|
||
fdt->fds[i].fd = fd;
|
||
fdt->fds[i].for_read = (dir == 1);
|
||
fdt->fds[i].for_write = (dir == 0);
|
||
fdt->fds[i].signaled = 0;
|
||
fdt->fds[i].opaque = opaque;
|
||
*idx = i;
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Register the file descriptor FD with the handler FNC (which gets
|
||
FNC_DATA as its first argument) for the direction DIR. DATA should
|
||
be the context for which the fd is added. R_TAG will hold the tag
|
||
that can be used to remove the fd. */
|
||
gpgme_error_t
|
||
_gpgme_add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc,
|
||
void *fnc_data, void **r_tag)
|
||
{
|
||
gpgme_error_t err;
|
||
gpgme_ctx_t ctx = (gpgme_ctx_t) data;
|
||
fd_table_t fdt;
|
||
struct wait_item_s *item;
|
||
struct tag *tag;
|
||
|
||
assert (fnc);
|
||
assert (ctx);
|
||
|
||
fdt = &ctx->fdt;
|
||
assert (fdt);
|
||
|
||
tag = malloc (sizeof *tag);
|
||
if (!tag)
|
||
return gpg_error_from_errno (errno);
|
||
tag->ctx = ctx;
|
||
|
||
/* Allocate a structure to hold information about the handler. */
|
||
item = calloc (1, sizeof *item);
|
||
if (!item)
|
||
{
|
||
int saved_errno = errno;
|
||
free (tag);
|
||
return gpg_error_from_errno (saved_errno);
|
||
}
|
||
item->ctx = ctx;
|
||
item->dir = dir;
|
||
item->handler = fnc;
|
||
item->handler_value = fnc_data;
|
||
|
||
err = fd_table_put (fdt, fd, dir, item, &tag->idx);
|
||
if (err)
|
||
{
|
||
free (tag);
|
||
free (item);
|
||
return err;
|
||
}
|
||
|
||
TRACE3 (DEBUG_CTX, "_gpgme_add_io_cb", ctx,
|
||
"fd %d, dir=%d -> tag=%p", fd, dir, tag);
|
||
|
||
*r_tag = tag;
|
||
return 0;
|
||
}
|
||
|
||
|
||
void
|
||
_gpgme_remove_io_cb (void *data)
|
||
{
|
||
struct tag *tag = data;
|
||
gpgme_ctx_t ctx;
|
||
fd_table_t fdt;
|
||
int idx;
|
||
|
||
assert (tag);
|
||
ctx = tag->ctx;
|
||
assert (ctx);
|
||
fdt = &ctx->fdt;
|
||
assert (fdt);
|
||
idx = tag->idx;
|
||
|
||
TRACE2 (DEBUG_CTX, "_gpgme_remove_io_cb", data,
|
||
"setting fd 0x%x (item=%p) done", fdt->fds[idx].fd,
|
||
fdt->fds[idx].opaque);
|
||
|
||
free (fdt->fds[idx].opaque);
|
||
free (tag);
|
||
|
||
/* Free the table entry. */
|
||
fdt->fds[idx].fd = -1;
|
||
fdt->fds[idx].for_read = 0;
|
||
fdt->fds[idx].for_write = 0;
|
||
fdt->fds[idx].opaque = NULL;
|
||
}
|
||
|
||
|
||
/* This is slightly embarrassing. The problem is that running an I/O
|
||
callback _may_ influence the status of other file descriptors. Our
|
||
own event loops could compensate for that, but the external event
|
||
loops cannot. FIXME: We may still want to optimize this a bit when
|
||
we are called from our own event loops. So if CHECKED is 1, the
|
||
check is skipped. */
|
||
gpgme_error_t
|
||
_gpgme_run_io_cb (struct io_select_fd_s *an_fds, int checked,
|
||
gpgme_error_t *op_err)
|
||
{
|
||
struct wait_item_s *item;
|
||
struct io_cb_data iocb_data;
|
||
gpgme_error_t err;
|
||
|
||
item = (struct wait_item_s *) an_fds->opaque;
|
||
assert (item);
|
||
|
||
if (!checked)
|
||
{
|
||
int nr;
|
||
struct io_select_fd_s fds;
|
||
|
||
TRACE0 (DEBUG_CTX, "_gpgme_run_io_cb", item, "need to check");
|
||
fds = *an_fds;
|
||
fds.signaled = 0;
|
||
/* Just give it a quick poll. */
|
||
nr = _gpgme_io_select (&fds, 1, 1);
|
||
assert (nr <= 1);
|
||
if (nr < 0)
|
||
return errno;
|
||
else if (nr == 0)
|
||
/* The status changed in the meantime, there is nothing left
|
||
to do. */
|
||
return 0;
|
||
}
|
||
|
||
TRACE2 (DEBUG_CTX, "_gpgme_run_io_cb", item, "handler (%p, %d)",
|
||
item->handler_value, an_fds->fd);
|
||
|
||
iocb_data.handler_value = item->handler_value;
|
||
iocb_data.op_err = 0;
|
||
err = item->handler (&iocb_data, an_fds->fd);
|
||
|
||
*op_err = iocb_data.op_err;
|
||
return err;
|
||
}
|