mirror of
https://github.com/tribufu/rust-gamedig
synced 2026-06-01 09:42:41 +00:00
[Tests] udp and tcp socket test (#17)
* impl(test): udp and tcp socket test * fix(test): try and fix possable thread hang * fix(test): move socket to thread * [test/socket] Move listener outside of thread scope to make sure it is binded * [test/socket] Let the OS to bind to an available port --------- Co-authored-by: CosminPerRam <cosmin.p@live.com>
This commit is contained in:
parent
927d56b1ee
commit
568c53f129
1 changed files with 91 additions and 14 deletions
101
src/socket.rs
101
src/socket.rs
|
|
@ -1,14 +1,16 @@
|
||||||
use std::io::{Read, Write};
|
|
||||||
use std::net;
|
|
||||||
use crate::GDResult;
|
|
||||||
use crate::GDError::{PacketReceive, PacketSend, SocketBind, SocketConnect};
|
|
||||||
use crate::protocols::types::TimeoutSettings;
|
use crate::protocols::types::TimeoutSettings;
|
||||||
use crate::utils::address_and_port_as_string;
|
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;
|
const DEFAULT_PACKET_SIZE: usize = 1024;
|
||||||
|
|
||||||
pub trait Socket {
|
pub trait Socket {
|
||||||
fn new(address: &str, port: u16) -> GDResult<Self> where Self: Sized;
|
fn new(address: &str, port: u16) -> GDResult<Self>
|
||||||
|
where
|
||||||
|
Self: Sized;
|
||||||
|
|
||||||
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()>;
|
fn apply_timeout(&self, timeout_settings: Option<TimeoutSettings>) -> GDResult<()>;
|
||||||
|
|
||||||
|
|
@ -17,7 +19,7 @@ pub trait Socket {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TcpSocket {
|
pub struct TcpSocket {
|
||||||
socket: net::TcpStream
|
socket: net::TcpStream,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Socket for TcpSocket {
|
impl Socket for TcpSocket {
|
||||||
|
|
@ -25,7 +27,7 @@ impl Socket for TcpSocket {
|
||||||
let complete_address = address_and_port_as_string(address, port);
|
let complete_address = address_and_port_as_string(address, port);
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
socket: net::TcpStream::connect(complete_address).map_err(|_| SocketConnect)?
|
socket: net::TcpStream::connect(complete_address).map_err(|_| SocketConnect)?,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -44,7 +46,9 @@ impl Socket for TcpSocket {
|
||||||
|
|
||||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
||||||
let mut buf = Vec::with_capacity(size.unwrap_or(DEFAULT_PACKET_SIZE));
|
let mut buf = Vec::with_capacity(size.unwrap_or(DEFAULT_PACKET_SIZE));
|
||||||
self.socket.read_to_end(&mut buf).map_err(|_| PacketReceive)?;
|
self.socket
|
||||||
|
.read_to_end(&mut buf)
|
||||||
|
.map_err(|_| PacketReceive)?;
|
||||||
|
|
||||||
Ok(buf)
|
Ok(buf)
|
||||||
}
|
}
|
||||||
|
|
@ -52,7 +56,7 @@ impl Socket for TcpSocket {
|
||||||
|
|
||||||
pub struct UdpSocket {
|
pub struct UdpSocket {
|
||||||
socket: net::UdpSocket,
|
socket: net::UdpSocket,
|
||||||
complete_address: String
|
complete_address: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Socket for UdpSocket {
|
impl Socket for UdpSocket {
|
||||||
|
|
@ -62,7 +66,7 @@ impl Socket for UdpSocket {
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
socket,
|
socket,
|
||||||
complete_address
|
complete_address,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -75,14 +79,87 @@ impl Socket for UdpSocket {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn send(&mut self, data: &[u8]) -> GDResult<()> {
|
fn send(&mut self, data: &[u8]) -> GDResult<()> {
|
||||||
self.socket.send_to(data, &self.complete_address).map_err(|_| PacketSend)?;
|
self.socket
|
||||||
|
.send_to(data, &self.complete_address)
|
||||||
|
.map_err(|_| PacketSend)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
fn receive(&mut self, size: Option<usize>) -> GDResult<Vec<u8>> {
|
||||||
let mut buf: Vec<u8> = vec![0; size.unwrap_or(DEFAULT_PACKET_SIZE)];
|
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)?;
|
let (number_of_bytes_received, _) =
|
||||||
|
self.socket.recv_from(&mut buf).map_err(|_| PacketReceive)?;
|
||||||
|
|
||||||
Ok(buf[..number_of_bytes_received].to_vec())
|
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