Broadcast speed should be set per interface

Author: eliasol

pixie-server/example.config.yaml

@@ -3,8 +3,8 @@ hosts:
   - network: 10.0.0.1/8
     dhcp: !static [10.187.100.1, 10.187.200.200]
     #dhcp: !proxy 192.168.1.100
+    broadcast_speed: 52428800
   hostsfile: /etc/hosts
-  broadcast_speed: 52428800
 http:
   listen_on: 0.0.0.0:8080
   #password: secret

pixie-server/src/udp.rs

@@ -8,8 +8,8 @@ use anyhow::{ensure, Context, Result};
 use futures::FutureExt;
 use ipnet::Ipv4Net;
 use pixie_shared::{
-    chunk_codec::Encoder, ChunkHash, HintPacket, RegistrationInfo, UdpRequest, ACTION_PORT,
-    CHUNKS_PORT, HINT_PORT, UDP_BODY_LEN,
+    chunk_codec::Encoder, ChunkHash, HintPacket, InterfaceConfig, RegistrationInfo, UdpRequest,
+    ACTION_PORT, CHUNKS_PORT, HINT_PORT, UDP_BODY_LEN,
 };
 use std::{
     collections::BTreeSet,
@@ -26,7 +26,7 @@ use tokio::{
 async fn broadcast_chunks(
     state: &State,
     socket: &UdpSocket,
-    ip: Ipv4Addr,
+    iface: &InterfaceConfig,
     mut rx: Receiver<ChunkHash>,
 ) -> Result<()> {
     let mut queue = BTreeSet::<ChunkHash>::new();
@@ -77,8 +77,7 @@ async fn broadcast_chunks(
             continue;
         };
 
-        let hosts_cfg = &state.config.hosts;
-        let chunks_addr = SocketAddrV4::new(ip, CHUNKS_PORT);
+        let chunks_addr = SocketAddrV4::new(iface.network.broadcast(), CHUNKS_PORT);
 
         let mut encoder = Encoder::new(cdata);
         write_buf[..32].clone_from_slice(&index);
@@ -87,7 +86,7 @@ async fn broadcast_chunks(
 
             let sent_len = socket.send_to(&write_buf[..32 + len], chunks_addr).await?;
             ensure!(sent_len == 32 + len, "Could not send packet");
-            wait_for += 8 * (sent_len as u32) * Duration::from_secs(1) / hosts_cfg.broadcast_speed;
+            wait_for += 8 * (sent_len as u32) * Duration::from_secs(1) / iface.broadcast_speed;
         }
     }
 
@@ -221,7 +220,7 @@ pub async fn main(state: Arc<State>) -> Result<()> {
         .iter()
         .map(|iface| {
             let (tx, rx) = mpsc::channel(128);
-            ((iface.network, tx), (iface.network, rx))
+            ((iface.network, tx), (iface, rx))
         })
         .unzip();
 
@@ -231,9 +230,9 @@ pub async fn main(state: Arc<State>) -> Result<()> {
 
     let mut tasks = vec![handle_requests(&state, &socket, net_tx).boxed()];
 
-    for (network, rx) in net_rx {
-        tasks.push(broadcast_chunks(&state, &socket, network.broadcast(), rx).boxed());
-        tasks.push(broadcast_hint(&state, &socket, network.broadcast()).boxed());
+    for (iface, rx) in net_rx {
+        tasks.push(broadcast_chunks(&state, &socket, iface, rx).boxed());
+        tasks.push(broadcast_hint(&state, &socket, iface.network.broadcast()).boxed());
     }
 
     futures::future::try_join_all(tasks).await?;

pixie-shared/src/config.rs

@@ -25,6 +25,8 @@ pub struct InterfaceConfig {
     pub network: Ipv4Net,
     /// DHCP server.
     pub dhcp: DhcpMode,
+    /// Speed in bytes/second used to broadcast chunks.
+    pub broadcast_speed: u32,
 }
 
 /// Registered clients will always be assigned an IP in the form
@@ -37,8 +39,6 @@ pub struct HostsConfig {
     pub interfaces: Vec<InterfaceConfig>,
     /// Hosts file to use for DHCP hostnames.
     pub hostsfile: Option<PathBuf>,
-    /// Speed in bytes/second used to broadcast chunks.
-    pub broadcast_speed: u32,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]

test_config.yaml

@@ -2,14 +2,13 @@ hosts:
   interfaces:
   - network: 10.0.0.1/16
     dhcp: !static [10.0.100.1, 10.0.200.200]
-    #dhcp: !proxy 192.168.1.100
+    broadcast_speed: 52428800
   - network: 10.10.0.1/16
     dhcp: !static [10.10.100.1, 10.10.200.200]
+    broadcast_speed: 52428800
   hostsfile: /etc/hosts
-  broadcast_speed: 52428800
 http:
   listen_on: 0.0.0.0:8080
-  #password: secret
 groups:
   - [room0, 0]
   - [room10, 10]