From a1fffdbedd87ad1aef526f55a601ae008ab463c2 Mon Sep 17 00:00:00 2001 From: Cedric RICARD Date: Wed, 9 Jul 2008 12:02:00 +0000 Subject: [PATCH] Add SSL connection method for net services Improve some logs --- calexium_lib/net_services/CXM_generic_client.anubis | 30 +++++++++++++++++++++++++++++- calexium_lib/web/CXM_making_a_web_site.anubis | 2 +- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/calexium_lib/net_services/CXM_generic_client.anubis b/calexium_lib/net_services/CXM_generic_client.anubis index 3149117..5c90073 100644 --- a/calexium_lib/net_services/CXM_generic_client.anubis +++ b/calexium_lib/net_services/CXM_generic_client.anubis @@ -15,6 +15,7 @@ read system/convert.anubis read system/string.anubis read system/message_queue.anubis read system/message_transceiver.anubis +read tools/connections.anubis read calexium_lib/CXM_message_constants.anubis read calexium_lib/net_services/CXM_net_services.anubis @@ -160,7 +161,34 @@ public define Maybe($T) error(_) then logger(queue_name + ": Can't connect to domain manager ["+ip_addr_to_string(server)+":"+port+"]");failure, ok(conn) then with queue = create_MessageQueue(queue_name), - message_transceiver(conn, queue); + message_transceiver(tcp(conn), queue); + with result = generic_request_for_service(queue, service_id, service_version, handler, logger), + queue.quit(unique); + //logInfo(debug_log,"domain_manager client quit"); + result + }. + +public define Maybe($T) + generic_connect_to_net_service_SSL + ( + String queue_name, + String server_name, + Word32 server_ip, + Word32 port, + (Maybe(X509)) -> Bool accept_policy, // your policy for accepting the server certificate in + // case of an invalid, non trusted or missing certificate + Word32 service_id, + Word32 service_version, + (MessageQueue, String) -> Maybe($T) handler, + (String) -> One logger + ) + = + if open_SSL_connection( server_name, server_ip, port, accept_policy) is + { + error(_) then logger(queue_name + ": Can't connect to domain manager ["+ip_addr_to_string(server_ip)+":"+port+"]");failure, + ok(conn) then + with queue = create_MessageQueue(queue_name), + message_transceiver(ssl(conn), queue); with result = generic_request_for_service(queue, service_id, service_version, handler, logger), queue.quit(unique); //logInfo(debug_log,"domain_manager client quit"); diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis index b3ab660..044d830 100644 --- a/calexium_lib/web/CXM_making_a_web_site.anubis +++ b/calexium_lib/web/CXM_making_a_web_site.anubis @@ -2393,7 +2393,7 @@ public define One { cannot_bind_to_port(n) then logError(log, "Cannot bind to port: "+n), cannot_bind_to_port(n,m) then logError(log, "Cannot bind to ports: "+n+", "+m), - ok(s1,s2) then logInfo(log, "Servers started.") + ok(s1,s2) then logInfo(log, "Servers started on ports "+http_port+" (HTTP) and "+https_port+" (HTTPS).") }. -- libgit2 0.21.4