From 97826cf602bbacf67c87de28fb853341e05d1bed Mon Sep 17 00:00:00 2001
From: root <me@n0.computer>
Date: Tue, 26 Nov 2024 15:04:11 +0000
Subject: [PATCH] fix linux/android builds

---
 Cargo.lock                    | 44 +++++++++++++++++++++++++++++++----
 iroh-net/Cargo.toml           | 12 +++++++---
 net-tools/netwatch/Cargo.toml | 12 +++++++---
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa123e7810e..1f0dc0245f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2727,6 +2727,7 @@ dependencies = [
  "netdev",
  "netlink-packet-core",
  "netlink-packet-route 0.19.0",
+ "netlink-packet-route 0.21.0",
  "netlink-sys",
  "netwatch",
  "num_enum",
@@ -2743,7 +2744,8 @@ dependencies = [
  "regex",
  "reqwest",
  "ring",
- "rtnetlink",
+ "rtnetlink 0.13.1",
+ "rtnetlink 0.14.1",
  "rustls",
  "rustls-webpki",
  "serde",
@@ -3317,6 +3319,21 @@ dependencies = [
  "netlink-packet-utils",
 ]
 
+[[package]]
+name = "netlink-packet-route"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "483325d4bfef65699214858f097d504eb812c38ce7077d165f301ec406c3066e"
+dependencies = [
+ "anyhow",
+ "bitflags 2.6.0",
+ "byteorder",
+ "libc",
+ "log",
+ "netlink-packet-core",
+ "netlink-packet-utils",
+]
+
 [[package]]
 name = "netlink-packet-utils"
 version = "0.5.2"
@@ -3373,7 +3390,8 @@ dependencies = [
  "netlink-packet-route 0.19.0",
  "netlink-sys",
  "once_cell",
- "rtnetlink",
+ "rtnetlink 0.13.1",
+ "rtnetlink 0.14.1",
  "serde",
  "socket2",
  "thiserror 2.0.3",
@@ -4629,9 +4647,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519"
 dependencies = [
  "const-oid",
  "digest",
@@ -4648,6 +4666,24 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rtnetlink"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0"
+dependencies = [
+ "futures",
+ "log",
+ "netlink-packet-core",
+ "netlink-packet-route 0.17.1",
+ "netlink-packet-utils",
+ "netlink-proto",
+ "netlink-sys",
+ "nix 0.26.4",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
 [[package]]
 name = "rtnetlink"
 version = "0.14.1"
diff --git a/iroh-net/Cargo.toml b/iroh-net/Cargo.toml
index 82d46ff8255..136545c5df0 100644
--- a/iroh-net/Cargo.toml
+++ b/iroh-net/Cargo.toml
@@ -125,11 +125,17 @@ swarm-discovery = { version = "0.2.1", optional = true }
 # dht_discovery
 genawaiter = { version = "0.99", features = ["futures03"], optional = true }
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+[target.'cfg(all(target_os = "linux", not(target_os = "android")))'.dependencies]
 netlink-packet-core = "0.7.0"
-netlink-packet-route = "0.19.0" # 0.20/21 is blocked on rtnetlink bumping its dependency
+netlink-packet-route = "0.21"
 netlink-sys = "0.8.6"
-rtnetlink = "0.14.1"
+rtnetlink = "=0.14.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
+
+[target.'cfg(target_os = "android")'.dependencies]
+netlink-packet-core = "0.7.0"
+netlink-packet-route = "0.19" # 0.20/21 is blocked on rtnetlink bumping its dependency
+netlink-sys = "0.8.6"
+rtnetlink = "=0.13.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
 
 [target.'cfg(target_os = "windows")'.dependencies]
 wmi = "0.14"
diff --git a/net-tools/netwatch/Cargo.toml b/net-tools/netwatch/Cargo.toml
index 05b867d7b53..faea3548580 100644
--- a/net-tools/netwatch/Cargo.toml
+++ b/net-tools/netwatch/Cargo.toml
@@ -28,11 +28,17 @@ tokio = { version = "1", features = ["io-util", "macros", "sync", "rt", "net", "
 tokio-util = { version = "0.7", features = ["rt"] }
 tracing = "0.1"
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+[target.'cfg(all(target_os = "linux", not(target_os = "android")))'.dependencies]
 netlink-packet-core = "0.7.0"
-netlink-packet-route = "0.19.0" # 0.21.0 is blocked on rtnetlink bumping its dependency
+netlink-packet-route = "0.19" # 0.20/21 is blocked on rtnetlink bumping its dependency
 netlink-sys = "0.8.6"
-rtnetlink = "0.14.1"
+rtnetlink = "=0.14.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
+
+[target.'cfg(target_os = "android")'.dependencies]
+netlink-packet-core = "0.7.0"
+netlink-packet-route = "0.19" # 0.20/21 is blocked on rtnetlink bumping its dependency
+netlink-sys = "0.8.6"
+rtnetlink = "=0.13.1" # pinned because of https://github.com/rust-netlink/rtnetlink/issues/83
 
 [target.'cfg(target_os = "windows")'.dependencies]
 wmi = "0.14"