From 0f3963c4453cb3363612f948c2395492a2a28458 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Wed, 25 Aug 2010 18:03:34 +0200
Subject: Fix receiving empty packets.

Empty packets where not delivered from ssl, it incorrectly assumed
there was no data.
---
 lib/ssl/src/ssl_connection.erl    | 12 +++++++-----
 lib/ssl/test/ssl_packet_SUITE.erl | 40 +++++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 15 deletions(-)

(limited to 'lib/ssl')

diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 76422155a5..bb2d874718 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -1638,8 +1638,6 @@ application_data(Data, #state{user_application = {_Mon, Pid},
 		  true -> <<Buffer0/binary, Data/binary>>
 	      end,
     case get_data(SOpts, BytesToRead, Buffer1) of
-	{ok, <<>>, Buffer} -> % no reply, we need more data
-	    next_record(State0#state{user_data_buffer = Buffer});
 	{ok, ClientData, Buffer} -> % Send data
 	    SocketOpt = deliver_app_data(SOpts, ClientData, Pid, From),
 	    State = State0#state{user_data_buffer = Buffer,
@@ -1655,12 +1653,16 @@ application_data(Data, #state{user_application = {_Mon, Pid},
 	 	true -> %% We have more data
  		    application_data(<<>>, State)
 	    end;
+	{more, Buffer} -> % no reply, we need more data
+	    next_record(State0#state{user_data_buffer = Buffer});
 	{error,_Reason} -> %% Invalid packet in packet mode
 	    deliver_packet_error(SOpts, Buffer1, Pid, From),
 	    {stop, normal, State0}
     end.
 
 %% Picks ClientData 
+get_data(_, _, <<>>) ->
+    {more, <<>>};
 get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Buffer) 
   when Raw =:= raw; Raw =:= 0 ->   %% Raw Mode
     if 
@@ -1673,13 +1675,13 @@ get_data(#socket_options{active=Active, packet=Raw}, BytesToRead, Buffer)
 	    {ok, Data, Rest};
 	true ->
 	    %% Passive Mode not enough data
-	    {ok, <<>>, Buffer}
+	    {more, Buffer}
     end;
 get_data(#socket_options{packet=Type, packet_size=Size}, _, Buffer) ->
     PacketOpts = [{packet_size, Size}], 
     case decode_packet(Type, Buffer, PacketOpts) of
 	{more, _} ->
-	    {ok, <<>>, Buffer};
+	    {more, Buffer};
 	Decoded ->
 	    Decoded
     end.
@@ -1831,7 +1833,7 @@ next_state(StateName, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, State
     case application_data(Data, State0) of
 	Stop = {stop,_,_} ->
    	    Stop;
-	 {Record, State} ->
+	{Record, State} ->
    	    next_state(StateName, Record, State)
     end;
 next_state(StateName, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = <<1>>} = 
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 9553241ad4..1e7cde1c25 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -2196,21 +2196,29 @@ header_decode_two_bytes_one_sent(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %% Internal functions
 
-send_raw(_,_, 0) ->
+send_raw(Socket,_, 0) ->
+    ssl:send(Socket, <<>>),
     no_result_msg;
 send_raw(Socket, Data, N) ->
     ssl:send(Socket, Data),
     send_raw(Socket, Data, N-1).
 
-passive_raw(_, _, 0) ->
+passive_raw(Socket, _, 0) ->
+    {error, timeout} = ssl:recv(Socket, 0, 500),
     ok;
 passive_raw(Socket, Data, N) ->
     Length = length(Data),
     {ok, Data} = ssl:recv(Socket, Length),
     passive_raw(Socket, Data, N-1).
 
-passive_recv_packet(_, _, 0) ->
-    ok;
+passive_recv_packet(Socket, _, 0) ->
+    case ssl:recv(Socket, 0) of
+	{ok, []} ->
+	    {error, timeout} = ssl:recv(Socket, 0, 500),
+	    ok;
+	Other ->
+	    {other, Other, ssl:session_info(Socket), 0}
+    end;
 passive_recv_packet(Socket, Data, N) ->
     case ssl:recv(Socket, 0) of
 	{ok, Data} -> 
@@ -2219,7 +2227,8 @@ passive_recv_packet(Socket, Data, N) ->
 	    {other, Other, ssl:session_info(Socket), N}
     end.
 
-send(_,_, 0) ->
+send(Socket,_, 0) ->
+    ssl:send(Socket, <<>>),
     no_result_msg;
 send(Socket, Data, N) ->
     case ssl:send(Socket, [Data]) of
@@ -2233,6 +2242,7 @@ send_incomplete(Socket, Data, N) ->
     send_incomplete(Socket, Data, N, <<>>).
 send_incomplete(Socket, _Data, 0, Prev) ->
     ssl:send(Socket, Prev),
+    ssl:send(Socket, [?uint32(0)]),
     no_result_msg;
 send_incomplete(Socket, Data, N, Prev) ->
     Length = size(Data),
@@ -2261,8 +2271,13 @@ active_once_raw(Socket, Data, N, Acc) ->
 	    end
     end.
 
-active_once_packet(_,_, 0) ->
-    ok;
+active_once_packet(Socket,_, 0) ->
+    receive
+	{ssl, Socket, []} ->
+	    ok;
+	{ssl, Socket, Other} ->
+	    {other, Other, ssl:session_info(Socket), 0}
+    end;
 active_once_packet(Socket, Data, N) ->
     receive 
 	{ssl, Socket, Data} ->
@@ -2274,7 +2289,7 @@ active_once_packet(Socket, Data, N) ->
 active_raw(Socket, Data, N) ->
     active_raw(Socket, Data, N, []).
 
-active_raw(_, _, 0, _) ->
+active_raw(_Socket, _, 0, _) ->
     ok;
 active_raw(Socket, Data, N, Acc) ->
     receive 
@@ -2289,8 +2304,13 @@ active_raw(Socket, Data, N, Acc) ->
 	    end
     end.
 
-active_packet(_, _, 0) ->
-    ok;
+active_packet(Socket, _, 0) ->
+    receive
+	{ssl, Socket, []} ->
+	    ok;
+	Other ->
+	    {other, Other, ssl:session_info(Socket), 0}
+    end;
 active_packet(Socket, Data, N) ->
     receive 
 	{ssl, Socket, Data} ->
-- 
cgit v1.2.3