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 | |
| 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
| -rw-r--r-- | lib/common_test/src/ct_telnet.erl | 4 | ||||
| -rw-r--r-- | lib/common_test/src/ct_telnet_client.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl index d906a267a1..96af55195f 100644 --- a/lib/common_test/src/ct_telnet.erl +++ b/lib/common_test/src/ct_telnet.erl @@ -29,7 +29,7 @@ %% Command timeout = 10 sec (time to wait for a command to return) %% Max no of reconnection attempts = 3 %% Reconnection interval = 5 sek (time to wait in between reconnection attempts) -%% Keep alive = true (will send NOP to the server every 10 sec if connection is idle) +%% Keep alive = true (will send NOP to the server every 8 sec if connection is idle) %% Polling limit = 0 (max number of times to poll to get a remaining string terminated) %% Polling interval = 1 sec (sleep time between polls)</pre> %% <p>These parameters can be altered by the user with the following @@ -1007,7 +1007,7 @@ silent_teln_expect(Name,Pid,Data,Pattern,Prx,Opts) -> put(silent,Old), Result. -%% teln_expect/5 +%% teln_expect/6 %% %% This function implements the expect functionality over telnet. In %% general there are three possible ways to go: 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]), |