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.
131 lines
3.2 KiB
C
131 lines
3.2 KiB
C
/* wait-user.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 <assert.h>
|
||
|
||
#include "gpgme.h"
|
||
#include "context.h"
|
||
#include "priv-io.h"
|
||
#include "wait.h"
|
||
#include "ops.h"
|
||
|
||
|
||
/* The user event loops are used for all asynchronous operations for
|
||
which a user callback is defined. */
|
||
|
||
|
||
/* Internal I/O Callbacks. */
|
||
|
||
gpgme_error_t
|
||
_gpgme_user_io_cb_handler (void *data, int fd)
|
||
{
|
||
gpgme_error_t err = 0;
|
||
gpgme_error_t op_err = 0;
|
||
struct tag *tag = (struct tag *) data;
|
||
gpgme_ctx_t ctx;
|
||
|
||
assert (data);
|
||
ctx = tag->ctx;
|
||
assert (ctx);
|
||
|
||
LOCK (ctx->lock);
|
||
if (ctx->canceled)
|
||
err = gpg_error (GPG_ERR_CANCELED);
|
||
UNLOCK (ctx->lock);
|
||
|
||
if (! err)
|
||
err = _gpgme_run_io_cb (&ctx->fdt.fds[tag->idx], 0, &op_err);
|
||
if (err || op_err)
|
||
_gpgme_cancel_with_err (ctx, err, op_err);
|
||
else
|
||
{
|
||
unsigned int i;
|
||
|
||
for (i = 0; i < ctx->fdt.size; i++)
|
||
if (ctx->fdt.fds[i].fd != -1)
|
||
break;
|
||
|
||
if (i == ctx->fdt.size)
|
||
{
|
||
struct gpgme_io_event_done_data done_data;
|
||
|
||
done_data.err = 0;
|
||
done_data.op_err = 0;
|
||
_gpgme_engine_io_event (ctx->engine, GPGME_EVENT_DONE, &done_data);
|
||
}
|
||
}
|
||
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_wait_user_add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc,
|
||
void *fnc_data, void **r_tag)
|
||
{
|
||
gpgme_ctx_t ctx = (gpgme_ctx_t) data;
|
||
struct tag *tag;
|
||
gpgme_error_t err;
|
||
|
||
assert (ctx);
|
||
err = _gpgme_add_io_cb (data, fd, dir, fnc, fnc_data, r_tag);
|
||
if (err)
|
||
return err;
|
||
tag = *r_tag;
|
||
assert (tag);
|
||
err = (*ctx->io_cbs.add) (ctx->io_cbs.add_priv, fd, dir,
|
||
_gpgme_user_io_cb_handler, *r_tag,
|
||
&tag->user_tag);
|
||
if (err)
|
||
_gpgme_remove_io_cb (*r_tag);
|
||
return err;
|
||
}
|
||
|
||
|
||
void
|
||
_gpgme_wait_user_remove_io_cb (void *data)
|
||
{
|
||
struct tag *tag = (struct tag *) data;
|
||
gpgme_ctx_t ctx;
|
||
|
||
assert (tag);
|
||
ctx = tag->ctx;
|
||
|
||
(*ctx->io_cbs.remove) (tag->user_tag);
|
||
_gpgme_remove_io_cb (data);
|
||
}
|
||
|
||
|
||
void
|
||
_gpgme_wait_user_event_cb (void *data, gpgme_event_io_t type, void *type_data)
|
||
{
|
||
gpgme_ctx_t ctx = data;
|
||
|
||
if (ctx->io_cbs.event)
|
||
(*ctx->io_cbs.event) (ctx->io_cbs.event_priv, type, type_data);
|
||
}
|