From 34c8d20ba260cf40112f80ad3c885cd9f6c60976 Mon Sep 17 00:00:00 2001 From: beffroi Date: Fri, 9 Dec 2022 10:37:35 +0100 Subject: [PATCH] Refactoring step 3 --- src/main.rs | 86 ++++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/src/main.rs b/src/main.rs index 88b68d8..0ac4492 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,49 +22,14 @@ fn main() { //env_logger::Builder::from_env(Env::default().default_filter_or("info")).init(); // Parse the command line arguments. - // let args: Vec = env::args().collect(); - let (dest_ip,ping_request,data,payload) = parse_all_arguments();//&mut dest_ip, &mut ping_request, &mut data, &mut payload); - - // SOURCE IP ADDRESS - // let localhost = Ipv4Addr::LOCALHOST; - let localhost = Ipv4Addr::UNSPECIFIED; - let socket_ip_address = SocketAddr::new(IpAddr::V4(localhost), 80); - let socket2_ip_address = socket_ip_address.into(); - - // let ping_request = ping_request.unwrap_or(0x0800); // Default ping request value - // let data = data.unwrap_or(0x0000); // Default data value - // let payload=temp_payload.unwrap_or(b""); - + let (socket_ip_address, socket2_ip_address) = create_address(); + let mut socket2_ipv4_socket=create_socket(socket_ip_address, socket2_ip_address); + let socket_arc = create_socket_arc(&mut socket2_ipv4_socket); // Create a UDP socket. - let socket2_ipv4_socket = socket2::Socket::new( - socket2::Domain::IPV4, - socket2::Type::DGRAM, - Some(socket2::Protocol::ICMPV4), - ).unwrap(); - - // BIND TO LOCAL ADDRESS - socket2_ipv4_socket - .bind(&socket2_ip_address) - .expect(&format!( - "Failed binding to Ipv4 address {:?}", - &socket_ip_address - )); - - - // CREATE STD SOCKET FROM SOCKET2 SOCKET - let raw_ipv4_socket = socket2_ipv4_socket.as_raw_fd(); - let std_ipv4_socket = unsafe { std::net::UdpSocket::from_raw_fd(raw_ipv4_socket) }; - std_ipv4_socket.set_read_timeout(Some(Duration::from_millis(100))).expect(&format!("Failed to set read timeout")); - let socket_arc = Arc::new(std_ipv4_socket); - - // Set the socket to be non-blocking. - // socket.set_nonblocking(true).unwrap(); - - // Set the Time-To-Live (TTL) value for the socket. - // socket.set_ttl(64).unwrap(); - + + // let socket_arc = ; // Create the ping request message. let mut buf = [0u8; 64]; let ping_request = [ @@ -188,6 +153,47 @@ fn parse_all_arguments() -> (Ipv4Addr,u16,u16,Vec){ (dest_ip,ping_request, data, payload) } +fn create_address() -> (SocketAddr, socket2::SockAddr){ + // SOURCE IP ADDRESS + let localhost = Ipv4Addr::UNSPECIFIED; + let socket_ip_address = SocketAddr::new(IpAddr::V4(localhost), 80); + let socket2_ip_address = socket_ip_address.into(); + (socket_ip_address, socket2_ip_address) +} + +fn create_socket(socket_ip_address:SocketAddr, socket2_ip_address:socket2::SockAddr) -> socket2::Socket { + let socket2_ipv4_socket = socket2::Socket::new( + socket2::Domain::IPV4, + socket2::Type::DGRAM, + Some(socket2::Protocol::ICMPV4), + ).unwrap(); + + // BIND TO LOCAL ADDRESS + socket2_ipv4_socket + .bind(&socket2_ip_address) + .expect(&format!( + "Failed binding to Ipv4 address {:?}", + &socket_ip_address + )); + + // Set the socket to be non-blocking. + // socket.set_nonblocking(true).unwrap(); + + // Set the Time-To-Live (TTL) value for the socket. + // socket.set_ttl(64).unwrap(); + + socket2_ipv4_socket +} + +fn create_socket_arc(socket2_ipv4_socket: &mut socket2::Socket) -> Arc { + // CREATE STD SOCKET FROM SOCKET2 SOCKET + let raw_ipv4_socket = socket2_ipv4_socket.as_raw_fd(); + let std_ipv4_socket = unsafe { std::net::UdpSocket::from_raw_fd(raw_ipv4_socket) }; + std_ipv4_socket.set_read_timeout(Some(Duration::from_millis(100))).expect(&format!("Failed to set read timeout")); + + Arc::new(std_ipv4_socket) +} + fn exit_with_help() { eprintln!("Usage: cargo run --dest [--request/-r ] [--data/-d ] [--payload/-p ]"); std::process::exit(1);