chore: try bind to all interfaces

Marcel-G · Jan 10, 2025 · 8176388 · 8176388
1 parent 4ac3f88
commit 8176388
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/backend/client/infrastructure/task.tf b/backend/client/infrastructure/task.tf
@@ -20,7 +20,7 @@ module "task" {
     "PUBLIC_IP" = var.instance.public_ip,
     "PORT" = "3478",
     "SIGNAL_SERVER" = "ws://localhost:8000/signaling",
-    "RUST_LOG" = "sobaka_client=info"
+    "RUST_LOG" = "sobaka_client=debug"
   }
   secrets = {
     JWT = {

diff --git a/backend/client/src/client.rs b/backend/client/src/client.rs
@@ -222,7 +222,7 @@ impl Client {
                 .set_read_timeout(Some(duration))
                 .expect("setting socket read timeout");
 
-            if let Some(input) = read_socket_input(&self.socket, &mut self.buf) {
+            if let Some(input) = read_socket_input(&self.socket, &self.candidate, &mut self.buf) {
                 // The rtc.accepts() call is how we demultiplex the incoming packet to know which
                 // Rtc instance the traffic belongs to.
                 if let Some(client) = self.connections.iter_mut().find(|c| c.accepts(&input)) {
@@ -244,7 +244,11 @@ impl Client {
     }
 }
 
-fn read_socket_input<'a>(socket: &UdpSocket, buf: &'a mut Vec<u8>) -> Option<Input<'a>> {
+fn read_socket_input<'a>(
+    socket: &UdpSocket,
+    candidate: &Candidate,
+    buf: &'a mut Vec<u8>,
+) -> Option<Input<'a>> {
     buf.resize(2000, 0);
 
     match socket.recv_from(buf) {
@@ -262,7 +266,7 @@ fn read_socket_input<'a>(socket: &UdpSocket, buf: &'a mut Vec<u8>) -> Option<Inp
                 Receive {
                     proto: Protocol::Udp,
                     source,
-                    destination: socket.local_addr().unwrap(),
+                    destination: candidate.addr(),
                     contents,
                 },
             ))

diff --git a/backend/client/src/main.rs b/backend/client/src/main.rs
@@ -1,6 +1,6 @@
 use core::panic;
 use signal::connection::websocket_client;
-use std::net::{IpAddr, SocketAddr, UdpSocket};
+use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
 use str0m::Candidate;
 use systemstat::{Platform, System};
 use url::Url;
@@ -57,7 +57,7 @@ async fn main() {
         .expect("PORT must be a valid number");
 
     let socket =
-        UdpSocket::bind((select_host_address(), port)).expect("binding to specified UDP port");
+        UdpSocket::bind((Ipv4Addr::UNSPECIFIED, port)).expect("binding to specified UDP port");
 
     let addr = socket.local_addr().expect("a local socket address");
     log::info!("Bound UDP port: {}", addr);

diff --git a/backend/infrastructure/task/main.tf b/backend/infrastructure/task/main.tf
@@ -94,6 +94,7 @@ locals {
     docker run \
       --name ${var.name} \
       --restart always \
+      --network host \
       --detach \
       ${join(" ", [for env_name, value in var.env : "-e ${env_name}=${value}"])} \
       ${join(" ", [for port in var.ports : "-p ${port}"])} \