fix stun

Author: vans163

ex/config/runtime.exs

@@ -20,7 +20,8 @@ config :ama, :offline, (!!System.get_env("OFFLINE") || nil)
 config :ama, :http_ipv4, ((System.get_env("HTTP_IPV4") || "0.0.0.0") |> :unicode.characters_to_list() |> :inet.parse_ipv4_address() |> (case do {:ok, addr}-> addr end))
 config :ama, :http_port, (System.get_env("HTTP_PORT") || "80") |> :erlang.binary_to_integer()
 
-config :ama, :udp_ipv4_tuple, ((System.get_env("UDP_IPV4") || "0.0.0.0") |> :unicode.characters_to_list() |> :inet.parse_ipv4_address() |> (case do {:ok, addr}-> addr end))
+udp_ipv4_iface =  ((System.get_env("UDP_IPV4") || "0.0.0.0") |> :unicode.characters_to_list() |> :inet.parse_ipv4_address() |> (case do {:ok, addr}-> addr end))
+config :ama, :udp_ipv4_tuple, udp_ipv4_iface
 config :ama, :udp_port, 36969
 
 #Nodes
@@ -53,7 +54,7 @@ config :ama, :autoupdate, System.get_env("AUTOUPDATE") in ["true", "y", "yes"]
 config :ama, :computor_type, (case System.get_env("COMPUTOR") do nil -> nil; "trainer" -> :trainer; _ -> :default end)
 config :ama, :snapshot_height, (System.get_env("SNAPSHOT_HEIGHT") || "24875547") |> :erlang.binary_to_integer()
 
-pub_ipv4 = STUN.get_current_ip4()
+pub_ipv4 = STUN.get_current_ip4(udp_ipv4_iface)
 config :ama, :public_udp_ipv4, pub_ipv4
 config :ama, :anr, NodeANR.build(sk, pk, pub_ipv4, version)
 config :ama, :max_peers, (System.get_env("MAX_PEERS") || "300") |> :erlang.binary_to_integer()

ex/lib/misc/stun.ex

@@ -3,8 +3,9 @@ defmodule STUN do
   alias ExSTUN.Message.Type
   alias ExSTUN.Message.Attribute.XORMappedAddress
 
-  def get_my_public_ipv4() do
-    {:ok, socket} = :gen_udp.open(0, [{:active, false}, :binary])
+  def get_my_public_ipv4(iface \\ nil) do
+    iface = if !iface do Application.fetch_env!(:ama, :udp_ipv4_tuple) else iface end
+    {:ok, socket} = :gen_udp.open(0, [{:ifaddr, iface}, {:active, false}, :binary])
 
     req =
       %Type{class: :request, method: :binding}
@@ -19,24 +20,26 @@ defmodule STUN do
     "#{ip1}.#{ip2}.#{ip3}.#{ip4}"
   end
 
-  def get_my_public_ipv4_http() do
+  def get_my_public_ipv4_http(iface \\ nil) do
     url = "http://api.myip.la/en?json"
-    {:ok, %{status_code: 200, body: body}} = :comsat_http.get(url, %{}, %{timeout: 6000})
+
+    iface = if !iface do Application.fetch_env!(:ama, :udp_ipv4_tuple) else iface end
+    {:ok, %{status_code: 200, body: body}} = :comsat_http.get(url, %{}, %{timeout: 6000, inet_options: [{:ifaddr, iface}]})
     JSX.decode!(body, labels: :atom).ip
   end
 
-  def get_current_ip4() do
+  def get_current_ip4(iface \\ nil) do
     pub_ipv4 = case System.get_env("PUBLIC_UDP_IPV4") do
-      nil -> get_current_ip4_2()
+      nil -> get_current_ip4_2(iface)
       ipv4 -> ipv4
     end
   end
-  defp get_current_ip4_2() do
+  defp get_current_ip4_2(iface) do
     IO.puts "trying to get ip4 via STUN.."
-    ip4 = try do get_my_public_ipv4() catch _,_ -> nil end
+    ip4 = try do get_my_public_ipv4(iface) catch _,_ -> nil end
     if ip4 do ip4 else
       IO.puts "trying to get ip4 via HTTP.."
-      ip4 = try do get_my_public_ipv4_http() catch _,_ -> nil end
+      ip4 = try do get_my_public_ipv4_http(iface) catch _,_ -> nil end
       if ip4 do ip4 else
         IO.put "failed to find your nodes public ip. Hardcode it via PUBLIC_UDP_IPV4="
       end