From commits-return-26751-apmail-qpid-commits-archive=qpid.apache.org@qpid.apache.org Fri Nov 14 11:03:14 2014 Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AF04CC6D5 for ; Fri, 14 Nov 2014 11:03:14 +0000 (UTC) Received: (qmail 29737 invoked by uid 500); 14 Nov 2014 11:03:14 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 29678 invoked by uid 500); 14 Nov 2014 11:03:14 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 29398 invoked by uid 99); 14 Nov 2014 11:03:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Nov 2014 11:03:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4A738940363; Fri, 14 Nov 2014 11:03:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gsim@apache.org To: commits@qpid.apache.org Date: Fri, 14 Nov 2014 11:03:58 -0000 Message-Id: <45978a840e7148bb8aa8c6a32447ce8e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [49/50] [abbrv] qpid-proton git commit: Merged from master Merged from master Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/90509763 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/90509763 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/90509763 Branch: refs/heads/examples Commit: 905097636da6fd4d6f03cccd53207acfdadbe6f6 Parents: 0c822c6 c5c1879 Author: Gordon Sim Authored: Fri Nov 14 10:47:32 2014 +0000 Committer: Gordon Sim Committed: Fri Nov 14 10:47:32 2014 +0000 ---------------------------------------------------------------------- .../jms/AMQPNativeOutboundTransformer.java | 4 +- .../proton/jms/AutoOutboundTransformer.java | 6 + .../qpid/proton/jms/InboundTransformer.java | 84 +++-- .../jms/JMSMappingOutboundTransformer.java | 44 ++- .../org/apache/qpid/proton/jms/JMSVendor.java | 16 +- .../qpid/proton/jms/OutboundTransformer.java | 14 +- .../jms/JMSMappingInboundTransformerTest.java | 287 +++++++++++++++ .../jms/JMSMappingOutboundTransformerTest.java | 351 +++++++++++++++++++ examples/README.txt | 3 + proton-c/bindings/python/proton.py | 75 ++-- proton-c/bindings/ruby/lib/qpid_proton.rb | 1 + proton-c/bindings/ruby/lib/qpid_proton/data.rb | 4 +- .../bindings/ruby/lib/qpid_proton/mapping.rb | 25 +- .../bindings/ruby/lib/qpid_proton/message.rb | 43 ++- .../bindings/ruby/lib/qpid_proton/messenger.rb | 14 +- .../bindings/ruby/lib/qpid_proton/strings.rb | 69 ++++ proton-c/include/proton/cproton.i | 1 + proton-c/include/proton/driver.h | 13 +- proton-c/include/proton/transport.h | 13 + proton-c/src/engine/engine-internal.h | 6 +- proton-c/src/engine/engine.c | 9 +- proton-c/src/posix/driver.c | 8 +- proton-c/src/posix/io.c | 14 +- proton-c/src/protocol.py | 2 + proton-c/src/sasl/sasl.c | 9 +- proton-c/src/ssl/openssl.c | 148 ++++---- proton-c/src/transport/transport.c | 93 +++-- proton-c/src/windows/driver.c | 8 +- proton-c/src/windows/io.c | 17 +- proton-c/src/windows/schannel.c | 27 +- .../impl/ssl/SimpleSslTransportWrapper.java | 6 + .../engine/impl/ssl/SslEngineFacadeFactory.java | 15 + proton-j/src/main/resources/cengine.py | 25 +- tests/python/proton_tests/engine.py | 37 +- version.txt | 2 +- 35 files changed, 1266 insertions(+), 227 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/90509763/proton-c/bindings/python/proton.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/90509763/proton-c/src/transport/transport.c ---------------------------------------------------------------------- diff --cc proton-c/src/transport/transport.c index d74873b,601d6a2..d9dfab8 --- a/proton-c/src/transport/transport.c +++ b/proton-c/src/transport/transport.c @@@ -790,17 -806,10 +809,14 @@@ int pn_do_transfer(pn_dispatcher_t *dis delivery = pn_delivery(link, pn_dtag(tag.start, tag.size)); pn_delivery_state_t *state = pn_delivery_map_push(incoming, delivery); if (id_present && id != state->id) { - int err = pn_do_error(transport, "amqp:session:invalid-field", - "sequencing error, expected delivery-id %u, got %u", - state->id, id); - // XXX: this will probably leave delivery buffer state messed up - pn_full_settle(incoming, delivery); - return err; + return pn_do_error(transport, "amqp:session:invalid-field", + "sequencing error, expected delivery-id %u, got %u", + state->id, id); } + if (has_type) { + delivery->remote.type = type; + pn_data_copy(delivery->remote.data, transport->disp_data); + } link->state.delivery_count++; link->state.link_credit--; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/90509763/proton-c/src/windows/schannel.c ---------------------------------------------------------------------- diff --cc proton-c/src/windows/schannel.c index 385267f,9437582..e91e0a3 --- a/proton-c/src/windows/schannel.c +++ b/proton-c/src/windows/schannel.c @@@ -521,6 -520,16 +520,19 @@@ int pn_ssl_get_peer_hostname( pn_ssl_t /** SChannel specific: */ ++<<<<<<< HEAD ++======= + const char *tls_version_check(pn_ssl_t *ssl) + { + SecPkgContext_ConnectionInfo info; + QueryContextAttributes(&ssl->ctxt_handle, SECPKG_ATTR_CONNECTION_INFO, &info); + // Ascending bit patterns denote newer SSL/TLS protocol versions. + // SP_PROT_TLS1_0_SERVER is not defined until VS2010. + return (info.dwProtocol < SP_PROT_TLS1_SERVER) ? + "peer does not support TLS 1.0 security" : NULL; + } + ++>>>>>>> master static void ssl_encrypt(pn_ssl_t *ssl, char *app_data, size_t count) { // Get SChannel to encrypt exactly one Record. @@@ -732,6 -741,10 +744,13 @@@ static void client_handshake( pn_ssl_t ssl_failed(ssl, "unexpected final server token"); break; } ++<<<<<<< HEAD ++======= + if (const char *err = tls_version_check(ssl)) { + ssl_failed(ssl, err); + break; + } ++>>>>>>> master if (token_buffs[1].BufferType == SECBUFFER_EXTRA && token_buffs[1].cbBuffer > 0) { // This seems to work but not documented, plus logic differs from decrypt message // since the pvBuffer value is not set. Grrr. @@@ -904,7 -917,7 +923,11 @@@ static void app_inbytes_progress(pn_ssl assert(ssl->app_inbytes.size <= ib2.size); size_t consumed = ib2.size - ssl->app_inbytes.size; if (consumed > 0) { ++<<<<<<< HEAD + memmove((void *)ib2.start, ib2.start + consumed, consumed); ++======= + memmove((void *)ib2.start, ib2.start + consumed, ssl->app_inbytes.size); ++>>>>>>> master pn_buffer_trim(ssl->inbuf2, 0, consumed); } if (!pn_buffer_available(ssl->inbuf2)) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org