Updated Cargo.toml dependencies, made two changes related to update o…

examples/kprobetcp/kprobetcp-ebpf/src/main.rs

@@ -44,7 +44,7 @@ fn try_kprobetcp(ctx: ProbeContext) -> Result<u32, i64> {
             });
             info!(
                 &ctx,
-                "AF_INET src address: {:ipv4}, dest address: {:ipv4}",
+                "AF_INET src address: {:i}, dest address: {:i}",
                 src_addr,
                 dest_addr,
             );

examples/tc-egress/tc-egress-ebpf/src/main.rs

@@ -44,7 +44,7 @@ fn try_tc_egress(ctx: TcContext) -> Result<i32, ()> {
         TC_ACT_PIPE
     };
 
-    info!(&ctx, "DEST {:ipv4}, ACTION {}", destination, action);
+    info!(&ctx, "DEST {:i}, ACTION {}", destination, action);
 
     Ok(action)
 }

examples/xdp-drop/xdp-drop-ebpf/src/main.rs

@@ -68,7 +68,7 @@ fn try_xdp_firewall(ctx: XdpContext) -> Result<u32, ()> {
     } else {
         xdp_action::XDP_PASS
     };
-    info!(&ctx, "SRC: {:ipv4}, ACTION: {}", source, action);
+    info!(&ctx, "SRC: {:i}, ACTION: {}", source, action);
 
     Ok(action)
 }

examples/xdp-drop/xdp-drop/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-aya = { version = ">=0.11", features = ["async_tokio"] }
-aya-log = "0.1"
+aya = { git = "https://github.com/aya-rs/aya", branch = "main", features = ["async_tokio"] }
+aya-log = { git = "https://github.com/aya-rs/aya", branch = "main" }
 xdp-drop-common = { path = "../xdp-drop-common", features = ["user"] }
 anyhow = "1"
 clap = { version = "4.1", features = ["derive"] }

examples/xdp-drop/xdp-drop/src/main.rs

@@ -46,7 +46,7 @@ async fn main() -> Result<(), anyhow::Error> {
 
     // (1)
     let mut blocklist: HashMap<_, u32, u32> =
-        HashMap::try_from(bpf.map_mut("BLOCKLIST")?)?;
+        HashMap::try_from(bpf.map_mut("BLOCKLIST").unwrap())?;
 
     // (2)
     let block_addr: u32 = Ipv4Addr::new(1, 1, 1, 1).try_into()?;

examples/xdp-hello/xdp-hello/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-aya = { version = ">=0.11", features = ["async_tokio"] }
-aya-log = "0.1"
+aya = { git = "https://github.com/aya-rs/aya", branch = "main", features = ["async_tokio"] }
+aya-log = { git = "https://github.com/aya-rs/aya", branch = "main" }
 xdp-hello-common = { path = "../xdp-hello-common", features = ["user"] }
 anyhow = "1"
 clap = { version = "4.1", features = ["derive"] }

examples/xdp-log/xdp-log-ebpf/src/main.rs

@@ -65,7 +65,7 @@ fn try_xdp_firewall(ctx: XdpContext) -> Result<u32, ()> {
     // (3)
     info!(
         &ctx,
-        "SRC IP: {:ipv4}, SRC PORT: {}", source_addr, source_port
+        "SRC IP: {:i}, SRC PORT: {}", source_addr, source_port
     );
 
     Ok(xdp_action::XDP_PASS)

examples/xdp-log/xdp-log/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 publish = false
 
 [dependencies]
-aya = { version = ">=0.11", features = ["async_tokio"] }
-aya-log = "0.1"
+aya = { git = "https://github.com/aya-rs/aya", branch = "main", features = ["async_tokio"] }
+aya-log = { git = "https://github.com/aya-rs/aya", branch = "main" }
 xdp-log-common = { path = "../xdp-log-common", features = ["user"] }
 anyhow = "1"
 clap = { version = "4.1", features = ["derive"] }