[glib-networking] Revert "gnutls: account for internal TLS buffer in check function"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 6a4ce0fd00c17cb5feeb5f97374b04718e050224
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Sep 4 14:18:03 2020 -0500

    Revert "gnutls: account for internal TLS buffer in check function"
    
    This reverts commit 4dbb780f40f5b1dfb0159acb697b48e2e4acce26.

 tls/base/gtlsconnection-base.c     | 10 ----------
 tls/base/gtlsconnection-base.h     |  3 ---
 tls/gnutls/gtlsconnection-gnutls.c | 14 --------------
 3 files changed, 27 deletions(-)
---
diff --git a/tls/base/gtlsconnection-base.c b/tls/base/gtlsconnection-base.c
index e184552d..5d8ab2b4 100644
--- a/tls/base/gtlsconnection-base.c
+++ b/tls/base/gtlsconnection-base.c
@@ -921,16 +921,6 @@ g_tls_connection_base_check (GTlsConnectionBase  *tls,
       ((condition & G_IO_OUT) && (priv->writing || priv->write_closing)))
     goto out;
 
-  /* If base class says we are ready, then we are, regardless of the base
-   * stream status. This accounts for TLS-level buffers.
-   */
-  if (G_TLS_CONNECTION_BASE_GET_CLASS (tls)->check &&
-      G_TLS_CONNECTION_BASE_GET_CLASS (tls)->check (tls, condition))
-    {
-      ret = TRUE;
-      goto out;
-    }
-
   /* Defer to the base stream or GDatagramBased. */
   ret = g_tls_connection_base_base_check (tls, condition);
 
diff --git a/tls/base/gtlsconnection-base.h b/tls/base/gtlsconnection-base.h
index 86425023..45c14e52 100644
--- a/tls/base/gtlsconnection-base.h
+++ b/tls/base/gtlsconnection-base.h
@@ -79,9 +79,6 @@ struct _GTlsConnectionBaseClass
 
   gboolean                    (*is_session_resumed)         (GTlsConnectionBase   *tls);
 
-  gboolean                    (*check)                      (GTlsConnectionBase   *tls,
-                                                             GIOCondition          direction);
-
   void                        (*push_io)                    (GTlsConnectionBase   *tls,
                                                              GIOCondition          direction,
                                                              gint64                timeout,
diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c
index 3aab9e43..1e099574 100644
--- a/tls/gnutls/gtlsconnection-gnutls.c
+++ b/tls/gnutls/gtlsconnection-gnutls.c
@@ -848,19 +848,6 @@ g_tls_connection_gnutls_is_session_resumed (GTlsConnectionBase *tls)
   return gnutls_session_is_resumed (priv->session);
 }
 
-static gboolean
-g_tls_connection_gnutls_check (GTlsConnectionBase *tls,
-                               GIOCondition        direction)
-{
-  GTlsConnectionGnutls *gnutls = G_TLS_CONNECTION_GNUTLS (tls);
-  GTlsConnectionGnutlsPrivate *priv = g_tls_connection_gnutls_get_instance_private (gnutls);
-
-  if (direction & G_IO_IN)
-    return !!gnutls_record_check_pending (priv->session);
-
-  return FALSE;
-}
-
 static GTlsConnectionBaseStatus
 g_tls_connection_gnutls_read (GTlsConnectionBase  *tls,
                               void                *buffer,
@@ -1084,7 +1071,6 @@ g_tls_connection_gnutls_class_init (GTlsConnectionGnutlsClass *klass)
   base_class->retrieve_peer_certificate                  = g_tls_connection_gnutls_retrieve_peer_certificate;
   base_class->complete_handshake                         = g_tls_connection_gnutls_complete_handshake;
   base_class->is_session_resumed                         = g_tls_connection_gnutls_is_session_resumed;
-  base_class->check                                      = g_tls_connection_gnutls_check;
   base_class->read_fn                                    = g_tls_connection_gnutls_read;
   base_class->read_message_fn                            = g_tls_connection_gnutls_read_message;
   base_class->write_fn                                   = g_tls_connection_gnutls_write;