Make handle_timeout/1 return {:error, :closed}. Extend tests by roles

Author: mickel8

c_src/ex_dtls/native.c

@@ -391,6 +391,7 @@ UNIFEX_TERM handle_read_error(State *state, int ret) {
   int error = SSL_get_error(state->ssl, ret);
   switch (error) {
   case SSL_ERROR_ZERO_RETURN:
+    state->closed = 1;
     return handle_data_result_error_peer_closed_for_writing(state->env);
   case SSL_ERROR_WANT_READ:
     DEBUG("SSL WANT READ. This is workaround. Did we get retransmission?");
@@ -492,6 +493,10 @@ UNIFEX_TERM handle_handshake_in_progress(State *state, int ret) {
 }
 
 UNIFEX_TERM handle_timeout(UnifexEnv *env, State *state) {
+  if (state->closed == 1) {
+    return handle_timeout_result_error_closed(env);
+  }
+
   long result = DTLSv1_handle_timeout(state->ssl);
   if (result != 1)
     return handle_timeout_result_ok(env);

test/integration_test.exs

@@ -60,15 +60,35 @@ defmodule ExDTLS.IntegrationTest do
     assert {:error, :handshake_error} = feed_packets(tx_dtls, packets)
   end
 
-  describe "disconnect" do
-    test "before handshake has finished" do
+  describe "close/1" do
+    test "before handshake has finished (client mode)" do
       dtls = ExDTLS.init(mode: :client, dtls_srtp: true, verify_peer: true)
       assert {:ok, []} = ExDTLS.close(dtls)
       # assert that handshake can't be started
       assert {:error, :closed} = ExDTLS.do_handshake(dtls)
     end
 
-    test "after handshake has finished" do
+    test "before handshake has finished (server mode)" do
+      dtls = ExDTLS.init(mode: :server, dtls_srtp: true, verify_peer: true)
+      assert {:ok, []} = ExDTLS.close(dtls)
+      # assert that handshake can't be started
+      assert {:error, :closed} = ExDTLS.do_handshake(dtls)
+    end
+
+    test "after handshake has finished (client mode)" do
+      rx_dtls = ExDTLS.init(mode: :server, dtls_srtp: true, verify_peer: true)
+      tx_dtls = ExDTLS.init(mode: :client, dtls_srtp: true, verify_peer: true)
+
+      {:ok, packets, _timeout} = ExDTLS.do_handshake(tx_dtls)
+
+      assert :ok == loop({rx_dtls, false}, {tx_dtls, false}, packets)
+      assert {:ok, [packet]} = ExDTLS.close(tx_dtls)
+      assert {:error, :peer_closed_for_writing} = ExDTLS.handle_data(rx_dtls, packet)
+      assert {:error, :closed} = ExDTLS.handle_timeout(tx_dtls)
+      assert {:error, :closed} = ExDTLS.handle_timeout(rx_dtls)
+    end
+
+    test "after handshake has finished (server mode)" do
       rx_dtls = ExDTLS.init(mode: :server, dtls_srtp: true, verify_peer: true)
       tx_dtls = ExDTLS.init(mode: :client, dtls_srtp: true, verify_peer: true)
 
@@ -77,6 +97,8 @@ defmodule ExDTLS.IntegrationTest do
       assert :ok == loop({rx_dtls, false}, {tx_dtls, false}, packets)
       assert {:ok, [packet]} = ExDTLS.close(rx_dtls)
       assert {:error, :peer_closed_for_writing} = ExDTLS.handle_data(tx_dtls, packet)
+      assert {:error, :closed} = ExDTLS.handle_timeout(tx_dtls)
+      assert {:error, :closed} = ExDTLS.handle_timeout(rx_dtls)
     end
   end