Review fixes

Author: sgfn

lib/ex_ice/ice_agent.ex

@@ -496,11 +496,9 @@ defmodule ExICE.ICEAgent do
   end
 
   @impl true
-  def handle_info({:tcp, _socket, _packet}, state) do
-    # TODO: consider receiving TCP data in the ICE Agent process
-    # ice_agent = ExICE.Priv.ICEAgent.handle_tcp(state.ice_agent, socket, packet)
-    # {:noreply, %{state | ice_agent: ice_agent}}
-    {:noreply, state}
+  def handle_info({:tcp, socket, src_ip, src_port, packet}, state) do
+    ice_agent = ExICE.Priv.ICEAgent.handle_tcp(state.ice_agent, socket, src_ip, src_port, packet)
+    {:noreply, %{state | ice_agent: ice_agent}}
   end
 
   @impl true

lib/ex_ice/priv/ice_agent.ex

@@ -920,6 +920,18 @@ defmodule ExICE.Priv.ICEAgent do
     end
   end
 
+  @spex handle_tcp(
+          t(),
+          ExICE.Priv.Transport.socket(),
+          :inet.ip_address(),
+          :inet.port_number(),
+          binary()
+        ) :: t()
+  def handle_tcp(ice_agent, socket, src_ip, src_port, packet) do
+    # This is the same because framing and mapping the sockets is handled in the TCP Client
+    handle_udp(ice_agent, socket, src_ip, src_port, packet)
+  end
+
   @spec handle_ex_turn_msg(t(), reference(), ExTURN.Client.notification_message()) :: t()
   def handle_ex_turn_msg(%__MODULE__{state: :closed} = ice_agent, _, _) do
     Logger.debug("Received ex_turn message in closed state. Ignoring.")

lib/ex_ice/priv/transport/tcp.ex

@@ -37,13 +37,14 @@ defmodule ExICE.Priv.Transport.TCP do
   defdelegate sockname(socket), to: :inet
 
   # HACK: using listen sockets here is ugly, but was easier to fit into the existing ICE Agent implementation.
+  #       At the moment, `listen_socket` is used to access the specific socket connected to `dest`.
   #       This should be changed, especially because we're going to want to close the listen sockets
   #       after the connection is successfully established.
   @impl true
   def send(listen_socket, dest, packet, tp_opts \\ []) do
     with {:ok, local} <- sockname(listen_socket),
          [{pid, _}] <- Registry.lookup(ExICE.Priv.Registry, local) do
-      GenServer.call(pid, {:send, listen_socket, dest, packet, tp_opts})
+      Client.send(pid, listen_socket, dest, packet, tp_opts)
     else
       _ -> {:error, :no_client_process}
     end
@@ -53,7 +54,7 @@ defmodule ExICE.Priv.Transport.TCP do
   def close(listen_socket) do
     with {:ok, local} <- sockname(listen_socket),
          [{pid, _}] <- Registry.lookup(ExICE.Priv.Registry, local) do
-      GenServer.call(pid, {:close, listen_socket})
+      Client.close(pid, listen_socket)
     else
       _ -> {:error, :no_client_process}
     end

lib/ex_ice/priv/transport/tcp_client.ex

@@ -133,7 +133,7 @@ defmodule ExICE.Priv.Transport.TCP.Client do
 
   @impl true
   def handle_call({:close, listen_socket}, _from, state) do
-    # TODO: revisit the closing logic
+    # TODO: revisit the closing logic. Listen sockets should be closed after the connection is established
     :gen_tcp.close(listen_socket)
     Enum.each(state.connections, fn {_, %{socket: socket}} -> :gen_tcp.close(socket) end)
 
@@ -179,7 +179,7 @@ defmodule ExICE.Priv.Transport.TCP.Client do
           <<length::unsigned-big-16, data::binary-size(length), rest::binary>> ->
             # HACK: this is dirty and means that, with framing, we're miscalculating
             #       the bytes_sent and bytes_received counters
-            send(state.ice_agent, {:udp, state.listen_socket, src_ip, src_port, data})
+            send(state.ice_agent, {:tcp, state.listen_socket, src_ip, src_port, data})
             state = put_in(state, [:connections, remote, :recv_buffer], <<>>)
 
             if rest != <<>> do
@@ -194,7 +194,7 @@ defmodule ExICE.Priv.Transport.TCP.Client do
         end
 
       true ->
-        send(state.ice_agent, {:udp, state.listen_socket, src_ip, src_port, packet})
+        send(state.ice_agent, {:tcp, state.listen_socket, src_ip, src_port, packet})
         {:noreply, state}
     end
   end