Changeset fcb122d in mod_gnutls for src/gnutls_io.c

Timestamp:

Apr 5, 2005, 12:39:18 PM (17 years ago)

Author:

Paul Querna <chip@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

42307a9

Parents:

6e0bfd6

Message:

checkpoint the work so far. The DBM cache needs a little more work.

File:

• src/gnutls_io.c (modified) (4 diffs)

src/gnutls_io.c

@@ -1 @@
-/* ====================================================================
- *  Copyright 2004 Paul Querna
+/**
+ *  Copyright 2004-2005 Paul Querna
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -343 +343 @@
     int ret;
 
-    if (ctxt->status != 0)
+    if (ctxt->status != 0) {
         return;
-        ret = gnutls_handshake(ctxt->session);
-        if (ret < 0) {
-            if (ret == GNUTLS_E_WARNING_ALERT_RECEIVED
-                || ret == GNUTLS_E_FATAL_ALERT_RECEIVED) {
-                ret = gnutls_alert_get(ctxt->session);
-                ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
-                             "GnuTLS: Hanshake Alert (%d) '%s'.\n", ret,
-                             gnutls_alert_get_name(ret));
-            }
+    }
+
+tryagain:
+
+    ret = gnutls_handshake(ctxt->session);
+    if (ret < 0) {
+        if (ret == GNUTLS_E_WARNING_ALERT_RECEIVED
+            || ret == GNUTLS_E_FATAL_ALERT_RECEIVED) {
+            ret = gnutls_alert_get(ctxt->session);
+            ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
+                         "GnuTLS: Hanshake Alert (%d) '%s'.\n", ret,
+                         gnutls_alert_get_name(ret));
+        }
     
-            gnutls_deinit(ctxt->session);
-            ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
-                             "GnuTLS: Handshake Failed (%d) '%s'", ret,
-                             gnutls_strerror(ret));
-                ctxt->status = -1;
-                return;
-        }
-        else {
-            ctxt->status = 1;
-            return;             /* all done with the handshake */
-        }
-}
-
-
-apr_status_t mod_gnutls_filter_input(ap_filter_t * f,
+        if (!gnutls_error_is_fatal(ret)) {
+            ap_log_error(APLOG_MARK, APLOG_INFO, 0, ctxt->c->base_server,
+                     "GnuTLS: Non-Fatal Handshake Error: (%d) '%s'", ret,
+                      gnutls_strerror(ret));
+            goto tryagain;
+        }
+
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
+                     "GnuTLS: Handshake Failed (%d) '%s'", ret,
+                      gnutls_strerror(ret));
+        ctxt->status = -1;
+        gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL, 
+                          gnutls_error_to_alert(ret, NULL));
+        gnutls_deinit(ctxt->session);
+        return;
+    }
+    else {
+        ctxt->status = 1;
+        return;             /* all done with the handshake */
+    }
+}
+
+
+apr_status_t mod_gnutls_filter_input(ap_filter_t* f,
                                      apr_bucket_brigade * bb,
                                      ap_input_mode_t mode,
@@ -456 +469 @@
     while (!APR_BRIGADE_EMPTY(bb)) {
         apr_bucket *bucket = APR_BRIGADE_FIRST(bb);
-        if (APR_BUCKET_IS_EOS(bucket) || AP_BUCKET_IS_EOC(bucket)) {
+        if (AP_BUCKET_IS_EOC(bucket)) {
 
             gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
@@ -466 +479 @@
             break;
 
-        } else if (APR_BUCKET_IS_FLUSH(bucket)) {
+        } else if (APR_BUCKET_IS_FLUSH(bucket) || APR_BUCKET_IS_EOS(bucket)) {
 
             if ((status = ap_pass_brigade(f->next, bb)) != APR_SUCCESS) {