-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feat-ecn-io' of https://github.com/larseggert/neqo into…
… quinn-udp
- Loading branch information
Showing
6 changed files
with
201 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| use std::{ | ||
| io::{self, IoSliceMut}, | ||
| net::SocketAddr, | ||
| os::fd::AsFd, | ||
| slice, | ||
| }; | ||
|
|
||
| use quinn_udp::{EcnCodepoint, RecvMeta, Transmit, UdpSocketState}; | ||
|
|
||
| use crate::{Datagram, IpTos}; | ||
|
|
||
| /// Send the UDP datagram on the specified socket. | ||
| /// | ||
| /// # Arguments | ||
| /// | ||
| /// * `socket` - The UDP socket to send the datagram on. | ||
| /// * `d` - The datagram to send. | ||
| /// | ||
| /// # Returns | ||
| /// | ||
| /// An `io::Result` indicating whether the datagram was sent successfully. | ||
| /// | ||
| /// # Errors | ||
| /// | ||
| /// Returns an `io::Error` if the UDP socket fails to send the datagram. | ||
| /// | ||
| /// # Panics | ||
| /// | ||
| /// Panics if the datagram is too large to send. | ||
| pub fn tx(socket: impl AsFd, d: &Datagram) -> io::Result<usize> { | ||
| // TODO: Don't instantiate on each write. | ||
| let send_state = UdpSocketState::new((&socket).into()).unwrap(); | ||
| let transmit = Transmit { | ||
| destination: d.destination(), | ||
| ecn: EcnCodepoint::from_bits(Into::<u8>::into(d.tos())), | ||
| contents: d[..].to_vec().into(), | ||
| segment_size: None, | ||
| src_ip: Some(d.source().ip()), | ||
| }; | ||
| let n = send_state | ||
| .send((&socket).into(), slice::from_ref(&transmit)) | ||
| .unwrap(); | ||
| Ok(n) | ||
| } | ||
|
|
||
| /// Receive a UDP datagram on the specified socket. | ||
| /// | ||
| /// # Arguments | ||
| /// | ||
| /// * `socket` - The UDP socket to receive the datagram on. | ||
| /// * `buf` - The buffer to receive the datagram into. | ||
| /// * `tos` - The type-of-service (TOS) or traffic class (TC) value of the received datagram. | ||
| /// * `ttl` - The time-to-live (TTL) or hop limit (HL) value of the received datagram. | ||
| /// | ||
| /// # Returns | ||
| /// | ||
| /// An `io::Result` indicating the size of the received datagram and the source address. | ||
| /// | ||
| /// # Errors | ||
| /// | ||
| /// Returns an `io::Error` if the UDP socket fails to receive the datagram. | ||
| /// | ||
| /// # Panics | ||
| /// | ||
| /// Panics if the datagram is too large to receive. | ||
| pub fn rx( | ||
| socket: impl AsFd, | ||
| buf: &mut [u8], | ||
| // TODO: Can these be return values instead of mutable inputs? | ||
| tos: &mut u8, | ||
| ttl: &mut u8, | ||
| ) -> io::Result<(usize, SocketAddr)> { | ||
| let mut meta = RecvMeta::default(); | ||
| // TODO: Don't instantiate on each read. | ||
| let recv_state = UdpSocketState::new((&socket).into()).unwrap(); | ||
|
|
||
| // TODO: needed? | ||
| // #[cfg(test)] | ||
| // // `UdpSocketState` switches to non-blocking mode, undo that for the tests. | ||
| // socket.set_nonblocking(false).unwrap(); | ||
|
|
||
| match recv_state.recv( | ||
| (&socket).into(), | ||
| &mut [IoSliceMut::new(buf)], | ||
| slice::from_mut(&mut meta), | ||
| ) { | ||
| Err(e) => Err(e), | ||
| Ok(n) => { | ||
| *tos = if meta.ecn.is_some() { | ||
| meta.ecn.unwrap() as u8 | ||
| } else { | ||
| IpTos::default().into() | ||
| }; | ||
| *ttl = 0xff; // TODO: get the real TTL | ||
| Ok((n, meta.addr)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use crate::{IpTos, IpTosDscp, IpTosEcn}; | ||
|
|
||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn datagram_io() { | ||
| // Create UDP sockets for testing. | ||
| let sender = UdpSocket::bind("127.0.0.1:0").unwrap(); | ||
| let receiver = UdpSocket::bind("127.0.0.1:8080").unwrap(); | ||
|
|
||
| // Create a sample datagram. | ||
| let tos_tx = IpTos::from((IpTosDscp::Le, IpTosEcn::Ce)); | ||
| let ttl_tx = 128; | ||
| let datagram = Datagram::new( | ||
| sender.local_addr().unwrap(), | ||
| receiver.local_addr().unwrap(), | ||
| tos_tx, | ||
| Some(ttl_tx), | ||
| "Hello, world!".as_bytes().to_vec(), | ||
| ); | ||
|
|
||
| // Call the emit_datagram function. | ||
| let result = tx(&sender, &datagram); | ||
|
|
||
| // Assert that the datagram was sent successfully. | ||
| assert!(result.is_ok()); | ||
|
|
||
| // Create a buffer for receiving the datagram. | ||
| let mut buf = [0; u16::MAX as usize]; | ||
|
|
||
| // Create variables for storing TOS and TTL values. | ||
| let mut tos_rx = 0; | ||
| let mut ttl_rx = 0; | ||
|
|
||
| // Call the recv_datagram function. | ||
| let result = rx(&receiver, &mut buf, &mut tos_rx, &mut ttl_rx); | ||
|
|
||
| // Assert that the datagram was received successfully. | ||
| println!("Received {result:?}"); | ||
| assert!(result.is_ok()); | ||
|
|
||
| // Assert that the ECN and TTL values are correct. | ||
| // TODO: Also check DSCP once quinn-udp supports it. | ||
| // assert_eq!(IpTosEcn::from(u8::from(tos_tx)), IpTosEcn::from(tos_rx)); | ||
| // assert_eq!(tos_tx, tos_rx.into()); | ||
| assert_ne!(ttl_tx, ttl_rx); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters