Author: gsim
Date: Fri Oct 10 12:57:51 2014
New Revision: 1630861
URL: http://svn.apache.org/r1630861
Log:
PROTON-581: part2, pick up minor changes since review board version
Modified:
qpid/proton/branches/examples/proton-c/src/windows/schannel.c
Modified: qpid/proton/branches/examples/proton-c/src/windows/schannel.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/schannel.c?rev=1630861&r1=1630860&r2=1630861&view=diff
==============================================================================
--- qpid/proton/branches/examples/proton-c/src/windows/schannel.c (original)
+++ qpid/proton/branches/examples/proton-c/src/windows/schannel.c Fri Oct 10
12:57:51 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-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
