Update dependency versions (#26)

* upgrade dependencies

* fix new clippy warnings

* update CI toolchain 1.63.0 -> 1.69.0

* bump prettytable version: phsym/prettytable-rs#146

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Install Rust stable
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.63.0
+        toolchain: 1.69.0
         override: true
         components: rustfmt, clippy
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/rustdoc.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Install Rust stable
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.63.0
+        toolchain: 1.69.0
         override: true
         components: rustfmt, clippy
     - name: Set up Python ${{ matrix.python-version }}  

core/Cargo.toml

@@ -6,46 +6,46 @@ edition = "2021"
 
 [build-dependencies]
 bindgen = "0.60.1" 
-cc = "1.0.66"
+cc = "1.0.79"
 
 [dependencies]
-anyhow = "1.0.40"
-base64 = "0.13.0"
-bimap = "0.6.2"
-byteorder = "1.4.2"
+anyhow = "1.0.70"
+base64 = "0.13.1"
+bimap = "0.6.3"
+byteorder = "1.4.3"
 chrono = "0.4"
 colored = "2"
 cpu-time = "1.0.0"
-crossbeam-channel = "0.5.1"
-csv = "1.1.6"
-ctrlc = { version = "3.1.7", features = ["termination"] }
+crossbeam-channel = "0.5.8"
+csv = "1.2.1"
+ctrlc = { version = "3.2.5", features = ["termination"] }
 dns-parser = { git = "https://github.com/thegwan/dns-parser.git" }
 hashlink = "0.7.0"
-hdrhistogram = "7.3.0"
+hdrhistogram = "7.5.2"
 hex = { version = "0.4.3", features = ["serde"] }
-httparse = "1.3"
-indexmap = "1.6.2"
-ipnet = "2.3.0"
-itertools = "0.10.0"
+httparse = "1.8"
+indexmap = "1.9.3"
+ipnet = "2.7.2"
+itertools = "0.10.5"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
 maplit = "1.0.2"
 md5 = "0.7.0"
-nom = "6.0"
+nom = "7.1.3"
 pcap = "0.8.1"
-pest = "2.1.3"
-pest_derive = "2.0"
+pest = "2.5.7"
+pest_derive = "2.5"
 petgraph = "0.5.1"
-pnet = "0.27.2"
-prettytable-rs = "0.8.0"
+pnet = "0.33.0"
+prettytable-rs = "0.10.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.59"
+serde_json = "1.0.96"
 strum = "0.20"
 strum_macros = "0.20"
 thiserror = "1.0"
 tls-parser = { git = "https://github.com/thegwan/tls-parser.git" }
-toml = "0.5.8"
-x509-parser = "0.13.0"
+toml = "0.5.11"
+x509-parser = "0.13.2"
 
 [features]
 timing = []

core/build.rs

@@ -20,7 +20,7 @@ fn main() {
     let pkg_config_path = dpdk_path.join("lib/x86_64-linux-gnu/pkgconfig");
     let cflags_bytes = Command::new("pkg-config")
         .env("PKG_CONFIG_PATH", &pkg_config_path)
-        .args(&["--cflags", "libdpdk"])
+        .args(["--cflags", "libdpdk"])
         .output()
         .unwrap_or_else(|e| panic!("Failed pkg-config cflags: {:?}", e))
         .stdout;
@@ -37,7 +37,7 @@ fn main() {
 
     let ldflags_bytes = Command::new("pkg-config")
         .env("PKG_CONFIG_PATH", &pkg_config_path)
-        .args(&["--libs", "libdpdk"])
+        .args(["--libs", "libdpdk"])
         .output()
         .unwrap_or_else(|e| panic!("Failed pkg-config ldflags: {:?}", e))
         .stdout;

core/src/conntrack/timerwheel.rs

@@ -118,7 +118,7 @@ impl TimerWheel {
                         conn.terminate(subscription);
                         occupied.remove();
                     } else {
-                        let timer_index = (expire_time / period) as usize % nb_buckets;
+                        let timer_index = (expire_time / period) % nb_buckets;
                         not_expired.push((timer_index, conn_id));
                     }
                 }

core/src/filter/ast.rs

@@ -25,7 +25,7 @@ lazy_static! {
         let ssh      = g.add_node(protocol!("ssh"));
         let dns      = g.add_node(protocol!("dns"));
         // define valid outer layers for each protocol header
-        g.extend_with_edges(&[
+        g.extend_with_edges([
             (ipv4, ethernet),
             (ipv6, ethernet),
             (tcp, ipv4), (tcp, ipv6),

core/src/lcore/mod.rs

@@ -14,7 +14,7 @@ pub(crate) struct SocketId(pub(crate) u32);
 impl SocketId {
     // For DPDK functions
     pub(crate) fn raw(&self) -> u32 {
-        self.0 as u32
+        self.0
     }
 }
 
@@ -31,12 +31,12 @@ pub struct CoreId(pub u32);
 
 impl CoreId {
     pub(crate) fn socket_id(&self) -> SocketId {
-        unsafe { SocketId(dpdk::rte_lcore_to_socket_id(self.0) as u32) }
+        unsafe { SocketId(dpdk::rte_lcore_to_socket_id(self.0)) }
     }
 
     /// For DPDK functions
     pub fn raw(&self) -> u32 {
-        self.0 as u32
+        self.0
     }
 }
 

core/src/port/mod.rs

@@ -51,7 +51,7 @@ impl PortId {
 
     /// For DPDK functions
     pub(crate) fn raw(&self) -> u16 {
-        self.0 as u16
+        self.0
     }
 }
 
@@ -418,7 +418,7 @@ pub(crate) struct RxQueueId(pub(crate) u16);
 impl RxQueueId {
     /// For DPDK functions
     pub(crate) fn raw(&self) -> u16 {
-        self.0 as u16
+        self.0
     }
 }
 

core/src/protocols/stream/tls/parser.rs

@@ -412,9 +412,9 @@ impl Tls {
     }
 
     /// Parse a TLS record.
-    pub(crate) fn parse_record_level<'b>(
+    pub(crate) fn parse_record_level(
         &mut self,
-        record: &TlsRawRecord<'b>,
+        record: &TlsRawRecord<'_>,
         direction: bool,
     ) -> ParseResult {
         let mut v: Vec<u8>;

examples/basic/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 jsonl = "4.0.1"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
-serde_json = "1.0.59"
+serde_json = "1.0.96"

examples/client_randoms/Cargo.toml

@@ -5,12 +5,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 hex = "0.4.3"
 log = { version = "0.4", features = ["release_max_level_info"] }
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
-serde_json = "1.0.59"
+serde_json = "1.0.96"
 

examples/ip_anon/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 ipcrypt = "0.1.0"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
 

examples/ip_anon/src/main.rs

@@ -21,7 +21,7 @@ struct Args {
 fn main() -> Result<()> {
     env_logger::init();
     let args = Args::parse();
-    let config = load_config(&args.config);
+    let config = load_config(args.config);
 
     let key: [u8; 16] = "a sample enc key".as_bytes().try_into()?;
     let callback = |frame: ConnectionFrame| {

examples/log_conn/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 jsonl = "4.0.1"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
-serde_json = "1.0.59"
+serde_json = "1.0.96"

examples/log_dns/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 jsonl = "4.0.1"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
-serde_json = "1.0.59"
+serde_json = "1.0.96"

examples/log_http/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 jsonl = "4.0.1"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
-serde_json = "1.0.59"
+serde_json = "1.0.96"

examples/log_tls/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 jsonl = "4.0.1"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }
-serde_json = "1.0.59"
+serde_json = "1.0.96"

examples/pcap_dump/Cargo.toml

@@ -5,12 +5,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
 pcap-file = "1.1.1"
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }

examples/spin/Cargo.toml

@@ -5,9 +5,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+env_logger = "0.8.4"
 log = { version = "0.4", features = ["release_max_level_info"] }
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }

examples/video/Cargo.toml

@@ -5,13 +5,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.40"
-clap = { version = "3.1.8", features = ["derive"] }
-csv = "1.1.6"
-env_logger = "0.8.3"
+anyhow = "1.0.70"
+clap = { version = "3.2.23", features = ["derive"] }
+csv = "1.2.1"
+env_logger = "0.8.4"
 hashlink = "0.7.0"
 lazy_static = "1.4.0"
 log = { version = "0.4", features = ["release_max_level_info"] }
-regex = "1.5.4"
+regex = "1.7.3"
 retina-core = { path = "../../core" }
 retina-filtergen = { path = "../../filtergen" }

examples/video/src/main.rs

@@ -38,7 +38,7 @@ fn main() -> Result<()> {
     // not re-allocate.
     let sessions = Mutex::new(LinkedHashMap::with_capacity(100_000_000));
     let mut wtr = Writer::from_path(&args.outfile)?;
-    wtr.write_record(&[
+    wtr.write_record([
         "client",
         "parallel_flows",
         "bytes_up",

filtergen/Cargo.toml

@@ -8,9 +8,9 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-heck = "0.3.2"
-proc-macro2 = "1.0"
-quote = "1.0"
-regex = "1.5.4"
+heck = "0.3.3"
+proc-macro2 = "1.0.56"
+quote = "1.0.26"
+regex = "1.7.3"
 retina-core = { path = "../core", default-features = false }
-syn = { version = "1.0", features = ["full", "extra-traits"] }
+syn = { version = "2.0.15", features = ["full", "extra-traits"] }