Author: kgiusti
Date: Tue Sep 18 13:09:06 2012
New Revision: 1387132
URL: http://svn.apache.org/viewvc?rev=1387132&view=rev
Log:
checkpoint
Modified:
qpid/proton/branches/driver_abstraction/examples/mailbox/fetch
qpid/proton/branches/driver_abstraction/examples/mailbox/server
qpid/proton/branches/driver_abstraction/proton-c/bindings/php/php.i
qpid/proton/branches/driver_abstraction/proton-c/bindings/python/python.i
qpid/proton/branches/driver_abstraction/proton-c/bindings/ruby/ruby.i
qpid/proton/branches/driver_abstraction/proton-c/include/proton/cproton.i
qpid/proton/branches/driver_abstraction/proton-c/src/driver.c
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c
Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/fetch
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/fetch?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/examples/mailbox/fetch (original)
+++ qpid/proton/branches/driver_abstraction/examples/mailbox/fetch Tue Sep 18
13:09:06 2012
@@ -87,7 +87,8 @@ class FetchClient(object):
if self.ca_database:
self.log("Using SSL, CA database = %s" % self.ca_database)
- ssl_client = pn_ssl(self.cxtr)
+ ssl_client = pn_connector_ssl(self.cxtr)
+ assert(ssl_client)
rc = pn_ssl_set_trusted_ca_db(ssl_client, self.ca_database)
assert(rc == 0)
# we want to fail if the server's certificate is invalid:
Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/server
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/server?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/examples/mailbox/server (original)
+++ qpid/proton/branches/driver_abstraction/examples/mailbox/server Tue Sep 18
13:09:06 2012
@@ -108,8 +108,11 @@ class MailboxServer(object):
if self.listener is None:
print("Error: could not listen on %s:%s" % (self.host, self.port))
return False
+ # if self.certificate_file:
+ # self.log("Setting SSL certificate %s" % self.certificate_file)
+ # if not self.require_encryption:
+ # self.log("Allowing both encrypted AND unencrypted
connections!")
if self.certificate_file:
- self.log("Setting SSL certificate %s" % self.certificate_file)
if not self.require_encryption:
self.log("Allowing both encrypted AND unencrypted
connections!")
return True
@@ -135,7 +138,7 @@ class MailboxServer(object):
# configure SSL
if self.certificate_file:
- ssl_server = pn_ssl(cxtr)
+ ssl_server = pn_connector_ssl(cxtr)
assert(ssl_server)
rc = pn_ssl_set_credentials(ssl_server,
self.certificate_file,
Modified: qpid/proton/branches/driver_abstraction/proton-c/bindings/php/php.i
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/bindings/php/php.i?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/bindings/php/php.i
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/bindings/php/php.i Tue Sep
18 13:09:06 2012
@@ -10,6 +10,7 @@
#include <proton/message.h>
#include <proton/driver.h>
#include <proton/messenger.h>
+#include <proton/ssl.h>
#define zend_error_noreturn zend_error
%}
Modified:
qpid/proton/branches/driver_abstraction/proton-c/bindings/python/python.i
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/bindings/python/python.i?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/bindings/python/python.i
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/bindings/python/python.i
Tue Sep 18 13:09:06 2012
@@ -6,6 +6,7 @@
#include <proton/sasl.h>
#include <proton/driver.h>
#include <proton/messenger.h>
+#include <proton/ssl.h>
%}
typedef unsigned int size_t;
Modified: qpid/proton/branches/driver_abstraction/proton-c/bindings/ruby/ruby.i
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/bindings/ruby/ruby.i?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/bindings/ruby/ruby.i
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/bindings/ruby/ruby.i Tue
Sep 18 13:09:06 2012
@@ -6,6 +6,7 @@
#include <proton/sasl.h>
#include <proton/driver.h>
#include <proton/messenger.h>
+#include <proton/ssl.h>
%}
typedef unsigned int size_t;
Modified:
qpid/proton/branches/driver_abstraction/proton-c/include/proton/cproton.i
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/include/proton/cproton.i?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/include/proton/cproton.i
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/include/proton/cproton.i
Tue Sep 18 13:09:06 2012
@@ -1281,3 +1281,8 @@
%include "proton/messenger.h"
+
+
+
+%include "proton/ssl.h"
+
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/driver.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/driver.c?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/driver.c (original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/driver.c Tue Sep 18
13:09:06 2012
@@ -511,7 +511,7 @@ void pn_connector_process(pn_connector_t
if (c->trace & (PN_TRACE_FRM | PN_TRACE_RAW | PN_TRACE_DRV)) {
fprintf(stderr, "Closed %s\n", c->name);
}
- pn_connector_shutdown_ssl(c); // AMQP finished, perform clean shutdown
+ pn_connector_close(c);
}
}
}
@@ -589,10 +589,7 @@ void pn_driver_wakeup(pn_driver_t *d)
void pn_driver_wait(pn_driver_t *d, int timeout)
{
- // if SSL/TlS has data available, no need to wait for I/O
- if (!pn_driver_ssl_data_ready(d)) {
- pn_driver_poller_wait(d, timeout);
- }
+ pn_driver_poller_wait(d, timeout);
d->listener_next = d->listener_head;
d->connector_next = d->connector_head;
}
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c Tue Sep
18 13:09:06 2012
@@ -457,7 +457,7 @@ pn_ssl_t *pn_ssl_client(pn_transport_t *
void pn_ssl_free( pn_ssl_t *ssl)
{
-
+ if (!ssl) return;
if (ssl->bio_ssl) BIO_free(ssl->bio_ssl);
if (ssl->bio_ssl_io) BIO_free(ssl->bio_ssl_io);
if (ssl->bio_net_io) BIO_free(ssl->bio_net_io);
Modified:
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h Tue
Sep 18 13:09:06 2012
@@ -78,9 +78,7 @@ void pn_ssl_free( pn_ssl_t *ssl);
* @param[in] d the driver
* @return 0 if no data ready, else !0
*/
-int pn_driver_ssl_data_ready( pn_driver_t *d );
-
-void pn_connector_shutdown_ssl(pn_connector_t *c); // @todo: can I remove
this???
+//int pn_driver_ssl_data_ready( pn_driver_t *d );
// move data received from the network into the SSL layer
ssize_t pn_ssl_input(pn_ssl_t *ssl, char *bytes, size_t available);
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c?rev=1387132&r1=1387131&r2=1387132&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c Tue Sep
18 13:09:06 2012
@@ -78,16 +78,6 @@ int pn_ssl_get_peer_authentication(pn_ss
return -1;
}
-int pn_driver_ssl_data_ready( pn_driver_t *d )
-{
- return 0;
-}
-
-void pn_connector_shutdown_ssl(pn_connector_t *c)
-{
- pn_connector_close(c);
-}
-
void pn_ssl_free( pn_ssl_t *ssl)
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
