Added arbitrary size, a lot of cleanup to do

This commit is contained in:
beffroi 2022-12-09 16:03:19 +01:00
parent 199de6f3d4
commit ce160de7da
1 changed files with 36 additions and 41 deletions

View File

@ -1,10 +1,10 @@
//use dns_lookup::lookup_host;
use core::time::Duration;
// use rand::{
// Rng,
// thread_rng,
// distributions::Alphanumeric,
// };
use rand::{
Rng,
thread_rng,
distributions::Alphanumeric,
};
use std::time::Instant;
use std::{
@ -23,19 +23,20 @@ fn main() {
//env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
// Parse the command line arguments.
let (dest_addr,ping_request,data,payload) = parse_all_arguments();
let (dest_addr,ping_request,data,payload, payload_size) = parse_all_arguments();
let (socket_ip_address, socket2_ip_address, dest_addr) = create_addresses(dest_addr);
let mut socket2_ipv4_socket=create_sockets(socket_ip_address, socket2_ip_address);
let socket_arc = create_socket_arc(&mut socket2_ipv4_socket);
let (buffer, checksum) = create_buffer(ping_request,data,payload);
let (buffer, checksum) = create_buffer(ping_request,data,payload, payload_size);
// Send the ping request to the specified destination IP address.
print_send_pre_message(checksum, buffer);
print_send_pre_message(checksum, &buffer);
// Starting the timer
let now = Instant::now();
// let buffer2 = vec![0; 64];
let result = socket_arc.send_to(&buffer, dest_addr);
match result {
Ok(bytes) => print_send_post_messages(bytes, dest_addr),
@ -43,7 +44,7 @@ fn main() {
}
// Wait for a response from the destination.
let mut buf = [0; 64];
let mut buf = vec![0; payload_size]; // Make that buffer arbitrary large
let timeout = std::time::Duration::from_secs(1);
@ -59,16 +60,17 @@ fn main() {
};
let elapsed = now.elapsed();
print_recv_post_message(buf, bytes_recv, elapsed);
print_recv_post_message(&buf, bytes_recv, elapsed);
}
fn parse_all_arguments() -> (String,u16,u16,Vec<u8>){
fn parse_all_arguments() -> (String,u16,u16,Vec<u8>, usize){
// Load all inline arguments and change them in place
let args: Vec<String> = env::args().collect();
let mut ping_request : u16 = 0x0800;
let mut data : u16 = 0x0000;
let mut payload = Vec::<u8>::new();
let mut payload_size : usize = 64;
if args.len() == 1 {
exit_with_help();
@ -84,9 +86,11 @@ fn parse_all_arguments() -> (String,u16,u16,Vec<u8>){
data = args[i + 2].parse::<u16>().unwrap();
} else if arg == "--payload" || arg == "-p" {
payload = args[i + 2].as_bytes().to_vec();
} else if arg == "--size" || arg == "-s" {
payload_size = args[i + 2].parse::<usize>().unwrap();
}
}
(dest_addr,ping_request, data, payload)
(dest_addr,ping_request, data, payload, payload_size)
}
fn create_addresses(dest_ip: String) -> (SocketAddr, socket2::SockAddr, SocketAddr){
@ -138,9 +142,9 @@ fn exit_with_help() {
std::process::exit(1);
}
fn create_buffer(ping_request: u16, data: u16, mut payload: Vec<u8>) -> ([u8; 64],u16){
fn create_buffer(ping_request: u16, data: u16, mut payload: Vec<u8>, payload_size : usize) -> (Vec<u8>,u16){
// Create the ping request message.
let mut buf = [0u8; 64];
let mut buf = vec![0u8; payload_size];
let ping_request = [
(ping_request >> 8) as u8, (ping_request & 0xff) as u8, // Type and Code fields
0x00, 0x00, // Checksum (filled in later)
@ -160,21 +164,26 @@ fn create_buffer(ping_request: u16, data: u16, mut payload: Vec<u8>) -> ([u8; 64
buf[ping_request.len() + data.len()..(ping_request.len() + data.len()+payload.len())].copy_from_slice(&payload);
// Calculate the checksum of the ping request message.
let checksum = {
let mut sum = 0;
for i in 0..(ping_request.len() / 2) {
sum += (ping_request[2 * i] as u16) << 8 | ping_request[2 * i + 1] as u16;
}
!(sum as u16)
};
let checksum = calculate_checksum(&buf);
buf[2] = (checksum >> 8) as u8;
buf[3] = (checksum & 0xff) as u8;
(buf, checksum)
}
fn calculate_checksum(buf : &Vec<u8>) -> u16 {
let checksum = {
let mut sum = 0;
for i in 0..(buf.len() / 2) {
sum += (buf[2 * i+1 ] as usize) << 8 | buf[2 * i] as usize;
}
if buf.len()%2==1 { sum += buf[buf.len()-1] as usize; }
while sum>>16!=0 { sum = (sum & 0xffff) + (sum >> 16) }
!(sum as u16)
};
checksum
}
fn print_send_pre_message(checksum:u16, buffer:[u8;64]){
fn print_send_pre_message(checksum:u16, buffer:&Vec<u8>){
println!("[SENDING ICMP DATA]\n");
println!("CHECKSUM: {:02x} {:02x}", (checksum&0xff00)>>8, (checksum)&0xff);
println!("{}",rhexdump::hexdump(&buffer));
@ -184,7 +193,7 @@ fn print_send_post_messages(bytes:usize, dest_addr:std::net::SocketAddr){
println!(" > {} bytes sent to {}", bytes, dest_addr);
}
fn print_recv_post_message(buf: [u8;64], bytes_recv:usize, elapsed:Duration){
fn print_recv_post_message(buf: &Vec<u8>, bytes_recv:usize, elapsed:Duration){
// Parse the response from the destination.
let icmp_type = buf[0];
let icmp_code = buf[1];
@ -205,22 +214,8 @@ fn print_recv_post_message(buf: [u8;64], bytes_recv:usize, elapsed:Duration){
fn generate_payload(payload: &mut Vec<u8>/*,size:usize*/){
// Generate a payload of size lenght
for i in [..32].iter(){
// payload.
let mut rng = thread_rng();
for _ in 0..54{
payload.push(rng.sample(Alphanumeric) as u8);
}
}
// match temp_payload {
// None => {
// let mut rng = thread_rng();
// payload=(0..64)
// .map(|_| rng.sample(Alphanumeric) as char)
// .collect::<String>()
// .as_bytes()
// // .unwrap_or("Couldn't generate 64 bits of entropy")
// //b""
// }
// Some(p) => {
// payload=*p
// }, // Default payload value
// };