diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-09-13 09:43:43 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-09-13 09:43:43 +0200 |
| commit | 51e05033c1c563966f22a7200574554e62257f5d (patch) | |
| tree | 06275d1bf434f528abf33c76397e0300ffaf82bb /lib/ssl/src/inet_ssl_dist.erl | |
| parent | e80beef326bb9eb2437de31c70656fef4a034746 (diff) | |
| parent | 5b0a4180582921fe3b61b430f0c87d9a68ba6da8 (diff) | |
| download | otp-51e05033c1c563966f22a7200574554e62257f5d.tar.gz otp-51e05033c1c563966f22a7200574554e62257f5d.tar.bz2 otp-51e05033c1c563966f22a7200574554e62257f5d.zip | |
Merge branch 'ia/ssl/dist/OTP-7053' into major
* ia/ssl/dist/OTP-7053:
First fully working version
Use ssl instead of being a proxy command
Connect from both sides works now
Diffstat (limited to 'lib/ssl/src/inet_ssl_dist.erl')
| -rw-r--r-- | lib/ssl/src/inet_ssl_dist.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ssl/src/inet_ssl_dist.erl b/lib/ssl/src/inet_ssl_dist.erl index 6c0fbc0618..42a03a4879 100644 --- a/lib/ssl/src/inet_ssl_dist.erl +++ b/lib/ssl/src/inet_ssl_dist.erl @@ -31,9 +31,7 @@ -import(error_logger,[error_msg/2]). --include("net_address.hrl"). - - +-include_lib("kernel/include/net_address.hrl"). -define(to_port(Socket, Data, Opts), case ssl_prim:send(Socket, Data, Opts) of @@ -44,9 +42,8 @@ R end). - --include("dist.hrl"). --include("dist_util.hrl"). +-include_lib("kernel/include/dist.hrl"). +-include_lib("kernel/include/dist_util.hrl"). %% ------------------------------------------------------------- %% This function should return a valid childspec, so that |