diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2008-03-03 11:55:19 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2008-03-03 11:55:19 +0000 |
| commit | 76245f0fcf441442f0a4a4429d8a6bab98e5796e (patch) | |
| tree | 31269c1a8372dbd90bfc0069f88b4e83767c30cd /src/tls/tls.erl | |
| parent | * src/ejabberd_check.erl: Fixed missing clause (EJAB-533). (diff) | |
* src/tls/tls.erl: recv_data/2 doesn't throw exceptions now
* src/ejabberd_zlib/ejabberd_zlib.erl: Likewise
SVN Revision: 1217
Diffstat (limited to '')
| -rw-r--r-- | src/tls/tls.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/tls/tls.erl b/src/tls/tls.erl index aeeebaac..e8b8557b 100644 --- a/src/tls/tls.erl +++ b/src/tls/tls.erl @@ -149,7 +149,15 @@ recv(#tlssock{tcpsock = TCPSocket} = TLSSock, Error end. -recv_data(#tlssock{tcpsock = TCPSocket, tlsport = Port}, Packet) -> +recv_data(TLSSock, Packet) -> + case catch recv_data1(TLSSock, Packet) of + {'EXIT', Reason} -> + {error, Reason}; + Res -> + Res + end. + +recv_data1(#tlssock{tcpsock = TCPSocket, tlsport = Port}, Packet) -> case port_control(Port, ?SET_ENCRYPTED_INPUT, Packet) of <<0>> -> case port_control(Port, ?GET_DECRYPTED_INPUT, []) of |