Skip to content

Commit

Permalink
cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
TudbuT committed Jan 31, 2023
1 parent 1792c2b commit f6967c0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ pub fn client(ip: &str, port: u16, dest_ip: &str, dest_port: u16, key: &str, sle
tcp.set_nonblocking(false);
match pt {
PacketType::NewClient => {
let mut tcp = SocketAdapter::new(TcpStream::connect((dest_ip, dest_port)).unwrap(), false);
let mut tcp =
SocketAdapter::new(TcpStream::connect((dest_ip, dest_port)).unwrap(), false);
tcp.set_nonblocking(true);
sockets.push(tcp);
}
Expand Down
16 changes: 14 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,23 @@ fn main() {
&args[3],
args[4].parse().unwrap(),
&args[5],
if args.len() == 7 { args[6].parse().unwrap() } else { 1 }
if args.len() == 7 {
args[6].parse().unwrap()
} else {
1
},
);
}
if (3..=4).contains(&args.len()) && args[0] == "server" {
server(args[1].parse().unwrap(), &args[2], if args.len() == 4 { args[3].parse().unwrap() } else { 1 });
server(
args[1].parse().unwrap(),
&args[2],
if args.len() == 4 {
args[3].parse().unwrap()
} else {
1
},
);
}
eprintln!("Usage: \n\
\x20 revpfw3 server <port> <key> [<poll delay>]\n\
Expand Down
4 changes: 1 addition & 3 deletions src/socket_adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,7 @@ impl SocketAdapter {
}
Ok(())
}
Err(x) if x.kind() == ErrorKind::WouldBlock => {
Ok(())
}
Err(x) if x.kind() == ErrorKind::WouldBlock => Ok(()),
Err(x) => {
self.broken = Some(Broken::OsErr(x.raw_os_error().unwrap()));
Err(x)
Expand Down

0 comments on commit f6967c0

Please sign in to comment.