From d13af8b8c6a7b04ec541585d1b8945103fffb988 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Fri, 11 Nov 2016 12:56:59 +0100
Subject: ssh: Adjust inet buffers if too small

---
 lib/ssh/src/ssh_connection_handler.erl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/ssh/src')

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index e7c52f345e..7451c9e6d0 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -928,6 +928,7 @@ handle_event(internal, Msg=#ssh_msg_channel_request{},           StateName, D) -
     handle_connection_msg(Msg, StateName, D);
 
 handle_event(internal, Msg=#ssh_msg_channel_success{},           StateName, D) ->
+    update_inet_buffers(D#data.socket),
     handle_connection_msg(Msg, StateName, D);
 
 handle_event(internal, Msg=#ssh_msg_channel_failure{},           StateName, D) ->
@@ -1007,6 +1008,7 @@ handle_event(cast, {reply_request,success,ChannelId}, {connected,_}, D) ->
     case ssh_channel:cache_lookup(cache(D), ChannelId) of
 	#channel{remote_id = RemoteId} ->
 	    Msg = ssh_connection:channel_success_msg(RemoteId),
+	    update_inet_buffers(D#data.socket),
 	    {keep_state, send_msg(Msg,D)};
 
 	undefined ->
@@ -1738,6 +1740,11 @@ send_replies(Repls, State) ->
 		Repls).
 
 get_repl({connection_reply,Msg}, {CallRepls,S}) ->
+    if is_record(Msg, ssh_msg_channel_success) ->
+	    update_inet_buffers(S#data.socket);
+       true ->
+	    ok
+    end,
     {CallRepls, send_msg(Msg,S)};
 get_repl({channel_data,undefined,_Data}, Acc) ->
     Acc;
@@ -1926,3 +1933,13 @@ handshake(Pid, Ref, Timeout) ->
 	    {error, timeout}
     end.
 
+update_inet_buffers(Socket) ->
+    {ok, BufSzs0} = inet:getopts(Socket, [sndbuf,recbuf]),
+    MinVal = 655360,
+    case
+	[{Tag,MinVal} || {Tag,Val} <- BufSzs0,
+			 Val < MinVal]
+    of
+	[] -> ok;
+	NewOpts -> inet:setopts(Socket, NewOpts)
+    end.
-- 
cgit v1.2.3