From d4080b78d8ac4fb7cea32605f0ea5859c7426e13 Mon Sep 17 00:00:00 2001 From: Scott Lystig Fritchie Date: Sun, 17 May 2015 16:46:50 +0900 Subject: [PATCH] WIP: rearrange client code to approach some semblance of modularity someday --- src/machi_flu1_client.erl | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/machi_flu1_client.erl b/src/machi_flu1_client.erl index 6d6741d..b1da8bb 100644 --- a/src/machi_flu1_client.erl +++ b/src/machi_flu1_client.erl @@ -819,10 +819,22 @@ do_projection_common(Sock, ProjCmd) -> %%%%%%%%%%%%%%%%%%%%%%%%%%% -w_connect(#p_srvr{proto_mod=?MODULE, address=Host, port=TcpPort}) -> +w_connect(#p_srvr{proto_mod=?MODULE, address=Host, port=Port, props=Props})-> try - Sock = machi_util:connect(Host, TcpPort), - {w,tcp,Sock} + case proplists:get_value(session_proto, Props, tcp) of + tcp -> + Sock = machi_util:connect(Host, Port), + {w,tcp,Sock}; + %% sctp -> + %% %% TODO: not implemented + %% {w,sctp,Sock} + ssl -> + %% TODO: veryveryuntested + SslOptions = proplists:get_value(ssl_options, Props), + Sock = machi_util:connect(Port, Port), + {ok, SslSock} = ssl:connect(Sock, SslOptions), + {w,ssl,SslSock} + end catch _:_ -> undefined