Upgrade several dependencies to latest version

These are all nominally incompatible changes. The only one requiring
code changes is etherparse.

Author: bmerry

Cargo.lock

@@ -55,24 +55,24 @@ serde = { version = "1.0.159", features = ["derive"] }
 async-std = "1.12.0"
 async-trait = "0.1.57"
 chrono = { version = "0.4.22", default-features = false, features = ["std"] }
-chrono-tz = { version = "0.8.2", features = ["serde"], optional = true }
+chrono-tz = { version = "0.10.0", features = ["serde"], optional = true }
 clap = { version = "4.0.10", features = ["derive"] }
-env_logger = "0.10.0"
-etherparse = { version = "0.13.0", optional = true }
+env_logger = "0.11.5"
+etherparse = { version = "0.16.0", optional = true }
 futures = "0.3.28"
-influxdb2 = { version = "0.4.0", default-features = false, features = ["rustls"], optional = true }
+influxdb2 = { version = "0.5.2", default-features = false, features = ["rustls"], optional = true }
 log = "0.4.17"
 modbus-robust = { version = "0.1.0", optional = true }
 mqtt-async-client = { version = "0.3.1", optional = true }
-pcap = { version = "1.0.0", features = ["capture-stream"], optional = true }
+pcap = { version = "2.2.0", features = ["capture-stream"], optional = true }
 phf = { version = "0.11.2", default-features = false }
 serde = { version = "1.0.159", features = ["derive"] }
 serde_json = { version = "1.0.95", optional = true }
 serde_with = { version = "3.2.0", optional = true }
 tokio = { version = "1.21.2", features = ["macros", "rt"] }
 tokio-modbus = { version = "0.9.0", default-features = false, features = ["rtu", "tcp"], optional = true }
 tokio-serial = { version = "5.4.4", optional = true }
-toml = "0.7.3"
+toml = "0.8.19"
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"

Cargo.toml

@@ -17,6 +17,7 @@
 use chrono::{DateTime, LocalResult, NaiveDate};
 use chrono_tz::Tz;
 use etherparse::SlicedPacket;
+use etherparse::TransportSlice::Tcp;
 use futures::prelude::*;
 use log::{error, info};
 use pcap::{Capture, Device, Packet, PacketCodec};
@@ -77,14 +78,14 @@ fn parse_timestamp(payload: &[u8], tz: Tz) -> Option<DateTime<Tz>> {
 
 impl Codec {
     fn decode_data(&self, packet_data: &[u8]) -> Option<Arc<Update<'static>>> {
-        if let Ok(sliced) = SlicedPacket::from_ethernet(packet_data) {
-            if let Some(field_table) = FIELDS.get(&sliced.payload.len()) {
-                if sliced.payload[0] != MAGIC_HEADER {
+        if let Tcp(transport) = SlicedPacket::from_ethernet(packet_data).ok()?.transport? {
+            let payload = transport.payload();
+            if let Some(field_table) = FIELDS.get(&payload.len()) {
+                if payload[0] != MAGIC_HEADER {
                     return None;
                 }
-                let dt = parse_timestamp(sliced.payload, self.tz)?;
-                let serial =
-                    std::str::from_utf8(&sliced.payload[SERIAL_RANGE]).unwrap_or("unknown");
+                let dt = parse_timestamp(payload, self.tz)?;
+                let serial = std::str::from_utf8(&payload[SERIAL_RANGE]).unwrap_or("unknown");
                 info!(
                     "Received packet with timestamp {:?} for inverter {}",
                     dt, serial
@@ -93,7 +94,7 @@ impl Codec {
                 for (&offsets, field) in field_table.offsets.iter().zip(field_table.fields.iter()) {
                     let value = if !offsets.is_empty() {
                         let parts = offsets.iter().cloned().map(|offset| {
-                            let bytes = &sliced.payload[offset..offset + 2];
+                            let bytes = &payload[offset..offset + 2];
                             let bytes = <&[u8; 2]>::try_from(bytes).unwrap();
                             u16::from_be_bytes(*bytes)
                         });