Skip to content

refactor: simplify packet sending loop using core::slice::chunks #2294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
birneee wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −12
Open

refactor: simplify packet sending loop using core::slice::chunks #2294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions apps/src/sendto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

use std::cmp;

use std::io;

/// For Linux, try to detect GSO is available.
Expand Down Expand Up @@ -94,10 +92,21 @@ fn send_to_gso_pacing(
///
/// When GSO and SO_TXTIME are enabled, send packets using send_to_gso().
/// Otherwise, send packets using socket.send_to().
///
/// # Errors
///
/// Returns [`io::ErrorKind::InvalidInput`] if `segment_size` is 0.
pub fn send_to(
socket: &mio::net::UdpSocket, buf: &[u8], send_info: &quiche::SendInfo,
segment_size: usize, pacing: bool, enable_gso: bool,
) -> io::Result<usize> {
if segment_size == 0 {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
"segment_size must be greater than 0",
));
}

if pacing && enable_gso {
match send_to_gso_pacing(socket, buf, send_info, segment_size) {
Ok(v) => {
Expand All @@ -109,22 +118,14 @@ pub fn send_to(
}
}

let mut off = 0;
let mut left = buf.len();
let mut written = 0;

while left > 0 {
let pkt_len = cmp::min(left, segment_size);

match socket.send_to(&buf[off..off + pkt_len], send_info.to) {
for chunk in buf.chunks(segment_size) {
Copy link
Contributor

@LPardue LPardue Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to rustdocs, Segment_size 0 will panic. We should probably have an earlier check for that. The lack of check in the old code would be a problem too but would manifest differently

match socket.send_to(chunk, send_info.to) {
Ok(v) => {
written += v;
},
Err(e) => return Err(e),
}

off += pkt_len;
left -= pkt_len;
}

Ok(written)
Expand Down