From 3297e453aa0e371e14fd26e53f4a6f84e20c21d3 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 7 Nov 2022 13:15:13 +0900
Subject: w32: Support fd passing through socket.

* src/assuan-socket-connect.c (_assuan_connect_finalize): Use
w32_fdpass_send.  Get peer's PID from the initial connection.
* src/assuan-socket-server.c (assuan_init_socket_server): Use
w32_fdpass_recv.

--

GnuPG-bug-id: GnuPG-bug-id: 6236
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 src/assuan-socket-connect.c | 26 +++++++++++++++++++++++++-
 src/assuan-socket-server.c  |  4 ++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index 019a41c..457edfe 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -115,8 +115,12 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd,
   ctx->max_accepts = -1;
   ctx->flags.is_socket = 1;
 
+#ifdef HAVE_W32_SYSTEM
+  ctx->engine.sendfd = w32_fdpass_send;
+#else
   if (flags & ASSUAN_SOCKET_CONNECT_FDPASSING)
     _assuan_init_uds_io (ctx);
+#endif
 
   /* initial handshake */
   {
@@ -127,7 +131,27 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd,
     if (err)
       TRACE1 (ctx, ASSUAN_LOG_SYSIO, "assuan_socket_connect", ctx,
 	      "can't connect to server: %s\n", gpg_strerror (err));
-    else if (response != ASSUAN_RESPONSE_OK)
+    else if (response == ASSUAN_RESPONSE_OK)
+      {
+        const char *line = ctx->inbound.line + off;
+        int pid = ASSUAN_INVALID_PID;
+
+        /* Parse the message: OK ..., process %i */
+        line = strchr (line, ',');
+        if (line)
+          {
+            line = strchr (line + 1, ' ');
+            if (line)
+              {
+                line = strchr (line + 1, ' ');
+                if (line)
+                  pid = atoi (line + 1);
+              }
+          }
+        if (pid != ASSUAN_INVALID_PID)
+          ctx->pid = pid;
+      }
+    else
       {
 	char *sname = _assuan_encode_c_string (ctx, ctx->inbound.line);
 	if (sname)
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index a8330a8..f5fe038 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -238,8 +238,12 @@ assuan_init_socket_server (assuan_context_t ctx, assuan_fd_t fd,
                          : accept_connection);
   ctx->finish_handler = _assuan_server_finish;
 
+#ifdef HAVE_W32_SYSTEM
+  ctx->engine.receivefd = w32_fdpass_recv;
+#else
   if (flags & ASSUAN_SOCKET_SERVER_FDPASSING)
     _assuan_init_uds_io (ctx);
+#endif
 
   rc = _assuan_register_std_commands (ctx);
   if (rc)
-- 
cgit v1.2.1