Latency Module

.github/workflows/rust.yml

@@ -0,0 +1,32 @@
+on: [push, pull_request]
+
+name: Continuous integration
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test

.gitignore

@@ -1,2 +1,4 @@
 target
 src/ips.txt
+.idea/
+shell.nix

Cargo.toml

@@ -2,9 +2,11 @@
 name = "pinger"
 version = "0.1.0"
 authors = ["Wouter de Vries <wouter@wouter-web.nl>"]
+edition = "2018"
 
 [dependencies]
-libc = "0.2.11"
-argparse = "0.2.1"
+libc = "0.2.84"
+argparse = "0.2.2"
 time = "0.1.35"
-byteorder = "0.5.3"
+byteorder = "1.4.2"
+anyhow = "1.0"

src/main.rs

@@ -22,11 +22,9 @@
 
 mod net;
 mod tbf;
-extern crate libc;
-extern crate argparse;
-extern crate time;
 use std::io::{self, BufRead};
 use argparse::{ArgumentParser, Store};
+use std::time::{SystemTime, UNIX_EPOCH};
 
 fn main() {
     // Read arguments from commandline
@@ -56,21 +54,25 @@ fn main() {
 
     // Setup socket & (optionally) bind address
     let sockv4 = net::new_icmpv4_socket().expect("Could not create socket (v4)");
+    let sockv6 = net::new_icmpv6_socket().expect("Could not create socket (v6)");
+
     if !saddr.is_empty() {
-        net::bind_to_ip(sockv4, &saddr).expect("Could not bind socket to source address");
+        let addr = net::string_to_sockaddr(&saddr);
+        if let Some(addr) = addr {
+            if let net::SockAddr::V4(_addr) = addr {
+                net::bind_to_ip(sockv4, &saddr).expect("Could not bind socket to source address");
+            } else if let net::SockAddr::V6(_addr) = addr {
+                net::bind_to_ip(sockv6, &saddr).expect("Could not bind socket to source address");
+            }
+        }
     }
 
-    let sockv6 = net::new_icmpv6_socket().expect("Could not create socket (v6)");
-
 
     // Read from STDIN
     let mut buffer = String::new();
     let stdin = io::stdin();
     let mut handle = stdin.lock();
 
-    // Create new ICMP-header (IPv4 and IPv6)
-    let icmp4header = net::ICMP4Header::echo_request(identifier, sequence_number).to_byte_array();
-    let icmp6header = net::ICMP6Header::echo_request(identifier, sequence_number).to_byte_array();
 
     // Initialize TokenBucketFilter for rate-limiting
     let mut tbf = tbf::TokenBucketFilter::new(rate);
@@ -79,6 +81,21 @@ fn main() {
     while handle.read_line(&mut buffer).unwrap() > 0 {
         // Ratelimit
         tbf.take();
+
+        // Finding timestamp
+        let now = SystemTime::now();
+        let since_the_epoch = now.duration_since(UNIX_EPOCH).expect("Time went backwards");
+        //let addr = string_to_sockaddr(buffer.trim());
+        //if let Some(addr) = addr {
+        //    println!("Could send packet");
+        //} else {
+        //    println!("Could not send packet");
+	//} 
+
+	//Err(anyhow!(format!("Invalid IP-Address: {}", buffer.trim()).to_string()))
+
+        let icmp4header = net::ICMP4Header::echo_request(identifier, sequence_number, since_the_epoch.as_secs(), since_the_epoch.subsec_nanos(), buffer.trim()).to_byte_array();
+        let icmp6header = net::ICMP6Header::echo_request(identifier, sequence_number, since_the_epoch.as_secs(), since_the_epoch.subsec_nanos()).to_byte_array();
 
         // Send packet
         let result = net::send_packet(sockv4, sockv6, buffer.trim(), &icmp4header, &icmp6header);