Merge branch 'ia/ssh/sending-large-data-and-eof/OTP-10467'

* ia/ssh/sending-large-data-and-eof/OTP-10467:
  ssh: Make test case platform independant
  ssh: ssh_connection:channel_data() and send_eof() now return {error, closed} for closed or invalid channels.
  ssh: Ensure that all data is sent before ssh:send returns.
  ssh: add test suite for testing channel send/receive behavior.

2 files changed, 49 insertions, 36 deletions

diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index e3b8ebfb79..240d7f70d1 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -318,21 +318,22 @@ channel_data(ChannelId, DataType, Data,
 	     From) ->
     
     case ssh_channel:cache_lookup(Cache, ChannelId) of
-	#channel{remote_id = Id} = Channel0 ->
-	    {SendList, Channel} = update_send_window(Channel0, DataType, 
+	#channel{remote_id = Id, sent_close = false} = Channel0 ->
+	    {SendList, Channel} = update_send_window(Channel0#channel{flow_control = From}, DataType,
 						     Data, Connection),
 	    Replies = 
 		lists:map(fun({SendDataType, SendData}) -> 
-				      {connection_reply, ConnectionPid, 
-				       channel_data_msg(Id, 
-							SendDataType, 
-							SendData)}
+				  {connection_reply, ConnectionPid,
+				   channel_data_msg(Id,
+						    SendDataType,
+						    SendData)}
 			  end, SendList),
 	    FlowCtrlMsgs = flow_control(Replies, 
-					Channel#channel{flow_control = From}, 
+					Channel,
 					Cache),
 	    {{replies, Replies ++ FlowCtrlMsgs}, Connection};
-	undefined ->
+	_ ->
+	    gen_server:reply(From, {error, closed}),
 	    {noreply, Connection}
     end.
 
@@ -386,20 +387,30 @@ handle_msg(#ssh_msg_channel_close{recipient_channel = ChannelId},
 	   ConnectionPid, _) ->
 
 	case ssh_channel:cache_lookup(Cache, ChannelId) of
-	    #channel{sent_close = Closed, remote_id = RemoteId} = Channel ->
+		#channel{sent_close = Closed, remote_id = RemoteId, flow_control = FlowControl} = Channel ->
 		ssh_channel:cache_delete(Cache, ChannelId),
 		{CloseMsg, Connection} = 
 		    reply_msg(Channel, Connection0, {closed, ChannelId}),
+
+			ConnReplyMsgs =
 		case Closed of
-		    true ->
-			{{replies, [CloseMsg]}, Connection};
+					true -> [];
 		    false ->
 			RemoteCloseMsg = channel_close_msg(RemoteId),
-			{{replies, 
-			  [{connection_reply, 
-				      ConnectionPid, RemoteCloseMsg},
-			   CloseMsg]}, Connection}
-		end;
+						[{connection_reply, ConnectionPid, RemoteCloseMsg}]
+				end,
+
+			%% if there was a send() in progress, make it fail
+			SendReplyMsgs =
+				case FlowControl of
+					undefined -> [];
+					From ->
+						[{flow_control, From, {error, closed}}]
+				end,
+
+			Replies = ConnReplyMsgs ++ [CloseMsg] ++ SendReplyMsgs,
+			{{replies, Replies}, Connection};
+
 	    undefined ->
 		{{replies, []}, Connection0}
 	end;
@@ -1126,13 +1137,13 @@ flow_control(Channel, Cache) ->
 flow_control([], Channel, Cache) ->
     ssh_channel:cache_update(Cache, Channel),
     [];
-flow_control([_|_], #channel{flow_control = From} = Channel, Cache) ->
-    case From of
-	undefined ->
-	    [];
-	_ ->
-	    [{flow_control, Cache,  Channel, From, ok}]
-    end.
+
+flow_control([_|_], #channel{flow_control = From,
+							 send_buf = []} = Channel, Cache) when From =/= undefined ->
+	[{flow_control, Cache, Channel, From, ok}];
+flow_control(_,_,_) ->
+	[].
+
 
 encode_pty_opts(Opts) ->
     Bin = list_to_binary(encode_pty_opts2(Opts)),
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index e53cd4f4f7..af521b77e4 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -163,7 +163,7 @@ send(ConnectionManager, ChannelId, Type, Data, Timeout) ->
     call(ConnectionManager, {data, ChannelId, Type, Data}, Timeout).
 
 send_eof(ConnectionManager, ChannelId) ->
-    cast(ConnectionManager, {eof, ChannelId}).
+    call(ConnectionManager, {eof, ChannelId}).
 
 %%====================================================================
 %% gen_server callbacks
@@ -295,6 +295,18 @@ handle_call({data, ChannelId, Type, Data}, From,
     channel_data(ChannelId, Type, Data, Connection0, ConnectionPid, From,
 		 State);
 
+handle_call({eof, ChannelId}, _From,
+			#state{connection = Pid, connection_state =
+					   #connection{channel_cache = Cache}} = State) ->
+	case ssh_channel:cache_lookup(Cache, ChannelId) of
+		#channel{remote_id = Id, sent_close = false} ->
+			send_msg({connection_reply, Pid,
+					  ssh_connection:channel_eof_msg(Id)}),
+			{reply, ok, State};
+		_ ->
+			{reply, {error,closed}, State}
+	end;
+
 handle_call({connection_info, Options}, From, 
 	    #state{connection = Connection} = State) ->
     ssh_connection_handler:connection_info(Connection, From, Options),
@@ -453,18 +465,6 @@ handle_cast({adjust_window, ChannelId, Bytes},
     end,
     {noreply, State};
 
-handle_cast({eof, ChannelId}, 
-	    #state{connection = Pid, connection_state = 
-		   #connection{channel_cache = Cache}} = State) ->
-    case ssh_channel:cache_lookup(Cache, ChannelId) of			 
-	#channel{remote_id = Id} ->
-	    send_msg({connection_reply, Pid, 
-		      ssh_connection:channel_eof_msg(Id)}),
-	    {noreply, State};
-	undefined -> 
-	    {noreply, State}
-    end;
-
 handle_cast({success, ChannelId},  #state{connection = Pid} = State) ->
     Msg = ssh_connection:channel_success_msg(ChannelId),
     send_msg({connection_reply, Pid, Msg}),
@@ -614,6 +614,8 @@ do_send_msg({connection_reply, Pid, Data}) ->
     ssh_connection_handler:send(Pid, Msg);
 do_send_msg({flow_control, Cache, Channel, From, Msg}) ->
     ssh_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
+    gen_server:reply(From, Msg);
+do_send_msg({flow_control, From, Msg}) ->
     gen_server:reply(From, Msg).
 
 handle_request(ChannelPid, ChannelId, Type, Data, WantReply, From,