mykola/rs-tftpd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix windowsize parsing

Browse source
This commit is contained in:
altugbakan 2023-04-09 13:23:31 +03:00
parent 0a5e7af5ac
commit 6cad01fafd
5 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -4,4 +4,4 @@ version = 3
[[package]] [[package]]
name = "tftpd" name = "tftpd"
version = "0.2.0" version = "0.2.1"

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "tftpd" name = "tftpd"
version = "0.2.0" version = "0.2.1"
authors = ["Altuğ Bakan <mail@alt.ug>"] authors = ["Altuğ Bakan <mail@alt.ug>"]
edition = "2021" edition = "2021"
description = "Multithreaded TFTP server daemon" description = "Multithreaded TFTP server daemon"

2
src/config.rs
View file

@ -37,7 +37,7 @@ impl Config {
let mut config = Config { let mut config = Config {
ip_address: Ipv4Addr::new(127, 0, 0, 1), ip_address: Ipv4Addr::new(127, 0, 0, 1),
port: 69, port: 69,
directory: env::current_dir().unwrap_or(env::temp_dir()), directory: env::current_dir().unwrap_or_else(|_| env::temp_dir()),
}; };
args.next(); args.next();

16
src/packet.rs
View file

@ -213,6 +213,7 @@ impl FromStr for OptionType {
"blksize" => Ok(OptionType::BlockSize), "blksize" => Ok(OptionType::BlockSize),
"tsize" => Ok(OptionType::TransferSize), "tsize" => Ok(OptionType::TransferSize),
"timeout" => Ok(OptionType::Timeout), "timeout" => Ok(OptionType::Timeout),
"windowsize" => Ok(OptionType::Windowsize),
_ => Err("Invalid option type"), _ => Err("Invalid option type"),
} }
} }
@ -304,7 +305,7 @@ fn parse_rq(buf: &[u8], opcode: Opcode) -> Result<Packet, Box<dyn Error>> {
(option, zero_index) = Convert::to_string(buf, zero_index + 1)?; (option, zero_index) = Convert::to_string(buf, zero_index + 1)?;
(value, zero_index) = Convert::to_string(buf, zero_index + 1)?; (value, zero_index) = Convert::to_string(buf, zero_index + 1)?;
if let Ok(option) = OptionType::from_str(option.as_str()) { if let Ok(option) = OptionType::from_str(option.to_lowercase().as_str()) {
options.push(TransferOption { options.push(TransferOption {
option, option,
value: value.parse()?, value: value.parse()?,
@ -428,6 +429,10 @@ mod tests {
&[0x00], &[0x00],
("5".as_bytes()), ("5".as_bytes()),
&[0x00], &[0x00],
(OptionType::Windowsize.as_str().as_bytes()),
&[0x00],
("4".as_bytes()),
&[0x00],
] ]
.concat(); .concat();
@ -439,7 +444,7 @@ mod tests {
{ {
assert_eq!(filename, "test.png"); assert_eq!(filename, "test.png");
assert_eq!(mode, "octet"); assert_eq!(mode, "octet");
assert_eq!(options.len(), 2); assert_eq!(options.len(), 3);
assert_eq!( assert_eq!(
options[0], options[0],
TransferOption { TransferOption {
@ -454,6 +459,13 @@ mod tests {
value: 5 value: 5
} }
); );
assert_eq!(
options[2],
TransferOption {
option: OptionType::Windowsize,
value: 4
}
);
} else { } else {
panic!("cannot parse read request with options") panic!("cannot parse read request with options")
} }

4
src/worker.rs
View file

@ -47,6 +47,7 @@ enum WorkType {
const MAX_RETRIES: u32 = 6; const MAX_RETRIES: u32 = 6;
const DEFAULT_TIMEOUT_SECS: u64 = 5; const DEFAULT_TIMEOUT_SECS: u64 = 5;
const TIMEOUT_BUFFER_SECS: u64 = 1;
const DEFAULT_BLOCK_SIZE: usize = 512; const DEFAULT_BLOCK_SIZE: usize = 512;
impl Worker { impl Worker {
@ -139,7 +140,8 @@ fn send_file(
let filled = window.fill()?; let filled = window.fill()?;
let mut retry_cnt = 0; let mut retry_cnt = 0;
let mut time = SystemTime::now() - Duration::from_secs(DEFAULT_TIMEOUT_SECS); let mut time =
SystemTime::now() - Duration::from_secs(DEFAULT_TIMEOUT_SECS + TIMEOUT_BUFFER_SECS);
loop { loop {
if time.elapsed()? >= Duration::from_secs(DEFAULT_TIMEOUT_SECS) { if time.elapsed()? >= Duration::from_secs(DEFAULT_TIMEOUT_SECS) {
send_window(socket, &window, block_number)?; send_window(socket, &window, block_number)?;