svn commit: r1627987 - /qpid/proton/trunk/proton-c/src/windows/schannel.c

[cl...@apache.org]

Author: cliffjansen
Date: Sat Sep 27 18:15:48 2014
New Revision: 1627987

URL: http://svn.apache.org/r1627987
Log:
PROTON-581: part2, pick up minor changes since review board version

Modified:
    qpid/proton/trunk/proton-c/src/windows/schannel.c

Modified: qpid/proton/trunk/proton-c/src/windows/schannel.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/windows/schannel.c?rev=1627987&r1=1627986&r2=1627987&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/windows/schannel.c (original)
+++ qpid/proton/trunk/proton-c/src/windows/schannel.c Sat Sep 27 18:15:48 2014
@@ -220,9 +220,9 @@ static int ssl_failed(pn_ssl_t *ssl, cha
     reason = buf;
   }
   ssl->ssl_closed = true;
-  ssl->app_input_closed = ssl->app_output_closed = PN_ERR;
-  ssl->transport->tail_closed = true;
+  ssl->app_input_closed = ssl->app_output_closed = PN_EOS;
   ssl->state = SSL_CLOSED;
+  pni_close_tail(ssl->transport);
   pn_do_error(ssl->transport, "amqp:connection:framing-error", "SSL Failure: %s", reason);
   return PN_EOS;
 }
@@ -1118,7 +1118,7 @@ static ssize_t process_input_ssl(pn_io_l
 static ssize_t process_output_ssl( pn_io_layer_t *io_layer, char *buffer, size_t max_len)
 {
   pn_ssl_t *ssl = (pn_ssl_t *)io_layer->context;
-  if (!ssl) return PN_ERR;
+  if (!ssl) return PN_EOS;
   ssl_log( ssl, "process_output_ssl( max_len=%d )\n",max_len );
 
   ssize_t written = 0;
@@ -1129,7 +1129,7 @@ static ssize_t process_output_ssl( pn_io
     // output buffers eclusively for internal handshake use until negotiation complete
     client_handshake_init(ssl);
     if (ssl->state == SSL_CLOSED)
-      return PN_ERR;
+      return PN_EOS;
     ssl->state = NEGOTIATING;
   }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org