mirror of
https://github.com/tribufu/rust-gamedig
synced 2026-05-18 09:35:50 +00:00
[Crate] Add formatting (#22)
* chore: add standard for formatting * chore: manually tidy up imports and format * chore: remove vscode and add to gitignore * chore: alphabetically order and fix * chore: format * chore: fix format issue with payload * chore: format as merge had unformatted code * [format] Fix comments, change max width and binop operator --------- Co-authored-by: CosminPerRam <cosmin.p@live.com>
This commit is contained in:
Cain
GitHub
parent
e023e13236
commit
1b13d39856
71 changed files with 3165 additions and 2593 deletions
333
src/socket.rs
333
src/socket.rs
|
|
@ -1,165 +1,168 @@
|
|||
use crate::protocols::types::TimeoutSettings;
|
||||
use crate::utils::address_and_port_as_string;
|
||||
use crate::GDError::{PacketReceive, PacketSend, SocketBind, SocketConnect};
|
||||
use crate::GDResult;
|
||||
use std::io::{Read, Write};
|
||||
use std::net;
|
||||
|
||||
const DEFAULT_PACKET_SIZE: usize = 1024;
|
||||
|
||||
pub trait Socket {
|
||||
fn new(address: &str, port: u16) -> GDResult<Self>
|
||||
where
|
||||
Self: Sized;
|
||||
|
||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()>;
|
||||
|
||||
fn send(&mut self, data: &[u8]) -> GDResult<()>;
|
||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>>;
|
||||
}
|
||||
|
||||
pub struct TcpSocket {
|
||||
socket: net::TcpStream,
|
||||
}
|
||||
|
||||
impl Socket for TcpSocket {
|
||||
fn new(address: &str, port: u16) -> GDResult<Self> {
|
||||
let complete_address = address_and_port_as_string(address, port);
|
||||
|
||||
Ok(Self {
|
||||
socket: net::TcpStream::connect(complete_address).map_err(|_| SocketConnect)?,
|
||||
})
|
||||
}
|
||||
|
||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()> {
|
||||
let settings = timeout_settings.unwrap_or_default();
|
||||
self.socket.set_read_timeout(settings.get_read()).unwrap(); //unwrapping because TimeoutSettings::new
|
||||
self.socket.set_write_timeout(settings.get_write()).unwrap(); //checks if these are 0 and throws an error
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send(&mut self, data: &[u8]) -> GDResult<()> {
|
||||
self.socket.write(data).map_err(|_| PacketSend)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
||||
let mut buf = Vec::with_capacity(size.unwrap_or(DEFAULT_PACKET_SIZE));
|
||||
self.socket
|
||||
.read_to_end(&mut buf)
|
||||
.map_err(|_| PacketReceive)?;
|
||||
|
||||
Ok(buf)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct UdpSocket {
|
||||
socket: net::UdpSocket,
|
||||
complete_address: String,
|
||||
}
|
||||
|
||||
impl Socket for UdpSocket {
|
||||
fn new(address: &str, port: u16) -> GDResult<Self> {
|
||||
let complete_address = address_and_port_as_string(address, port);
|
||||
let socket = net::UdpSocket::bind("0.0.0.0:0").map_err(|_| SocketBind)?;
|
||||
|
||||
Ok(Self {
|
||||
socket,
|
||||
complete_address,
|
||||
})
|
||||
}
|
||||
|
||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()> {
|
||||
let settings = timeout_settings.unwrap_or_default();
|
||||
self.socket.set_read_timeout(settings.get_read()).unwrap(); //unwrapping because TimeoutSettings::new
|
||||
self.socket.set_write_timeout(settings.get_write()).unwrap(); //checks if these are 0 and throws an error
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send(&mut self, data: &[u8]) -> GDResult<()> {
|
||||
self.socket
|
||||
.send_to(data, &self.complete_address)
|
||||
.map_err(|_| PacketSend)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
||||
let mut buf: Vec<u8> = vec![0; size.unwrap_or(DEFAULT_PACKET_SIZE)];
|
||||
let (number_of_bytes_received, _) =
|
||||
self.socket.recv_from(&mut buf).map_err(|_| PacketReceive)?;
|
||||
|
||||
Ok(buf[..number_of_bytes_received].to_vec())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::thread;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_tcp_socket_send_and_receive() {
|
||||
// Spawn a thread to run the server
|
||||
let listener = net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let bound_address = listener.local_addr().unwrap();
|
||||
let server_thread = thread::spawn(move || {
|
||||
let (mut stream, _) = listener.accept().unwrap();
|
||||
let mut buf = [0; 1024];
|
||||
stream.read(&mut buf).unwrap();
|
||||
stream.write(&buf).unwrap();
|
||||
});
|
||||
|
||||
// Create a TCP socket and send a message to the server
|
||||
let mut socket = TcpSocket::new(&*bound_address.ip().to_string(), bound_address.port()).unwrap();
|
||||
let message = b"hello, world!";
|
||||
socket.send(message).unwrap();
|
||||
|
||||
// Receive the response from the server
|
||||
let received_message: Vec<u8> = socket
|
||||
.receive(None)
|
||||
.unwrap()
|
||||
// Iterate over the buffer and remove 0s that are alone in the buffer
|
||||
// just added to pass default size
|
||||
.into_iter()
|
||||
.filter(|&x| x != 0)
|
||||
.collect();
|
||||
|
||||
server_thread.join().expect("server thread panicked");
|
||||
|
||||
assert_eq!(message, &received_message[..]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_udp_socket_send_and_receive() {
|
||||
// Spawn a thread to run the server
|
||||
let socket = net::UdpSocket::bind("127.0.0.1:0").unwrap();
|
||||
let bound_address = socket.local_addr().unwrap();
|
||||
let server_thread = thread::spawn(move || {
|
||||
let mut buf = [0; 1024];
|
||||
let (_, src_addr) = socket.recv_from(&mut buf).unwrap();
|
||||
socket.send_to(&buf, src_addr).unwrap();
|
||||
});
|
||||
|
||||
// Create a UDP socket and send a message to the server
|
||||
let mut socket = UdpSocket::new(&*bound_address.ip().to_string(), bound_address.port()).unwrap();
|
||||
let message = b"hello, world!";
|
||||
socket.send(message).unwrap();
|
||||
|
||||
// Receive the response from the server
|
||||
let received_message: Vec<u8> = socket
|
||||
.receive(None)
|
||||
.unwrap()
|
||||
// Iterate over the buffer and remove 0s that are alone in the buffer
|
||||
// just added to pass default size
|
||||
.into_iter()
|
||||
.filter(|&x| x != 0)
|
||||
.collect();
|
||||
|
||||
server_thread.join().expect("server thread panicked");
|
||||
|
||||
assert_eq!(message, &received_message[..]);
|
||||
}
|
||||
}
|
||||
use crate::{
|
||||
protocols::types::TimeoutSettings,
|
||||
utils::address_and_port_as_string,
|
||||
GDError::{PacketReceive, PacketSend, SocketBind, SocketConnect},
|
||||
GDResult,
|
||||
};
|
||||
|
||||
use std::{
|
||||
io::{Read, Write},
|
||||
net,
|
||||
};
|
||||
|
||||
const DEFAULT_PACKET_SIZE: usize = 1024;
|
||||
|
||||
pub trait Socket {
|
||||
fn new(address: &str, port: u16) -> GDResult<Self>
|
||||
where Self: Sized;
|
||||
|
||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()>;
|
||||
|
||||
fn send(&mut self, data: &[u8]) -> GDResult<()>;
|
||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>>;
|
||||
}
|
||||
|
||||
pub struct TcpSocket {
|
||||
socket: net::TcpStream,
|
||||
}
|
||||
|
||||
impl Socket for TcpSocket {
|
||||
fn new(address: &str, port: u16) -> GDResult<Self> {
|
||||
let complete_address = address_and_port_as_string(address, port);
|
||||
|
||||
Ok(Self {
|
||||
socket: net::TcpStream::connect(complete_address).map_err(|_| SocketConnect)?,
|
||||
})
|
||||
}
|
||||
|
||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()> {
|
||||
let settings = timeout_settings.unwrap_or_default();
|
||||
self.socket.set_read_timeout(settings.get_read()).unwrap(); // unwrapping because TimeoutSettings::new
|
||||
self.socket.set_write_timeout(settings.get_write()).unwrap(); // checks if these are 0 and throws an error
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send(&mut self, data: &[u8]) -> GDResult<()> {
|
||||
self.socket.write(data).map_err(|_| PacketSend)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
||||
let mut buf = Vec::with_capacity(size.unwrap_or(DEFAULT_PACKET_SIZE));
|
||||
self.socket
|
||||
.read_to_end(&mut buf)
|
||||
.map_err(|_| PacketReceive)?;
|
||||
|
||||
Ok(buf)
|
||||
}
|
||||
}
|
||||
|
||||
pub struct UdpSocket {
|
||||
socket: net::UdpSocket,
|
||||
complete_address: String,
|
||||
}
|
||||
|
||||
impl Socket for UdpSocket {
|
||||
fn new(address: &str, port: u16) -> GDResult<Self> {
|
||||
let complete_address = address_and_port_as_string(address, port);
|
||||
let socket = net::UdpSocket::bind("0.0.0.0:0").map_err(|_| SocketBind)?;
|
||||
|
||||
Ok(Self {
|
||||
socket,
|
||||
complete_address,
|
||||
})
|
||||
}
|
||||
|
||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()> {
|
||||
let settings = timeout_settings.unwrap_or_default();
|
||||
self.socket.set_read_timeout(settings.get_read()).unwrap(); // unwrapping because TimeoutSettings::new
|
||||
self.socket.set_write_timeout(settings.get_write()).unwrap(); // checks if these are 0 and throws an error
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn send(&mut self, data: &[u8]) -> GDResult<()> {
|
||||
self.socket
|
||||
.send_to(data, &self.complete_address)
|
||||
.map_err(|_| PacketSend)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
||||
let mut buf: Vec<u8> = vec![0; size.unwrap_or(DEFAULT_PACKET_SIZE)];
|
||||
let (number_of_bytes_received, _) = self.socket.recv_from(&mut buf).map_err(|_| PacketReceive)?;
|
||||
|
||||
Ok(buf[.. number_of_bytes_received].to_vec())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::thread;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_tcp_socket_send_and_receive() {
|
||||
// Spawn a thread to run the server
|
||||
let listener = net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let bound_address = listener.local_addr().unwrap();
|
||||
let server_thread = thread::spawn(move || {
|
||||
let (mut stream, _) = listener.accept().unwrap();
|
||||
let mut buf = [0; 1024];
|
||||
stream.read(&mut buf).unwrap();
|
||||
stream.write(&buf).unwrap();
|
||||
});
|
||||
|
||||
// Create a TCP socket and send a message to the server
|
||||
let mut socket = TcpSocket::new(&*bound_address.ip().to_string(), bound_address.port()).unwrap();
|
||||
let message = b"hello, world!";
|
||||
socket.send(message).unwrap();
|
||||
|
||||
// Receive the response from the server
|
||||
let received_message: Vec<u8> = socket
|
||||
.receive(None)
|
||||
.unwrap()
|
||||
// Iterate over the buffer and remove 0s that are alone in the buffer
|
||||
// just added to pass default size
|
||||
.into_iter()
|
||||
.filter(|&x| x != 0)
|
||||
.collect();
|
||||
|
||||
server_thread.join().expect("server thread panicked");
|
||||
|
||||
assert_eq!(message, &received_message[..]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_udp_socket_send_and_receive() {
|
||||
// Spawn a thread to run the server
|
||||
let socket = net::UdpSocket::bind("127.0.0.1:0").unwrap();
|
||||
let bound_address = socket.local_addr().unwrap();
|
||||
let server_thread = thread::spawn(move || {
|
||||
let mut buf = [0; 1024];
|
||||
let (_, src_addr) = socket.recv_from(&mut buf).unwrap();
|
||||
socket.send_to(&buf, src_addr).unwrap();
|
||||
});
|
||||
|
||||
// Create a UDP socket and send a message to the server
|
||||
let mut socket = UdpSocket::new(&*bound_address.ip().to_string(), bound_address.port()).unwrap();
|
||||
let message = b"hello, world!";
|
||||
socket.send(message).unwrap();
|
||||
|
||||
// Receive the response from the server
|
||||
let received_message: Vec<u8> = socket
|
||||
.receive(None)
|
||||
.unwrap()
|
||||
// Iterate over the buffer and remove 0s that are alone in the buffer
|
||||
// just added to pass default size
|
||||
.into_iter()
|
||||
.filter(|&x| x != 0)
|
||||
.collect();
|
||||
|
||||
server_thread.join().expect("server thread panicked");
|
||||
|
||||
assert_eq!(message, &received_message[..]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue