rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests 1 Projects Releases 22 Wiki Activity

TCP Server #77

Merged
muellerr merged 52 commits from tcp-server into main 2023-09-21 18:11:38 +02:00
Conversation 0 Commits 52 Files Changed 19 +17 -4
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 706dde51c4 - Show all commits

4
satrs-core/src/hal/std/tcp_server.rs
View File

@ -55,4 +55,8 @@ impl<TcError, TmError> TcpTmtcServerBase<TcError, TmError> {
tc_buffer: vec![0; tc_buffer_size], tc_buffer: vec![0; tc_buffer_size],
}) })
} }
pub (crate) fn local_addr(&self) -> std::io::Result<SocketAddr> {
self.listener.local_addr()
}
} }

17
satrs-core/src/hal/std/tcp_with_cobs_server.rs
View File

@ -3,6 +3,7 @@ use alloc::vec;
use cobs::decode_in_place; use cobs::decode_in_place;
use cobs::encode; use cobs::encode;
use cobs::max_encoding_length; use cobs::max_encoding_length;
use std::net::SocketAddr;
use std::io::Read; use std::io::Read;
use std::io::Write; use std::io::Write;
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
@ -76,6 +77,12 @@ impl<TcError: 'static, TmError: 'static> TcpTmtcInCobsServer<TcError, TmError> {
}) })
} }
/// Can be used to retrieve the local assigned address of the TCP server. This is especially
/// useful if using the port number 0 for OS auto-assignment.
pub fn local_addr(&self) -> std::io::Result<SocketAddr> {
self.base.local_addr()
}
/// This call is used to handle the next connection to a client. Right now, it performs /// This call is used to handle the next connection to a client. Right now, it performs
/// the following steps: /// the following steps:
/// ///
@ -466,11 +473,12 @@ mod tests {
#[test] #[test]
fn test_server_basic_no_tm() { fn test_server_basic_no_tm() {
let dest_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 0); let auto_port_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 0);
let tc_receiver = SyncTcCacher::default(); let tc_receiver = SyncTcCacher::default();
let tm_source = SyncTmSource::default(); let tm_source = SyncTmSource::default();
let mut tcp_server = let mut tcp_server =
generic_tmtc_server(&dest_addr, tc_receiver.clone(), tm_source.clone()); generic_tmtc_server(&auto_port_addr, tc_receiver.clone(), tm_source.clone());
let dest_addr = tcp_server.local_addr().expect("retrieving dest addr failed");
let conn_handled: Arc<AtomicBool> = Default::default(); let conn_handled: Arc<AtomicBool> = Default::default();
let set_if_done = conn_handled.clone(); let set_if_done = conn_handled.clone();
// Call the connection handler in separate thread, does block. // Call the connection handler in separate thread, does block.
@ -517,12 +525,13 @@ mod tests {
#[test] #[test]
fn test_server_basic_with_tm() { fn test_server_basic_with_tm() {
let dest_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 0); let auto_port_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 0);
let tc_receiver = SyncTcCacher::default(); let tc_receiver = SyncTcCacher::default();
let mut tm_source = SyncTmSource::default(); let mut tm_source = SyncTmSource::default();
tm_source.add_tm(&INVERTED_PACKET); tm_source.add_tm(&INVERTED_PACKET);
let mut tcp_server = let mut tcp_server =
generic_tmtc_server(&dest_addr, tc_receiver.clone(), tm_source.clone()); generic_tmtc_server(&auto_port_addr, tc_receiver.clone(), tm_source.clone());
let dest_addr = tcp_server.local_addr().expect("retrieving dest addr failed");
let conn_handled: Arc<AtomicBool> = Default::default(); let conn_handled: Arc<AtomicBool> = Default::default();
let set_if_done = conn_handled.clone(); let set_if_done = conn_handled.clone();
// Call the connection handler in separate thread, does block. // Call the connection handler in separate thread, does block.