[svn] GnuPG - r5379 - in trunk: . common dirmngr
svn author wk
cvs at cvs.gnupg.org
Mon Aug 2 20:54:54 CEST 2010
Author: wk
Date: 2010-08-02 20:54:53 +0200 (Mon, 02 Aug 2010)
New Revision: 5379
Modified:
trunk/ChangeLog
trunk/common/ChangeLog
trunk/common/estream.c
trunk/configure.ac
trunk/dirmngr/ChangeLog
trunk/dirmngr/Makefile.am
trunk/dirmngr/dirmngr_ldap.c
trunk/dirmngr/ldap-wrapper-ce.c
Log:
Add code for a threaded LDAP access to replace the wrapper process.
Currently used for W32 and W32CE.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/ChangeLog 2010-08-02 18:54:53 UTC (rev 5379)
@@ -1,3 +1,12 @@
+2010-08-02 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Require libksba 1.1.0 due to the use of
+ ksba_reader_set_release_notify.
+
+2010-07-30 Werner Koch <wk at g10code.com>
+
+ * configure.ac (GNUPG_PTH_PATH) [W32]: Require version 2.0.3.
+
2010-07-25 Werner Koch <wk at g10code.com>
* configure.ac (USE_LDAPWRAPPER): AC_DEFINE and AM_CONDITIONAL it.
Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/common/ChangeLog 2010-08-02 18:54:53 UTC (rev 5379)
@@ -1,3 +1,7 @@
+2010-07-26 Werner Koch <wk at g10code.com>
+
+ * estream.c (es_func_fp_write) [W32]: Write smaller chunks.
+
2010-07-25 Werner Koch <wk at g10code.com>
* argparse.c (initialize): Use ARGPARSE_PRINT_WARNING constant.
Modified: trunk/dirmngr/ChangeLog
===================================================================
--- trunk/dirmngr/ChangeLog 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/dirmngr/ChangeLog 2010-08-02 18:54:53 UTC (rev 5379)
@@ -1,3 +1,8 @@
+2010-07-26 Werner Koch <wk at g10code.com>
+
+ * dirmngr_ldap.c (print_ldap_entries): Remove special fwrite case
+ for W32 because that is now handles by estream.
+
2010-07-25 Werner Koch <wk at g10code.com>
* Makefile.am (dirmngr_SOURCES) [!USE_LDAPWRAPPER]: Build
Modified: trunk/common/estream.c
===================================================================
--- trunk/common/estream.c 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/common/estream.c 2010-08-02 18:54:53 UTC (rev 5379)
@@ -955,7 +955,28 @@
if (file_cookie->fp)
- bytes_written = fwrite (buffer, 1, size, file_cookie->fp);
+ {
+#ifdef HAVE_W32_SYSTEM
+ /* Using an fwrite to stdout connected to the console fails with
+ the error "Not enough space" for an fwrite size of >= 52KB
+ (tested on Windows XP SP2). To solve this we always chunk
+ the writes up into smaller blocks. */
+ bytes_written = 0;
+ while (bytes_written < size)
+ {
+ size_t cnt = size - bytes_written;
+
+ if (cnt > 32*1024)
+ cnt = 32*1024;
+ if (fwrite ((const char*)buffer + bytes_written,
+ cnt, 1, file_cookie->fp) != 1)
+ break; /* Write error. */
+ bytes_written += cnt;
+ }
+#else
+ bytes_written = fwrite (buffer, 1, size, file_cookie->fp);
+#endif
+ }
else
bytes_written = size; /* Successfully written to the bit bucket. */
if (bytes_written != size)
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/configure.ac 2010-08-02 18:54:53 UTC (rev 5379)
@@ -49,7 +49,7 @@
NEED_LIBASSUAN_VERSION=2.0.0
NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.0.2
+NEED_KSBA_VERSION=1.1.0
PACKAGE=$PACKAGE_NAME
@@ -785,7 +785,11 @@
# Check whether the GNU Pth library is available
# Note, that we include a Pth emulation for W32.
#
-GNUPG_PATH_PTH
+if test "$have_w32_system" = yes; then
+ GNUPG_PATH_PTH([2.0.4])
+else
+ GNUPG_PATH_PTH
+fi
if test "$have_pth" = "yes"; then
AC_DEFINE(USE_GNU_PTH, 1,
[Defined if the GNU Portable Thread Library should be used])
Modified: trunk/dirmngr/Makefile.am
===================================================================
--- trunk/dirmngr/Makefile.am 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/dirmngr/Makefile.am 2010-08-02 18:54:53 UTC (rev 5379)
@@ -36,12 +36,18 @@
BUILT_SOURCES = no-libgcrypt.c
+if HAVE_W32_SYSTEM
+ldap_url = ldap-url.h ldap-url.c
+else
+ldap_url =
+endif
+
noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h
dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \
ldapserver.h ldapserver.c certcache.c certcache.h \
cdb.h cdblib.c ldap.c misc.c dirmngr-err.h \
- ocsp.c ocsp.h validate.c validate.h ldap-wrapper.h
+ ocsp.c ocsp.h validate.c validate.h ldap-wrapper.h $(ldap_url)
if USE_LDAPWRAPPER
dirmngr_SOURCES += ldap-wrapper.c
@@ -52,13 +58,11 @@
dirmngr_LDADD = $(libcommonpth) ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV)
-
-if HAVE_W32_SYSTEM
-ldap_url = ldap-url.h ldap-url.c
-else
-ldap_url =
+if !USE_LDAPWRAPPER
+dirmngr_LDADD += $(LDAPLIBS)
endif
+
if USE_LDAPWRAPPER
dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url) no-libgcrypt.c
dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS)
Modified: trunk/dirmngr/dirmngr_ldap.c
===================================================================
--- trunk/dirmngr/dirmngr_ldap.c 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/dirmngr/dirmngr_ldap.c 2010-08-02 18:54:53 UTC (rev 5379)
@@ -32,6 +32,9 @@
#include <assert.h>
#include <sys/time.h>
#include <unistd.h>
+#ifndef USE_LDAPWRAPPER
+# include <pth.h>
+#endif
#ifdef HAVE_W32_SYSTEM
#include <winsock2.h>
@@ -55,10 +58,15 @@
#include "i18n.h"
#include "util.h"
-/* If we are not using the ldap wrapper process we need to include the
- prototype for our module's main function. */
-#ifndef USE_LDAPWRAPPER
-#include "./ldap-wrapper.h"
+/* With the ldap wrapper, there is no need for the pth_enter and leave
+ functions; thus we redefine them to nops. If we are not using the
+ ldap wrapper process we need to include the prototype for our
+ module's main function. */
+#ifdef USE_LDAPWRAPPER
+# define pth_enter() do { } while (0)
+# define pth_leave() do { } while (0)
+#else
+# include "./ldap-wrapper.h"
#endif
#define DEFAULT_LDAP_TIMEOUT 100 /* Arbitrary long timeout. */
@@ -145,6 +153,7 @@
/* Function called by argparse.c to display information. */
+#ifndef USE_LDAPWRAPPER
static const char *
my_strusage (int level)
{
@@ -172,6 +181,7 @@
}
return p;
}
+#endif /*!USE_LDAPWRAPPER*/
int
@@ -330,8 +340,10 @@
static void
set_timeout (my_opt_t myopt)
{
-#ifndef HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
/* FIXME for W32. */
+ (void)myopt;
+#else
if (myopt->alarm_timeout)
alarm (myopt->alarm_timeout);
#endif
@@ -345,8 +357,9 @@
LDAPMessage *item;
int any = 0;
- for (item = ldap_first_entry (ld, msg); item;
- item = ldap_next_entry (ld, item))
+ for (pth_enter (), item = ldap_first_entry (ld, msg), pth_leave ();
+ item;
+ pth_enter (), item = ldap_next_entry (ld, item), pth_leave ())
{
BerElement *berctx;
char *attr;
@@ -366,8 +379,11 @@
}
- for (attr = ldap_first_attribute (ld, item, &berctx); attr;
- attr = ldap_next_attribute (ld, item, berctx))
+ for (pth_enter (), attr = ldap_first_attribute (ld, item, &berctx),
+ pth_leave ();
+ attr;
+ pth_enter (), attr = ldap_next_attribute (ld, item, berctx),
+ pth_leave ())
{
struct berval **values;
int idx;
@@ -404,8 +420,10 @@
}
}
+ pth_enter ();
values = ldap_get_values_len (ld, item, attr);
-
+ pth_leave ();
+
if (!values)
{
if (myopt->verbose)
@@ -469,11 +487,7 @@
return -1;
}
}
-#if 1
- /* Note: this does not work for STDOUT on a Windows
- console, where it fails with "Not enough space" for
- CRLs which are 52 KB or larger. */
-#warning still true - implement in estream
+
if (es_fwrite (values[0]->bv_val, values[0]->bv_len,
1, myopt->outstream) != 1)
{
@@ -484,33 +498,7 @@
ber_free (berctx, 0);
return -1;
}
-#else
- /* On Windows console STDOUT, we have to break up the
- writes into small parts. */
- {
- int n = 0;
- while (n < values[0]->bv_len)
- {
- int cnt = values[0]->bv_len - n;
- /* The actual limit is (52 * 1024 - 1) on Windows XP SP2. */
-#define MAX_CNT (32*1024)
- if (cnt > MAX_CNT)
- cnt = MAX_CNT;
-
- if (es_fwrite (((char *) values[0]->bv_val) + n, cnt, 1,
- myopt->outstream) != 1)
- {
- log_error (_("error writing to stdout: %s\n"),
- strerror (errno));
- ldap_value_free_len (values);
- ldap_memfree (attr);
- ber_free (berctx, 0);
- return -1;
- }
- n += cnt;
- }
- }
-#endif
+
any = 1;
if (!myopt->multi)
break; /* Print only the first value. */
@@ -540,6 +528,7 @@
int rc = 0;
char *host, *dn, *filter, *attrs[2], *attr;
int port;
+ int ret;
host = myopt->host? myopt->host : ludp->lud_host;
port = myopt->port? myopt->port : ludp->lud_port;
@@ -594,14 +583,19 @@
set_timeout (myopt);
+ pth_enter ();
ld = ldap_init (host, port);
+ pth_leave ();
if (!ld)
{
log_error (_("LDAP init to `%s:%d' failed: %s\n"),
host, port, strerror (errno));
return -1;
}
- if (ldap_simple_bind_s (ld, myopt->user, myopt->pass))
+ pth_enter ();
+ ret = ldap_simple_bind_s (ld, myopt->user, myopt->pass);
+ pth_leave ();
+ if (ret)
{
log_error (_("binding to `%s:%d' failed: %s\n"),
host, port, strerror (errno));
@@ -610,11 +604,13 @@
}
set_timeout (myopt);
+ pth_enter ();
rc = ldap_search_st (ld, dn, ludp->lud_scope, filter,
myopt->multi && !myopt->attr && ludp->lud_attrs?
ludp->lud_attrs:attrs,
0,
&myopt->timeout, &msg);
+ pth_leave ();
if (rc == LDAP_SIZELIMIT_EXCEEDED && myopt->multi)
{
if (es_fwrite ("E\0\0\0\x09truncated", 14, 1, myopt->outstream) != 1)
Modified: trunk/dirmngr/ldap-wrapper-ce.c
===================================================================
--- trunk/dirmngr/ldap-wrapper-ce.c 2010-07-26 14:27:59 UTC (rev 5378)
+++ trunk/dirmngr/ldap-wrapper-ce.c 2010-08-02 18:54:53 UTC (rev 5379)
@@ -36,6 +36,7 @@
#include <fcntl.h>
#include <time.h>
#include <pth.h>
+#include <assert.h>
#include "dirmngr.h"
#include "misc.h"
@@ -46,260 +47,399 @@
#endif
-/* To keep track of the LDAP wrapper state we use this structure. */
-struct wrapper_context_s
+
+/* Read a fixed amount of data from READER into BUFFER. */
+static gpg_error_t
+read_buffer (ksba_reader_t reader, unsigned char *buffer, size_t count)
{
- struct wrapper_context_s *next;
+ gpg_error_t err;
+ size_t nread;
+
+ while (count)
+ {
+ err = ksba_reader_read (reader, buffer, count, &nread);
+ if (err)
+ return err;
+ buffer += nread;
+ count -= nread;
+ }
+ return 0;
+}
- pid_t pid; /* The pid of the wrapper process. */
- int printable_pid; /* Helper to print diagnostics after the process has
- been cleaned up. */
- int fd; /* Connected with stdout of the ldap wrapper. */
- gpg_error_t fd_error; /* Set to the gpg_error of the last read error
- if any. */
- int log_fd; /* Connected with stderr of the ldap wrapper. */
- pth_event_t log_ev;
- ctrl_t ctrl; /* Connection data. */
- int ready; /* Internally used to mark to be removed contexts. */
- ksba_reader_t reader; /* The ksba reader object or NULL. */
- char *line; /* Used to print the log lines (malloced). */
- size_t linesize;/* Allocated size of LINE. */
- size_t linelen; /* Use size of LINE. */
- time_t stamp; /* The last time we noticed ativity. */
-};
-/* We keep a global list of spawed wrapper process. A separate thread
- makes use of this list to log error messages and to watch out for
- finished processes. */
-static struct wrapper_context_s *wrapper_list;
+/* Start the reaper thread for this wrapper. */
+void
+ldap_wrapper_launch_thread (void)
+{
+ /* Not required. */
+}
-/* We need to know whether we are shutting down the process. */
-static int shutting_down;
-/* Start the reaper thread for this wrapper. */
+
+/* Wait until all ldap wrappers have terminated. We assume that the
+ kill has already been sent to all of them. */
void
-ldap_wrapper_launch_thread (void)
+ldap_wrapper_wait_connections ()
{
- static int done;
- pth_attr_t tattr;
+ /* Not required. */
+}
- if (done)
- return;
- done = 1;
- tattr = pth_attr_new();
- pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
- pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 256*1024);
- pth_attr_set (tattr, PTH_ATTR_NAME, "ldap-reaper");
+/* Cleanup all resources held by the connection associated with
+ CTRL. This is used after a cancel to kill running wrappers. */
+void
+ldap_wrapper_connection_cleanup (ctrl_t ctrl)
+{
+ (void)ctrl;
- if (!pth_spawn (tattr, ldap_wrapper_thread, NULL))
+ /* Not required. */
+}
+
+
+
+/* The cookie we use to implement the outstream of the wrapper thread. */
+struct outstream_cookie_s
+{
+ int refcount; /* Reference counter - possible values are 1 and 2. */
+
+ int eof_seen; /* EOF indicator. */
+ size_t buffer_len; /* The valid length of the BUFFER. */
+ size_t buffer_pos; /* The next read position of the BUFFER. */
+ char buffer[4000]; /* Data buffer. */
+};
+
+
+/* The writer function for the outstream. This is used to transfer
+ the output of the ldap wrapper thread to the ksba reader object. */
+static ssize_t
+outstream_cookie_writer (void *cookie_arg, const void *buffer, size_t size)
+{
+ struct outstream_cookie_s *cookie = cookie_arg;
+ const char *src;
+ char *dst;
+ ssize_t nwritten = 0;
+
+ src = buffer;
+ do
{
- log_error (_("error spawning ldap wrapper reaper thread: %s\n"),
- strerror (errno) );
- dirmngr_exit (1);
+ /* Wait for free space. */
+ while (cookie->buffer_len == DIM (cookie->buffer))
+ {
+ /* Buffer is full: Wait for space. */
+ pth_yield (NULL);
+ }
+
+ /* Copy data. */
+ dst = cookie->buffer + cookie->buffer_len;
+ while (size && cookie->buffer_len < DIM (cookie->buffer))
+ {
+ *dst++ = *src++;
+ size--;
+ cookie->buffer_len++;
+ nwritten++;
+ }
}
- pth_attr_destroy (tattr);
+ while (size); /* Until done. */
+
+ if (nwritten)
+ {
+ /* Signal data is available - a pth_yield is sufficient because
+ the test is explicit. To increase performance we could do a
+ pth_yield to the other thread and only fall back to yielding
+ to any thread if that returns an error (i.e. the other thread
+ is not runnable). However our w32pth does not yet support
+ yielding to a specific thread, thus this won't help. */
+ pth_yield (NULL);
+ }
+
+ return nwritten;
}
+static void
+outstream_release_cookie (struct outstream_cookie_s *cookie)
+{
+ cookie->refcount--;
+ if (!cookie->refcount)
+ xfree (cookie);
+}
+/* Closer function for the outstream. This deallocates the cookie if
+ it won't be used anymore. */
+static int
+outstream_cookie_closer (void *cookie_arg)
+{
+ struct outstream_cookie_s *cookie = cookie_arg;
-/* Wait until all ldap wrappers have terminated. We assume that the
- kill has already been sent to all of them. */
-void
-ldap_wrapper_wait_connections ()
+ if (!cookie)
+ return 0; /* Nothing to do. */
+
+ cookie->eof_seen = 1; /* (only useful if refcount > 1) */
+
+ assert (cookie->refcount > 0);
+ outstream_release_cookie (cookie);
+ return 0;
+}
+
+
+/* The KSBA reader callback which takes the output of the ldap thread
+ form the outstream_cookie_writer and make it available to the ksba
+ reader. */
+static int
+outstream_reader_cb (void *cb_value, char *buffer, size_t count,
+ size_t *r_nread)
{
- shutting_down = 1;
- while (wrapper_list)
- pth_yield (NULL);
+ struct outstream_cookie_s *cookie = cb_value;
+ char *dst;
+ const char *src;
+ size_t nread = 0;
+
+ if (!buffer && !count && !nread)
+ return gpg_error (GPG_ERR_NOT_SUPPORTED); /* Rewind is not supported. */
+
+ *r_nread = 0;
+ dst = buffer;
+
+ while (cookie->buffer_pos == cookie->buffer_len)
+ {
+ if (cookie->eof_seen)
+ return gpg_error (GPG_ERR_EOF);
+
+ /* Wait for data to become available. */
+ pth_yield (NULL);
+ }
+
+ src = cookie->buffer + cookie->buffer_pos;
+ while (count && cookie->buffer_pos < cookie->buffer_len)
+ {
+ *dst++ = *src++;
+ count--;
+ cookie->buffer_pos++;
+ nread++;
+ }
+
+ if (cookie->buffer_pos == cookie->buffer_len)
+ cookie->buffer_pos = cookie->buffer_len = 0;
+
+ /* Now there should be some space available. We do this even if
+ COUNT was zero so to give the writer end a chance to continue. */
+ pth_yield (NULL);
+
+ *r_nread = nread;
+ return 0; /* Success. */
}
+/* This function is called by ksba_reader_release. */
+static void
+outstream_reader_released (void *cb_value, ksba_reader_t r)
+{
+ struct outstream_cookie_s *cookie = cb_value;
+
+ (void)r;
+
+ assert (cookie->refcount > 0);
+ outstream_release_cookie (cookie);
+}
+
+
+
/* This function is to be used to release a context associated with the
- given reader object. */
+ given reader object. This does not release the reader object, though. */
void
ldap_wrapper_release_context (ksba_reader_t reader)
{
- if (!reader )
- return;
-
- for (ctx=wrapper_list; ctx; ctx=ctx->next)
- if (ctx->reader == reader)
- {
- if (DBG_LOOKUP)
- log_info ("releasing ldap worker c=%p pid=%d/%d rdr=%p ctrl=%p/%d\n",
- ctx,
- (int)ctx->pid, (int)ctx->printable_pid,
- ctx->reader,
- ctx->ctrl, ctx->ctrl? ctx->ctrl->refcount:0);
+ (void)reader;
+ /* Nothing to do. */
+}
- ctx->reader = NULL;
- SAFE_PTH_CLOSE (ctx->fd);
- if (ctx->ctrl)
- {
- ctx->ctrl->refcount--;
- ctx->ctrl = NULL;
- }
- if (ctx->fd_error)
- log_info (_("reading from ldap wrapper %d failed: %s\n"),
- ctx->printable_pid, gpg_strerror (ctx->fd_error));
- break;
- }
+
+
+/* Free a NULL terminated array of malloced strings and the array
+ itself. */
+static void
+free_arg_list (char **arg_list)
+{
+ int i;
+
+ if (arg_list)
+ {
+ for (i=0; arg_list[i]; i++)
+ xfree (arg_list[i]);
+ xfree (arg_list);
+ }
}
-/* Cleanup all resources held by the connection associated with
- CTRL. This is used after a cancel to kill running wrappers. */
-void
-ldap_wrapper_connection_cleanup (ctrl_t ctrl)
+
+/* Copy ARGV into a new array and prepend one element as name of the
+ program (which is more or less a stub). We need to allocate all
+ the strings to get ownership of them. */
+static gpg_error_t
+create_arg_list (const char *argv[], char ***r_arg_list)
{
- struct wrapper_context_s *ctx;
+ gpg_error_t err;
+ char **arg_list;
+ int i, j;
- for (ctx=wrapper_list; ctx; ctx=ctx->next)
- if (ctx->ctrl && ctx->ctrl == ctrl)
- {
- ctx->ctrl->refcount--;
- ctx->ctrl = NULL;
- if (ctx->pid != (pid_t)(-1))
- gnupg_kill_process (ctx->pid);
- if (ctx->fd_error)
- log_info (_("reading from ldap wrapper %d failed: %s\n"),
- ctx->printable_pid, gpg_strerror (ctx->fd_error));
- }
+ for (i = 0; argv[i]; i++)
+ ;
+ arg_list = xtrycalloc (i + 2, sizeof *arg_list);
+ if (!arg_list)
+ goto outofcore;
+
+ i = 0;
+ arg_list[i] = xtrystrdup ("<ldap-wrapper-thread>");
+ if (!arg_list[i])
+ goto outofcore;
+ i++;
+ for (j=0; argv[j]; j++)
+ {
+ arg_list[i] = xtrystrdup (argv[j]);
+ if (!arg_list[i])
+ goto outofcore;
+ i++;
+ }
+ arg_list[i] = NULL;
+ *r_arg_list = arg_list;
+ return 0;
+
+ outofcore:
+ err = gpg_error_from_syserror ();
+ log_error (_("error allocating memory: %s\n"), strerror (errno));
+ free_arg_list (arg_list);
+ *r_arg_list = NULL;
+ return err;
+
}
+
+/* Parameters passed to the wrapper thread. */
+struct ldap_wrapper_thread_parms
+{
+ char **arg_list;
+ estream_t outstream;
+};
+
+/* The thread which runs the LDAP wrapper. */
+static void *
+ldap_wrapper_thread (void *opaque)
+{
+ struct ldap_wrapper_thread_parms *parms = opaque;
+
+ /*err =*/ ldap_wrapper_main (parms->arg_list, parms->outstream);
+
+ /* FIXME: Do we need to return ERR? */
+
+ free_arg_list (parms->arg_list);
+ es_fclose (parms->outstream);
+ xfree (parms);
+ return NULL;
+}
+
+
+
/* Start a new LDAP thread and returns a new libksba reader
object at READER. ARGV is a NULL terminated list of arguments for
the wrapper. The function returns 0 on success or an error code. */
gpg_error_t
-ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
+ldap_wrapper (ctrl_t ctrl, ksba_reader_t *r_reader, const char *argv[])
{
gpg_error_t err;
- pid_t pid;
- struct wrapper_context_s *ctx;
- int i;
- int j;
- const char **arg_list;
- const char *pgmname;
- int outpipe[2], errpipe[2];
+ struct ldap_wrapper_thread_parms *parms;
+ pth_attr_t tattr;
+ es_cookie_io_functions_t outstream_func = { NULL };
+ struct outstream_cookie_s *outstream_cookie;
+ ksba_reader_t reader;
- /* It would be too simple to connect stderr just to our logging
- stream. The problem is that if we are running multi-threaded
- everything gets intermixed. Clearly we don't want this. So the
- only viable solutions are either to have another thread
- responsible for logging the messages or to add an option to the
- wrapper module to do the logging on its own. Given that we anyway
- need a way to rip the child process and this is best done using a
- general ripping thread, that thread can do the logging too. */
+ (void)ctrl;
- *reader = NULL;
+ *r_reader = NULL;
- /* Files: We need to prepare stdin and stdout. We get stderr from
- the function. */
- if (!opt.ldap_wrapper_program || !*opt.ldap_wrapper_program)
- pgmname = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR_LDAP);
- else
- pgmname = opt.ldap_wrapper_program;
+ parms = xtrycalloc (1, sizeof *parms);
+ if (!parms)
+ return gpg_error_from_syserror ();
- /* Create command line argument array. */
- for (i = 0; argv[i]; i++)
- ;
- arg_list = xtrycalloc (i + 2, sizeof *arg_list);
- if (!arg_list)
+ err = create_arg_list (argv, &parms->arg_list);
+ if (err)
{
- err = gpg_error_from_syserror ();
- log_error (_("error allocating memory: %s\n"), strerror (errno));
+ xfree (parms);
return err;
}
- for (i = j = 0; argv[i]; i++, j++)
- if (!i && argv[i + 1] && !strcmp (*argv, "--pass"))
- {
- arg_list[j] = "--env-pass";
- setenv ("DIRMNGR_LDAP_PASS", argv[1], 1);
- i++;
- }
- else
- arg_list[j] = (char*) argv[i];
- ctx = xtrycalloc (1, sizeof *ctx);
- if (!ctx)
+ outstream_cookie = xtrycalloc (1, sizeof *outstream_cookie);
+ if (!outstream_cookie)
{
err = gpg_error_from_syserror ();
- log_error (_("error allocating memory: %s\n"), strerror (errno));
- xfree (arg_list);
+ free_arg_list (parms->arg_list);
+ xfree (parms);
return err;
}
+ outstream_cookie->refcount++;
- err = gnupg_create_inbound_pipe (outpipe);
+ err = ksba_reader_new (&reader);
if (!err)
- {
- err = gnupg_create_inbound_pipe (errpipe);
- if (err)
- {
- close (outpipe[0]);
- close (outpipe[1]);
- }
- }
+ err = ksba_reader_set_release_notify (reader,
+ outstream_reader_released,
+ outstream_cookie);
+ if (!err)
+ err = ksba_reader_set_cb (reader,
+ outstream_reader_cb, outstream_cookie);
if (err)
{
- log_error (_("error creating pipe: %s\n"), gpg_strerror (err));
- xfree (arg_list);
- xfree (ctx);
+ log_error (_("error initializing reader object: %s\n"),
+ gpg_strerror (err));
+ ksba_reader_release (reader);
+ outstream_release_cookie (outstream_cookie);
+ free_arg_list (parms->arg_list);
+ xfree (parms);
return err;
}
- err = gnupg_spawn_process_fd (pgmname, arg_list,
- -1, outpipe[1], errpipe[1], &pid);
- xfree (arg_list);
- close (outpipe[1]);
- close (errpipe[1]);
- if (err)
+
+ outstream_func.func_write = outstream_cookie_writer;
+ outstream_func.func_close = outstream_cookie_closer;
+ parms->outstream = es_fopencookie (outstream_cookie, "wb", outstream_func);
+ if (!parms->outstream)
{
- close (outpipe[0]);
- close (errpipe[0]);
- xfree (ctx);
+ err = gpg_error_from_syserror ();
+ free_arg_list (parms->arg_list);
+ outstream_release_cookie (outstream_cookie);
+ xfree (parms);
return err;
}
+ outstream_cookie->refcount++;
- ctx->pid = pid;
- ctx->printable_pid = (int) pid;
- ctx->fd = outpipe[0];
- ctx->log_fd = errpipe[0];
- ctx->log_ev = pth_event (PTH_EVENT_FD | PTH_UNTIL_FD_READABLE, ctx->log_fd);
- if (! ctx->log_ev)
+ tattr = pth_attr_new();
+ pth_attr_set (tattr, PTH_ATTR_JOINABLE, 0);
+ pth_attr_set (tattr, PTH_ATTR_STACK_SIZE, 128*1024);
+ pth_attr_set (tattr, PTH_ATTR_NAME, "ldap-wrapper");
+
+ if (pth_spawn (tattr, ldap_wrapper_thread, parms))
+ parms = NULL; /* Now owned by the thread. */
+ else
{
- xfree (ctx);
- return gpg_error_from_syserror ();
+ err = gpg_error_from_syserror ();
+ log_error ("error spawning ldap wrapper thread: %s\n",
+ strerror (errno) );
}
- ctx->ctrl = ctrl;
- ctrl->refcount++;
- ctx->stamp = time (NULL);
-
- err = ksba_reader_new (reader);
- if (!err)
- err = ksba_reader_set_cb (*reader, reader_callback, ctx);
+ pth_attr_destroy (tattr);
+ if (parms)
+ {
+ free_arg_list (parms->arg_list);
+ es_fclose (parms->outstream);
+ xfree (parms);
+ }
if (err)
{
- log_error (_("error initializing reader object: %s\n"),
- gpg_strerror (err));
- destroy_wrapper (ctx);
- ksba_reader_release (*reader);
- *reader = NULL;
+ ksba_reader_release (reader);
return err;
}
- /* Hook the context into our list of running wrappers. */
- ctx->reader = *reader;
- ctx->next = wrapper_list;
- wrapper_list = ctx;
- if (opt.verbose)
- log_info ("ldap wrapper %d started (reader %p)\n",
- (int)ctx->pid, ctx->reader);
-
/* Need to wait for the first byte so we are able to detect an empty
output and not let the consumer see an EOF without further error
indications. The CRL loading logic assumes that after return
@@ -308,19 +448,20 @@
{
unsigned char c;
- err = read_buffer (*reader, &c, 1);
+ err = read_buffer (reader, &c, 1);
if (err)
{
- ldap_wrapper_release_context (*reader);
- ksba_reader_release (*reader);
- *reader = NULL;
+ ksba_reader_release (reader);
+ reader = NULL;
if (gpg_err_code (err) == GPG_ERR_EOF)
return gpg_error (GPG_ERR_NO_DATA);
else
return err;
}
- ksba_reader_unread (*reader, &c, 1);
+ ksba_reader_unread (reader, &c, 1);
}
+ *r_reader = reader;
+
return 0;
}
More information about the Gnupg-commits
mailing list