aboutsummaryrefslogtreecommitdiffstats
path: root/src/ranch_tcp.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-12-07 14:26:14 +0100
committerLoïc Hoguin <[email protected]>2013-12-07 14:26:14 +0100
commit441687473ab364ba1cc5c19d89dced6a319747f9 (patch)
treea0862f0a944ad3380161614dc4debd5782a0962e /src/ranch_tcp.erl
parent366cb0a6df123ed9b128966dba6b64993e88b60a (diff)
parent261e325883646912c880f2a1f2256b55eb7dcee9 (diff)
downloadranch-441687473ab364ba1cc5c19d89dced6a319747f9.tar.gz
ranch-441687473ab364ba1cc5c19d89dced6a319747f9.tar.bz2
ranch-441687473ab364ba1cc5c19d89dced6a319747f9.zip
Merge branch 'connect_timeout' of git://github.com/heroku/ranch
Diffstat (limited to 'src/ranch_tcp.erl')
-rw-r--r--src/ranch_tcp.erl13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ranch_tcp.erl b/src/ranch_tcp.erl
index 86b1e35..d5d5003 100644
--- a/src/ranch_tcp.erl
+++ b/src/ranch_tcp.erl
@@ -26,6 +26,7 @@
-export([accept/2]).
-export([accept_ack/2]).
-export([connect/3]).
+-export([connect/4]).
-export([recv/3]).
-export([send/2]).
-export([sendfile/2]).
@@ -104,6 +105,18 @@ connect(Host, Port, Opts) when is_integer(Port) ->
gen_tcp:connect(Host, Port,
Opts ++ [binary, {active, false}, {packet, raw}]).
+%% @private Experimental. Open a connection to the given host and port
+%% number with a timeout.
+%% @see gen_tcp:connect/4
+%% @todo Probably filter Opts?
+-spec connect(inet:ip_address() | inet:hostname(),
+ inet:port_number(), any(), timeout())
+ -> {ok, inet:socket()} | {error, atom()}.
+connect(Host, Port, Opts, Timeout) when is_integer(Port) ->
+ gen_tcp:connect(Host, Port,
+ Opts ++ [binary, {active, false}, {packet, raw}],
+ Timeout).
+
%% @doc Receive data from a socket in passive mode.
%% @see gen_tcp:recv/3
-spec recv(inet:socket(), non_neg_integer(), timeout())