From 4bd88cd0170f155b3f958c5b1a70ff00af54ee08 Mon Sep 17 00:00:00 2001
From: Dmitry Savintsev <dmitris@users.noreply.github.com>
Date: Thu, 27 Oct 2022 16:45:05 +0200
Subject: [PATCH] convert to clap 4 (#14)

---
 tcbpftest/Cargo.toml  |  2 +-
 tcbpftest/src/main.rs | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tcbpftest/Cargo.toml b/tcbpftest/Cargo.toml
index 8004404..d35c251 100644
--- a/tcbpftest/Cargo.toml
+++ b/tcbpftest/Cargo.toml
@@ -9,11 +9,11 @@ aya = { version = ">=0.11", features=["async_tokio"] }
 tcbpftest-common = { path = "../tcbpftest-common", features=["userspace"] }
 anyhow = "1.0.42"
 bytes = "1"
-clap = { version = "3"}
 ctrlc = "3.2"
 log = "0.4"
 simplelog = "0.12"
 tokio = { version = "1.18", features = ["macros", "rt", "rt-multi-thread", "net", "signal"] }
+clap = { version = "4.0.18", features = ["derive"] }
 
 [[bin]]
 name = "tcbpftest"
diff --git a/tcbpftest/src/main.rs b/tcbpftest/src/main.rs
index 04241f6..484d1a6 100644
--- a/tcbpftest/src/main.rs
+++ b/tcbpftest/src/main.rs
@@ -10,14 +10,14 @@ use tokio::{signal, task};
 use tcbpftest_common::PacketLog;
 
 #[derive(Debug, Parser)]
-struct Opt {
-    #[clap(short, long, default_value = "eth0")]
+struct Args {
+    #[arg(short, long, default_value = "eth0")]
     iface: String,
 }
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
-    let opt = Opt::from_args();
+    let args = Args::parse();
 
     TermLogger::init(
         LevelFilter::Debug,
@@ -43,11 +43,11 @@ async fn main() -> Result<(), anyhow::Error> {
     ))?;
     // error adding clsact to the interface if it is already added is harmless
     // the full cleanup can be done with 'sudo tc qdisc del dev eth0 clsact'.
-    let _ = tc::qdisc_add_clsact(&opt.iface);
+    let _ = tc::qdisc_add_clsact(&args.iface);
     let program: &mut SchedClassifier = bpf.program_mut("tcbpftest").unwrap().try_into()?;
     program.load()?;
-    // program.attach(&opt.iface, TcAttachType::Egress)?;
-    program.attach(&opt.iface, TcAttachType::Ingress)?;
+    // program.attach(&args.iface, TcAttachType::Egress)?;
+    program.attach(&args.iface, TcAttachType::Ingress)?;
 
     let mut perf_array = AsyncPerfEventArray::try_from(bpf.map_mut("EVENTS")?)?;
     for cpu_id in online_cpus()? {