diff options
author | Peter Andersson <[email protected]> | 2015-05-04 16:19:22 +0200 |
---|---|---|
committer | Peter Andersson <[email protected]> | 2015-05-04 16:19:22 +0200 |
commit | 23777d8057ee85efd35809521819f3d27927a2e6 (patch) | |
tree | d750574faa72a1f15ca68a1fef5960c3210164e0 /lib/common_test/src/ct_telnet_client.erl | |
parent | 7e65166947985bc62d0f5c903856323194bf07b9 (diff) | |
parent | da04b3c60446fd1a25ab1e0de1566587aadc609b (diff) | |
download | otp-23777d8057ee85efd35809521819f3d27927a2e6.tar.gz otp-23777d8057ee85efd35809521819f3d27927a2e6.tar.bz2 otp-23777d8057ee85efd35809521819f3d27927a2e6.zip |
Merge branch 'peppe/common_test/ct_telnet_modifications'
* peppe/common_test/ct_telnet_modifications:
Set TCP option {nodelay,true} as default for telnet connections
Increase speed of keep_alive (NOP) polls
OTP-12678
Diffstat (limited to 'lib/common_test/src/ct_telnet_client.erl')
-rw-r--r-- | lib/common_test/src/ct_telnet_client.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/common_test/src/ct_telnet_client.erl b/lib/common_test/src/ct_telnet_client.erl index b0734d8d65..757ccc0aae 100644 --- a/lib/common_test/src/ct_telnet_client.erl +++ b/lib/common_test/src/ct_telnet_client.erl @@ -39,7 +39,7 @@ -define(TELNET_PORT, 23). -define(OPEN_TIMEOUT,10000). --define(IDLE_TIMEOUT,10000). +-define(IDLE_TIMEOUT,8000). %% telnet control characters -define(SE, 240). @@ -114,7 +114,7 @@ get_data(Pid) -> %%%----------------------------------------------------------------- %%% Internal functions init(Parent, Server, Port, Timeout, KeepAlive, ConnName) -> - case gen_tcp:connect(Server, Port, [list,{packet,0}], Timeout) of + case gen_tcp:connect(Server, Port, [list,{packet,0},{nodelay,true}], Timeout) of {ok,Sock} -> dbg("~p connected to: ~p (port: ~w, keep_alive: ~w)\n", [ConnName,Server,Port,KeepAlive]), |