* assuan-connect.c (assuan_pipe_connect): Implemented the inital

handshake.
* assuan-client.c (read_from_server): Renamed to
(_assuan_read_from_server): this and made external.

* assuan-listen.c (assuan_set_hello_line): New.
(assuan_accept): Use a custom hello line is available.

* assuan-buffer.c (assuan_read_line): New.
(assuan_pending_line): New.
(_assuan_write_line): Renamed to ..
(assuan_write_line): this, made public and changed all callers.

1 files changed, 22 insertions, 19 deletions

diff --git a/src/assuan-connect.c b/src/assuan-connect.c
index abc5d74..683c7f0 100644
--- a/src/assuan-connect.c
+++ b/src/assuan-connect.c
@@ -40,6 +40,7 @@
 #endif
 
 #ifdef HAVE_JNLIB_LOGGING
+#include "../jnlib/logging.h"
 #define LOGERROR1(a,b)   log_error ((a), (b))
 #else
 #define LOGERROR1(a,b)   fprintf (stderr, (a), (b))
@@ -188,35 +189,37 @@ assuan_pipe_connect (ASSUAN_CONTEXT *ctx, const char *name, char *const argv[])
 
   close (rp[1]);
   close (wp[0]);
-  _assuan_read_line (*ctx); /* FIXME: Handshake.  */
 
-#if 0 /* old stuff */
-  inbound.eof = 0;
-  inbound.linelen = 0;
-  inbound.attic.linelen = 0;
+  /* initial handshake */
+  {
+    int okay, off;
+
+    err = _assuan_read_from_server (*ctx, &okay, &off);
+    if (err)
+      {
+        LOGERROR1 ("can't connect server: %s\n", assuan_strerror (err));
+      }
+    else if (okay != 1)
+      {
+        LOGERROR1 ("can't connect server: `%s'\n", (*ctx)->inbound.line);
+        err = ASSUAN_Connect_Failed;
+      }
+  }
 
-  /* The server is available - read the greeting */
-  rc = read_from_agent (&okay);
-  if (rc)
-    {
-      log_error ("can't connect to the agent: %s\n", gnupg_strerror (rc));
-    }
-  else if (!okay)
+  if (err)
     {
-      log_error ("can't connect to the agent: %s\n", inbound.line);
-      rc = seterr (No_Agent);
+      if ((*ctx)->pid != -1)
+        waitpid ((*ctx)->pid, NULL, 0);  /* FIXME Check return value.  */
+      assuan_deinit_pipe_server (*ctx);  /* FIXME: Common code should be factored out.  */
     }
- else
-#endif
-
 
-  return 0;
+  return err;
 }
 
 void
 assuan_pipe_disconnect (ASSUAN_CONTEXT ctx)
 {
-  _assuan_write_line (ctx, "BYE");
+  assuan_write_line (ctx, "BYE");
   close (ctx->inbound.fd);
   close (ctx->outbound.fd);
   waitpid (ctx->pid, NULL, 0);  /* FIXME Check return value.  */