diff options
author | Alex Auvolat <alex@adnab.me> | 2018-10-12 22:39:38 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2018-10-12 22:39:38 +0200 |
commit | 0ed802601812acd6ad764e6ffd5aacfd7e674553 (patch) | |
tree | 1b7fccb7fbf81a6822dd3313f00a940e441b90ed /shard/lib/net/manager.ex | |
parent | eab3f9483b3659b1ad3572393d24652cac71c8b6 (diff) | |
download | shard-0ed802601812acd6ad764e6ffd5aacfd7e674553.tar.gz shard-0ed802601812acd6ad764e6ffd5aacfd7e674553.zip |
Connection management improvement, stuff
Diffstat (limited to 'shard/lib/net/manager.ex')
-rw-r--r-- | shard/lib/net/manager.ex | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/shard/lib/net/manager.ex b/shard/lib/net/manager.ex index dd80347..759c5f0 100644 --- a/shard/lib/net/manager.ex +++ b/shard/lib/net/manager.ex @@ -37,12 +37,18 @@ defmodule SNet.Manager do end def handle_call({:peer_up, pid, peer_info, auth}, _from, state) do - case :ets.match(:connections, {peer_info, :'$1', auth}) do + case :ets.match(:connections, {peer_info, :'$1', (if auth != nil do auth else :_ end), :_}) do [[pid2]|_] when pid2 != pid -> {:reply, :redundant, state} _ -> - :ets.match_delete(:connections, {peer_info, pid, :_}) - :ets.insert(:connections, {peer_info, pid, auth}) + :ets.match_delete(:connections, {peer_info, pid, :_, :_}) + :ets.insert(:connections, {peer_info, pid, auth, :established}) + + if auth != nil do + for [pid3] <- :ets.match(:connections, {peer_info, :'$1', nil, :_}) do + GenServer.cast(pid3, :close) + end + end # Send interested message for all our shards id_list = (for {id, _, _} <- Shard.Manager.list_shards(), do: id) @@ -59,7 +65,7 @@ defmodule SNet.Manager do end def handle_info({:EXIT, pid, _reason}, state) do - :ets.match_delete(:connections, {:_, pid, :_}) + :ets.match_delete(:connections, {:_, pid, :_, :_}) {:noreply, state} end @@ -67,12 +73,12 @@ defmodule SNet.Manager do if SNet.Addr.is_local? peer_info do nil else - case :ets.match(:connections, {peer_info, :'$1', (if auth != nil do auth else :_ end)}) do + case :ets.match(:connections, {peer_info, :'$1', (if auth != nil do auth else :_ end), :_}) do [[pid]|_] -> pid [] -> my_port = Application.get_env(:shard, :port) {:ok, pid} = SNet.TCPConn.start_link(%{connect_to: peer_info, my_port: my_port, auth: auth}) - :ets.insert(:connections, {peer_info, pid, auth}) + :ets.insert(:connections, {peer_info, pid, auth, :establishing}) pid end end @@ -100,14 +106,14 @@ defmodule SNet.Manager do Return the list of connections to a given peer, possibly with different auth """ def get_connections_to(peer_info) do - for {^peer_info, pid, auth} <- :ets.lookup(:connections, peer_info), do: {pid, auth} + for {^peer_info, pid, auth, _} <- :ets.lookup(:connections, peer_info), do: {pid, auth} end @doc""" Return the list of connections to a given peer that match a given auth spec """ def get_auth_connections_to(peer_info, my_auth, his_auth) do - for {^peer_info, pid, %SNet.Auth{my_pk: my_pk, his_pk: his_pk}} <- :ets.lookup(:connections, peer_info), + for {^peer_info, pid, %SNet.Auth{my_pk: my_pk, his_pk: his_pk}, _} <- :ets.lookup(:connections, peer_info), my_pk == my_auth or my_pk in my_auth, his_pk == his_auth or his_pk in his_auth, do: pid @@ -119,7 +125,7 @@ defmodule SNet.Manager do """ def send(peer_info, msg) do case :ets.lookup(:connections, peer_info) do - [{^peer_info, pid, _auth}|_] -> + [{^peer_info, pid, _auth, _}|_] -> GenServer.cast(pid, {:send_msg, msg}) [] -> GenServer.cast(__MODULE__, {:connect_and_send, peer_info, nil, msg}) @@ -127,7 +133,7 @@ defmodule SNet.Manager do end def send_auth(peer_info, auth, msg) do - case :ets.match(:connections, {peer_info, :'$1', auth}) do + case :ets.match(:connections, {peer_info, :'$1', auth, :_}) do [[pid]|_] -> GenServer.cast(pid, {:send_msg, msg}) [] -> |