[glib-networking/wip/pwithnall/dtls: 10/24] gnutls: Add OP_CLOSE_WRITE and _READ operations to GTlsConnectionGnutls

[Philip Withnall <pwithnall src gnome org>]

commit 6f0c0a2c070e69c20a730a0b6e81064f5cde48a8
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Sep 26 14:08:38 2014 +0100

    gnutls: Add OP_CLOSE_WRITE and _READ operations to GTlsConnectionGnutls
    
    This introduces no functional changes, and is a first step to supporting
    half-duplex close().
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735754

 tls/gnutls/gtlsconnection-gnutls.c |   41 ++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 13 deletions(-)
---
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 0a7b826..13524ea 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -114,9 +114,9 @@ struct _GTlsConnectionGnutlsPrivate
   gboolean database_is_unset;
 
   /* need_handshake means the next claim_op() will get diverted into
-   * an implicit handshake (unless it's an OP_HANDSHAKE or OP_CLOSE).
+   * an implicit handshake (unless it's an OP_HANDSHAKE or OP_CLOSE*).
    * need_finish_handshake means the next claim_op() will get diverted
-   * into finish_handshake() (unless it's an OP_CLOSE).
+   * into finish_handshake() (unless it's an OP_CLOSE*).
    *
    * handshaking is TRUE as soon as a handshake thread is queued. For
    * a sync handshake it becomes FALSE after finish_handshake()
@@ -556,7 +556,9 @@ typedef enum {
   G_TLS_CONNECTION_GNUTLS_OP_HANDSHAKE,
   G_TLS_CONNECTION_GNUTLS_OP_READ,
   G_TLS_CONNECTION_GNUTLS_OP_WRITE,
-  G_TLS_CONNECTION_GNUTLS_OP_CLOSE,
+  G_TLS_CONNECTION_GNUTLS_OP_CLOSE_READ,
+  G_TLS_CONNECTION_GNUTLS_OP_CLOSE_WRITE,
+  G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH,
 } GTlsConnectionGnutlsOp;
 
 static gboolean
@@ -580,7 +582,10 @@ claim_op (GTlsConnectionGnutls    *gnutls,
       return FALSE;
     }
 
-  if (gnutls->priv->handshake_error && op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE)
+  if (gnutls->priv->handshake_error &&
+      op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH &&
+      op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_READ &&
+      op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_WRITE)
     {
       if (error)
        *error = g_error_copy (gnutls->priv->handshake_error);
@@ -590,7 +595,9 @@ claim_op (GTlsConnectionGnutls    *gnutls,
 
   if (op != G_TLS_CONNECTION_GNUTLS_OP_HANDSHAKE)
     {
-      if (op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE &&
+      if (op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH &&
+          op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_READ &&
+         op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_WRITE &&
           gnutls->priv->need_handshake)
        {
          gnutls->priv->need_handshake = FALSE;
@@ -615,7 +622,9 @@ claim_op (GTlsConnectionGnutls    *gnutls,
          g_clear_object (&gnutls->priv->implicit_handshake);
          g_mutex_lock (&gnutls->priv->op_mutex);
 
-         if (op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE &&
+         if (op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH &&
+             op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_READ &&
+             op != G_TLS_CONNECTION_GNUTLS_OP_CLOSE_WRITE &&
              (!success || g_cancellable_set_error_if_cancelled (cancellable, &my_error)))
            {
              g_propagate_error (error, my_error);
@@ -661,7 +670,9 @@ claim_op (GTlsConnectionGnutls    *gnutls,
       gnutls->priv->handshaking = TRUE;
       gnutls->priv->need_handshake = FALSE;
     }
-  if (op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE)
+  if (op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH ||
+      op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE_READ ||
+      op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE_WRITE)
     gnutls->priv->closing = TRUE;
 
   if (op != G_TLS_CONNECTION_GNUTLS_OP_WRITE)
@@ -681,7 +692,9 @@ yield_op (GTlsConnectionGnutls   *gnutls,
 
   if (op == G_TLS_CONNECTION_GNUTLS_OP_HANDSHAKE)
     gnutls->priv->handshaking = FALSE;
-  if (op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE)
+  if (op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH ||
+      op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE_READ ||
+      op == G_TLS_CONNECTION_GNUTLS_OP_CLOSE_WRITE)
     gnutls->priv->closing = FALSE;
 
   if (op != G_TLS_CONNECTION_GNUTLS_OP_WRITE)
@@ -1602,16 +1615,18 @@ g_tls_connection_gnutls_close (GIOStream     *stream,
                               GError       **error)
 {
   GTlsConnectionGnutls *gnutls = G_TLS_CONNECTION_GNUTLS (stream);
+  GTlsConnectionGnutlsOp op;
   gboolean success;
   int ret = 0;
 
-  if (!claim_op (gnutls, G_TLS_CONNECTION_GNUTLS_OP_CLOSE,
-                TRUE, cancellable, error))
+  op = G_TLS_CONNECTION_GNUTLS_OP_CLOSE_BOTH;
+
+  if (!claim_op (gnutls, op, TRUE, cancellable, error))
     return FALSE;
 
   if (gnutls->priv->closed)
     {
-      yield_op (gnutls, G_TLS_CONNECTION_GNUTLS_OP_CLOSE);
+      yield_op (gnutls, op);
       return TRUE;
     }
 
@@ -1627,13 +1642,13 @@ g_tls_connection_gnutls_close (GIOStream     *stream,
 
   if (ret != 0)
     {
-      yield_op (gnutls, G_TLS_CONNECTION_GNUTLS_OP_CLOSE);
+      yield_op (gnutls, op);
       return FALSE;
     }
 
   success = g_io_stream_close (gnutls->priv->base_io_stream,
                               cancellable, error);
-  yield_op (gnutls, G_TLS_CONNECTION_GNUTLS_OP_CLOSE);
+  yield_op (gnutls, op);
   return success;
 }