gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip-echo-server: Add helper to compute reply length

Browse Source
This commit is contained in:
Trent Nelson
2020-11-11 19:27:03 -07:00
committed by mergify[bot]
parent aab5f24518
commit 7481ba5618
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net-utils/src/ip_echo_server.rs
View File

@@ -1,4 +1,4 @@
use crate::HEADER_LENGTH; use crate::{ip_echo_server_reply_length, HEADER_LENGTH};
use bytes::Bytes; use bytes::Bytes;
use log::*; use log::*;
use serde_derive::{Deserialize, Serialize}; use serde_derive::{Deserialize, Serialize};
@@ -177,11 +177,7 @@ pub fn ip_echo_server(tcp: std::net::TcpListener) -> IpEchoServer {
} else { } else {
// "\0\0\0\0" header is added to ensure a valid response will never // "\0\0\0\0" header is added to ensure a valid response will never
// conflict with the first four bytes of a valid HTTP response. // conflict with the first four bytes of a valid HTTP response.
let mut bytes = vec![ let mut bytes = vec![0u8; ip_echo_server_reply_length()];
0;
HEADER_LENGTH + bincode::serialized_size(&peer_addr.ip()).unwrap()
as usize
];
bincode::serialize_into(&mut bytes[HEADER_LENGTH..], &peer_addr.ip()) bincode::serialize_into(&mut bytes[HEADER_LENGTH..], &peer_addr.ip())
.unwrap(); .unwrap();
Ok(Bytes::from(bytes)) Ok(Bytes::from(bytes))

4
net-utils/src/lib.rs
View File

@@ -23,6 +23,10 @@ pub struct UdpSocketPair {
pub type PortRange = (u16, u16); pub type PortRange = (u16, u16);
pub(crate) const HEADER_LENGTH: usize = 4; pub(crate) const HEADER_LENGTH: usize = 4;
pub(crate) fn ip_echo_server_reply_length() -> usize {
let largest_ip_addr = IpAddr::from([0u16; 8]); // IPv6 variant
HEADER_LENGTH + bincode::serialized_size(&largest_ip_addr).unwrap() as usize
}
fn ip_echo_server_request( fn ip_echo_server_request(
ip_echo_server_addr: &SocketAddr, ip_echo_server_addr: &SocketAddr,