Test relay candidates (#35)

Author: mickel8

.github/workflows/ci.yml

@@ -37,4 +37,6 @@ jobs:
           elixir-version: ${{matrix.elixir}}
       - run: mix deps.get
       - run: mix coveralls.json
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

lib/ex_ice/priv/candidate.ex

@@ -45,7 +45,8 @@ defmodule ExICE.Priv.Candidate do
     2 ** 24 * type_preference + 2 ** 8 * local_preference + 2 ** 0 * (256 - 1)
   end
 
-  @spec foundation(type(), :inet.ip_address(), :inet.ip_address() | nil, atom()) :: integer()
+  @spec foundation(type(), :inet.ip_address() | String.t(), :inet.ip_address() | nil, atom()) ::
+          integer()
   def foundation(type, ip, stun_turn_ip, transport) do
     {type, ip, stun_turn_ip, transport}
     |> then(&inspect(&1))

lib/ex_ice/priv/ice_agent.ex

@@ -65,7 +65,7 @@ defmodule ExICE.Priv.ICEAgent do
     eoc: false,
     # {did we nominate pair, pair id}
     nominating?: {false, nil},
-    sockets: MapSet.new(),
+    sockets: [],
     local_cands: %{},
     remote_cands: %{},
     stun_servers: [],
@@ -213,9 +213,7 @@ defmodule ExICE.Priv.ICEAgent do
   def gather_candidates(
         %__MODULE__{gathering_state: :new, ice_transport_policy: :all} = ice_agent
       ) do
-    Logger.debug("Gathering state change: #{ice_agent.gathering_state} -> gathering")
-    notify(ice_agent.on_gathering_state_change, {:gathering_state_change, :gathering})
-    ice_agent = %{ice_agent | gathering_state: :gathering}
+    ice_agent = change_gathering_state(ice_agent, :gathering)
 
     {:ok, sockets} = Gatherer.open_sockets(ice_agent.gatherer)
     host_cands = Gatherer.gather_host_candidates(ice_agent.gatherer, sockets)
@@ -247,7 +245,7 @@ defmodule ExICE.Priv.ICEAgent do
   def gather_candidates(
         %__MODULE__{gathering_state: :new, ice_transport_policy: :relay} = ice_agent
       ) do
-    change_gathering_state(ice_agent, :gathering)
+    ice_agent = change_gathering_state(ice_agent, :gathering)
 
     {:ok, sockets} = Gatherer.open_sockets(ice_agent.gatherer)
 
@@ -734,6 +732,10 @@ defmodule ExICE.Priv.ICEAgent do
     {_socket, {src_ip, src_port}} = tr_id
 
     case ExTURN.Client.handle_message(tr.client, {:socket_data, src_ip, src_port, packet}) do
+      {:ok, client} ->
+        tr = %{tr | client: client}
+        put_in(ice_agent.gathering_transactions[tr_id], tr)
+
       {:allocation_created, {alloc_ip, alloc_port}, client} ->
         tr = %{tr | client: client, state: :complete}
 
@@ -1921,14 +1923,16 @@ defmodule ExICE.Priv.ICEAgent do
 
   defp send_keepalive(ice_agent, pair) do
     type = %Type{class: :indication, method: :binding}
+    local_cand = Map.fetch!(ice_agent.local_cands, pair.local_cand_id)
+    remote_cand = Map.fetch!(ice_agent.remote_cands, pair.remote_cand_id)
 
     req =
       type
       |> Message.new()
       |> Message.with_fingerprint()
 
-    dst = {pair.remote_cand.address, pair.remote_cand.port}
-    {_result, ice_agent} = do_send(ice_agent, pair.local_cand, dst, Message.encode(req))
+    dst = {remote_cand.address, remote_cand.port}
+    {_result, ice_agent} = do_send(ice_agent, local_cand, dst, Message.encode(req))
     ice_agent
   end