
* 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.
97 lines
2.9 KiB
C
97 lines
2.9 KiB
C
/* wait.h - Definitions for the wait queue interface.
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003, 2004 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. */
|
||
|
||
#ifndef WAIT_H
|
||
#define WAIT_H
|
||
|
||
#include "gpgme.h"
|
||
#include "sema.h"
|
||
|
||
struct fd_table
|
||
{
|
||
struct io_select_fd_s *fds;
|
||
size_t size;
|
||
};
|
||
typedef struct fd_table *fd_table_t;
|
||
|
||
/* Wait items are hooked into the io_select_fd_s to connect an fd with
|
||
a callback handler. */
|
||
struct wait_item_s
|
||
{
|
||
gpgme_ctx_t ctx;
|
||
gpgme_io_cb_t handler;
|
||
void *handler_value;
|
||
int dir;
|
||
};
|
||
|
||
/* A registered fd handler is removed later using the tag that
|
||
identifies it. */
|
||
struct tag
|
||
{
|
||
/* The context for which the fd was registered. */
|
||
gpgme_ctx_t ctx;
|
||
|
||
/* The index into the fd table for this context. */
|
||
int idx;
|
||
|
||
/* This is used by the wrappers for the user event loop. */
|
||
void *user_tag;
|
||
};
|
||
|
||
|
||
void _gpgme_fd_table_init (fd_table_t fdt);
|
||
void _gpgme_fd_table_deinit (fd_table_t fdt);
|
||
|
||
gpgme_error_t _gpgme_add_io_cb (void *data, int fd, int dir,
|
||
gpgme_io_cb_t fnc, void *fnc_data, void **r_tag);
|
||
void _gpgme_remove_io_cb (void *tag);
|
||
void _gpgme_wait_private_event_cb (void *data, gpgme_event_io_t type,
|
||
void *type_data);
|
||
void _gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type,
|
||
void *type_data);
|
||
|
||
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);
|
||
void _gpgme_wait_user_remove_io_cb (void *tag);
|
||
void _gpgme_wait_user_event_cb (void *data, gpgme_event_io_t type,
|
||
void *type_data);
|
||
|
||
gpgme_error_t _gpgme_run_io_cb (struct io_select_fd_s *an_fds, int checked,
|
||
gpgme_error_t *err);
|
||
|
||
|
||
/* Session based interfaces require to make a distinction between IPC
|
||
errors and operational errors. To glue this into the old
|
||
interface, I/O handlers (esp. the status handler) are called with a
|
||
struct as the opaque value that contains the handlers opaque value
|
||
but also a field for the operational error to be returned. */
|
||
struct io_cb_data
|
||
{
|
||
/* If this is the first field, the old internal code will still work. */
|
||
void *handler_value;
|
||
|
||
/* The I/O callback can pass an operational error here. */
|
||
gpgme_error_t op_err;
|
||
};
|
||
|
||
#endif /* WAIT_H */
|