2007-01-18 Marcus Brinkmann <marcus@g10code.de>

	* data.h (_gpgme_data_get_fd): Add prototype.
	(gpgme_data_get_fd_cb): New type.
	(struct _gpgme_data_cbs): New member get_fd.
	* data.c (_gpgme_data_get_fd): New function.
	* data-fd.c (fd_get_fd): New function.
	(fd_cbs): Add fd_get_fd.
	* data-stream.c (stream_get_fd): New function.
	(stream_cbs): Add stream_get_fd.
	* data-mem.c (mem_cbs): Add NULL for get_fd callback.
	* data-user.c (user_cbs): Likewise.
	* engine-gpgsm.c (gpgsm_set_fd) [USE_DESCRIPTOR_PASSING]: Try to
	short-cut by passing the data descriptor directly.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index f1ea70e1590b2d8dbb7a157d3f7a74c28fc1186a..2d04c3cd438326294dc8c1260d828d3d1dbe3dac 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,18 @@
+2007-01-18  Marcus Brinkmann  <marcus@g10code.de>
+
+       * data.h (_gpgme_data_get_fd): Add prototype.
+       (gpgme_data_get_fd_cb): New type.
+       (struct _gpgme_data_cbs): New member get_fd.
+       * data.c (_gpgme_data_get_fd): New function.
+       * data-fd.c (fd_get_fd): New function.
+       (fd_cbs): Add fd_get_fd.
+       * data-stream.c (stream_get_fd): New function.
+       (stream_cbs): Add stream_get_fd.
+       * data-mem.c (mem_cbs): Add NULL for get_fd callback.   
+       * data-user.c (user_cbs): Likewise.
+       * engine-gpgsm.c (gpgsm_set_fd) [USE_DESCRIPTOR_PASSING]: Try to
+       short-cut by passing the data descriptor directly.
+
 2007-01-17  Marcus Brinkmann  <marcus@g10code.de>
 
        * w32-io.c (build_commandline): Quote all command line arguments.

diff --git a/trunk/gpgme/data-fd.c b/trunk/gpgme/data-fd.c
index e3542bad92ae4097da48f6f09a86bc850955e3cf..2c65be197c8beee352a3cf0ea93c84a3a08d4a76 100644 (file)
--- a/trunk/gpgme/data-fd.c
+++ b/trunk/gpgme/data-fd.c
@@ -49,12 +49,20 @@ fd_seek (gpgme_data_t dh, off_t offset, int whence)
 }
 
 
+static int
+fd_get_fd (gpgme_data_t dh)
+{
+  return (dh->data.fd);
+}
+
+
 static struct _gpgme_data_cbs fd_cbs =
   {
     fd_read,
     fd_write,
     fd_seek,
-    NULL
+    NULL,
+    fd_get_fd
   };
 
 \f

diff --git a/trunk/gpgme/data-mem.c b/trunk/gpgme/data-mem.c
index 6e948ee00f5fcc6485c9e250fc97c5d434f3509c..c769811667e822309c2e0ae1439f27522748ade9 100644 (file)
--- a/trunk/gpgme/data-mem.c
+++ b/trunk/gpgme/data-mem.c
@@ -157,7 +157,8 @@ static struct _gpgme_data_cbs mem_cbs =
     mem_read,
     mem_write,
     mem_seek,
-    mem_release
+    mem_release,
+    NULL
   };
 
 \f

diff --git a/trunk/gpgme/data-stream.c b/trunk/gpgme/data-stream.c
index e76016851dffe5eb53ae75338da40fd25886b2a8..18ad111dce26a971c7f4cefcfad2025ac38f8fd8 100644 (file)
--- a/trunk/gpgme/data-stream.c
+++ b/trunk/gpgme/data-stream.c
@@ -71,12 +71,20 @@ stream_seek (gpgme_data_t dh, off_t offset, int whence)
 }
 
 
+static int
+stream_get_fd (gpgme_data_t dh)
+{
+  return fileno (dh->data.stream);
+}
+
+
 static struct _gpgme_data_cbs stream_cbs =
   {
     stream_read,
     stream_write,
     stream_seek,
-    NULL
+    NULL,
+    stream_get_fd
   };
 
 \f

diff --git a/trunk/gpgme/data-user.c b/trunk/gpgme/data-user.c
index f3deb32f1d2e52c51579d45346013491de1562d2..90a0f4210156ab53ebf58f11eef837f8a7213006 100644 (file)
--- a/trunk/gpgme/data-user.c
+++ b/trunk/gpgme/data-user.c
@@ -71,7 +71,8 @@ static struct _gpgme_data_cbs user_cbs =
     user_read,
     user_write,
     user_seek,
-    user_release
+    user_release,
+    NULL
   };
 
 \f

diff --git a/trunk/gpgme/data.c b/trunk/gpgme/data.c
index 788aaf0b07d6365b134849e398ee4fdb51d2615a..22768ff533dcd04ef9b19999bd5d86bbe37a2213 100644 (file)
--- a/trunk/gpgme/data.c
+++ b/trunk/gpgme/data.c
@@ -280,3 +280,14 @@ _gpgme_data_outbound_handler (void *opaque, int fd)
   dh->pending_len -= nwritten;
   return 0;
 }
+
+
+/* Get the file descriptor associated with DH, if possible.  Otherwise
+   return -1.  */
+int
+_gpgme_data_get_fd (gpgme_data_t dh)
+{
+  if (!dh || !dh->cbs->get_fd)
+    return -1;
+  return (*dh->cbs->get_fd) (dh);
+}

diff --git a/trunk/gpgme/data.h b/trunk/gpgme/data.h
index 80a86e69187c666611f6a3e1c11a6596f8301c76..370751d5d6786b2059dd14c0f9049c142cb54fed 100644 (file)
--- a/trunk/gpgme/data.h
+++ b/trunk/gpgme/data.h
@@ -52,12 +52,16 @@ typedef off_t (*gpgme_data_seek_cb) (gpgme_data_t dh, off_t offset,
 /* Release the data object with the handle DH.  */
 typedef void (*gpgme_data_release_cb) (gpgme_data_t dh);
 
+/* Get the FD associated with the handle DH, or -1.  */
+typedef int (*gpgme_data_get_fd_cb) (gpgme_data_t dh);
+
 struct _gpgme_data_cbs
 {
   gpgme_data_read_cb read;
   gpgme_data_write_cb write;
   gpgme_data_seek_cb seek;
   gpgme_data_release_cb release;
+  gpgme_data_get_fd_cb get_fd;
 };
 
 struct gpgme_data
@@ -121,4 +125,8 @@ gpgme_error_t _gpgme_data_new (gpgme_data_t *r_dh,
 
 void _gpgme_data_release (gpgme_data_t dh);
 
+/* Get the file descriptor associated with DH, if possible.  Otherwise
+   return -1.  */
+int _gpgme_data_get_fd (gpgme_data_t dh);
+
 #endif /* DATA_H */

diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c
index b170180d26f64809386f677d388d1b50059428c2..7bb71cf240f1e217599aeb3e927b1ba0a6096ced 100644 (file)
--- a/trunk/gpgme/engine-gpgsm.c
+++ b/trunk/gpgme/engine-gpgsm.c
@@ -692,22 +692,26 @@ gpgsm_set_fd (engine_gpgsm_t gpgsm, fd_type_t fd_type, const char *opt)
   dir = iocb_data->dir;
 
 #if USE_DESCRIPTOR_PASSING
-  {
-    int fds[2];
+  /* We try to short-cut the communication by giving GPGSM direct
+     access to the file descriptor, rather than using a pipe.  */
+  iocb_data->server_fd = _gpgme_data_get_fd (iocb_data->data);
+  if (iocb_data->server_fd < 0)
+    {
+      int fds[2];
 
-    if (_gpgme_io_pipe (fds, 0) < 0)
-      return gpg_error_from_errno (errno);
+      if (_gpgme_io_pipe (fds, 0) < 0)
+       return gpg_error_from_errno (errno);
 
-    iocb_data->fd = dir ? fds[0] : fds[1];
-    iocb_data->server_fd = dir ? fds[1] : fds[0];
+      iocb_data->fd = dir ? fds[0] : fds[1];
+      iocb_data->server_fd = dir ? fds[1] : fds[0];
 
-    if (_gpgme_io_set_close_notify (iocb_data->fd,
-                                   close_notify_handler, gpgsm))
-      {
-       err = gpg_error (GPG_ERR_GENERAL);
-       goto leave_set_fd;
-      }
-  }
+      if (_gpgme_io_set_close_notify (iocb_data->fd,
+                                     close_notify_handler, gpgsm))
+       {
+         err = gpg_error (GPG_ERR_GENERAL);
+         goto leave_set_fd;
+       }
+    }
 #endif
 
   fd = iocb_data->server_fd;

diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index 3e64d47b34cde80f569ebb215c854281384eb8f2..dcf897c81e78853011f05a03c303f67acfae677c 100644 (file)
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -72,7 +72,7 @@ extern "C" {
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "1.1.3-cvs1200"
+#define GPGME_VERSION "1.1.3-cvs1202"
 
 
 \f