diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2005-10-25 02:19:01 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2005-10-25 02:19:01 +0000 |
| commit | 144f9f09e7ec0e4660a57798d39c7d24c981e6a9 (patch) | |
| tree | 1e47b92f7588d8909a51ee42267746ab9657e096 /src/tls | |
| parent | * src/tls/tls_drv.c: Support for "connect" method (diff) | |
* src/tls/tls.erl: Accept {error,already_loaded} from
erl_ddll:load_driver/2
* src/stringprep/stringprep.erl: Likewise
* src/mod_irc/iconv.erl: Likewise
* src/ejabberd_app.erl: Likewise
SVN Revision: 427
Diffstat (limited to 'src/tls')
| -rw-r--r-- | src/tls/tls.erl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/tls/tls.erl b/src/tls/tls.erl index e1925520f..cdd00570b 100644 --- a/src/tls/tls.erl +++ b/src/tls/tls.erl @@ -43,7 +43,10 @@ start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). init([]) -> - ok = erl_ddll:load_driver(ejabberd:get_so_path(), tls_drv), + case erl_ddll:load_driver(ejabberd:get_so_path(), tls_drv) of + ok -> ok; + {error, already_loaded} -> ok + end, Port = open_port({spawn, tls_drv}, [binary]), Res = port_control(Port, ?SET_CERTIFICATE_FILE_ACCEPT, "./ssl.pem" ++ [0]), case Res of @@ -85,7 +88,10 @@ terminate(_Reason, Port) -> tcp_to_tls(TCPSocket, Options) -> case lists:keysearch(certfile, 1, Options) of {value, {certfile, CertFile}} -> - ok = erl_ddll:load_driver(ejabberd:get_so_path(), tls_drv), + case erl_ddll:load_driver(ejabberd:get_so_path(), tls_drv) of + ok -> ok; + {error, already_loaded} -> ok + end, Port = open_port({spawn, tls_drv}, [binary]), Command = case lists:member(connect, Options) of true -> @@ -164,7 +170,10 @@ close(#tlssock{tcpsock = TCPSocket, tlsport = Port}) -> test() -> - ok = erl_ddll:load_driver(ejabberd:get_so_path(), tls_drv), + case erl_ddll:load_driver(ejabberd:get_so_path(), tls_drv) of + ok -> ok; + {error, already_loaded} -> ok + end, Port = open_port({spawn, tls_drv}, [binary]), io:format("open_port: ~p~n", [Port]), PCRes = port_control(Port, ?SET_CERTIFICATE_FILE_ACCEPT, |