re-introduce find_socket

mozilla · Oct 28, 2024 · 786c616 · 786c616
1 parent d23aa74
commit 786c616
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/neqo-bin/src/server/mod.rs b/neqo-bin/src/server/mod.rs
@@ -249,17 +249,7 @@ impl ServerRunner {
             // Have server process in- and output datagrams.
             match self.server.process(input_dgram, (self.now)()) {
                 Output::Datagram(dgram) => {
-                    let ((_host, first_socket), rest) = self.sockets.split_first_mut().unwrap();
-                    let socket = rest
-                        .iter_mut()
-                        .map(|(_host, socket)| socket)
-                        .find(|socket| {
-                            socket
-                                .local_addr()
-                                .ok()
-                                .map_or(false, |socket_addr| socket_addr == dgram.source())
-                        })
-                        .unwrap_or(first_socket);
+                    let socket = find_socket(&mut self.sockets, dgram.source());
                     socket.writable().await?;
                     socket.send(&dgram)?;
                     continue;
@@ -323,6 +313,23 @@ enum Ready {
     Timeout,
 }
 
+/// Tries to find a socket, but then just falls back to sending from the first.
+fn find_socket(
+    sockets: &mut [(SocketAddr, crate::udp::Socket)],
+    addr: SocketAddr,
+) -> &mut crate::udp::Socket {
+    let ((_host, first_socket), rest) = sockets.split_first_mut().unwrap();
+    rest.iter_mut()
+        .map(|(_host, socket)| socket)
+        .find(|socket| {
+            socket
+                .local_addr()
+                .ok()
+                .map_or(false, |socket_addr| socket_addr == addr)
+        })
+        .unwrap_or(first_socket)
+}
+
 pub async fn server(mut args: Args) -> Res<()> {
     const HQ_INTEROP: &str = "hq-interop";