Attempt to setup routes the other way

1 files changed, 86 insertions, 53 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 17847ae5cd..0909ef3fc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -85,7 +85,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
 dependencies = [
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -264,7 +264,7 @@ dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
- "libc",
+ "libc 0.2.137",
  "miniz_oxide",
  "object",
  "rustc-demangle",
@@ -601,7 +601,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
 dependencies = [
  "core-foundation-sys",
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -616,7 +616,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
 dependencies = [
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -751,7 +751,7 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "libdbus-sys",
  "winapi",
 ]
@@ -860,7 +860,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "redox_users",
  "winapi",
 ]
@@ -871,7 +871,7 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fc6a0a59ed0888e0041cf708e66357b7ae1a82f1c67247e1f93b5e0818f7d8d"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "once_cell",
  "os_pipe",
  "shared_child",
@@ -988,7 +988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
 dependencies = [
  "errno-dragonfly",
- "libc",
+ "libc 0.2.137",
  "winapi",
 ]
 
@@ -1010,7 +1010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
 dependencies = [
  "cc",
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -1205,7 +1205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
  "cfg-if",
- "libc",
+ "libc 0.2.137",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
@@ -1216,7 +1216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
 dependencies = [
  "cfg-if",
- "libc",
+ "libc 0.2.137",
  "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
@@ -1273,7 +1273,7 @@ version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -1321,7 +1321,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "match_cfg",
  "winapi",
 ]
@@ -1491,7 +1491,7 @@ dependencies = [
  "bitflags",
  "futures-core",
  "inotify-sys",
- "libc",
+ "libc 0.2.137",
  "tokio",
 ]
 
@@ -1501,7 +1501,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
 dependencies = [
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -1872,7 +1872,7 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.45.0",
@@ -1884,7 +1884,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1a5469630da93e1813bb257964c0ccee3b26b6879dd858039ddec35cc8681ed"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "log",
  "mnl-sys",
 ]
@@ -1895,7 +1895,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9750685b201e1ecfaaf7aa5d0387829170fa565989cc481b49080aa155f70457"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "pkg-config",
 ]
 
@@ -1964,7 +1964,7 @@ dependencies = [
  "futures",
  "ipnetwork",
  "lazy_static",
- "libc",
+ "libc 0.2.137",
  "log",
  "log-panics",
  "mullvad-api",
@@ -2188,7 +2188,7 @@ checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297"
 dependencies = [
  "anyhow",
  "byteorder",
- "libc",
+ "libc 0.2.137",
  "netlink-packet-utils",
 ]
 
@@ -2201,7 +2201,7 @@ dependencies = [
  "anyhow",
  "bitflags",
  "byteorder",
- "libc",
+ "libc 0.2.137",
  "netlink-packet-core",
  "netlink-packet-utils",
 ]
@@ -2241,7 +2241,7 @@ checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027"
 dependencies = [
  "bytes",
  "futures",
- "libc",
+ "libc 0.2.137",
  "log",
  "tokio",
 ]
@@ -2265,7 +2265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26b5c587b6a5e76a3a5d51e0a757ae66dbff38c277563485807ae979ce361b56"
 dependencies = [
  "cfg-if",
- "libc",
+ "libc 0.2.137",
  "pkg-config",
 ]
 
@@ -2299,7 +2299,18 @@ checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
 dependencies = [
  "bitflags",
  "cfg-if",
- "libc",
+ "libc 0.2.137",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.0"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc 0.2.135",
+ "memoffset",
+ "pin-utils",
 ]
 
 [[package]]
@@ -2416,7 +2427,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "winapi",
 ]
 
@@ -2464,7 +2475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
 dependencies = [
  "futures",
- "libc",
+ "libc 0.2.137",
  "log",
  "rand 0.7.3",
  "tokio",
@@ -2488,7 +2499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
 dependencies = [
  "cfg-if",
- "libc",
+ "libc 0.2.137",
  "redox_syscall",
  "smallvec",
  "windows-sys 0.45.0",
@@ -2570,7 +2581,7 @@ dependencies = [
  "error-chain",
  "ioctl-sys",
  "ipnetwork",
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -2856,7 +2867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
  "getrandom 0.1.16",
- "libc",
+ "libc 0.2.137",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc",
@@ -2868,7 +2879,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
 ]
@@ -2973,7 +2984,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
- "libc",
+ "libc 0.2.137",
  "once_cell",
  "spin 0.5.2",
  "untrusted",
@@ -3159,7 +3170,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa25200c6de90f8da82d63f8806bd2ea1261018620dd4881626d6b146e13bd7"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "tokio",
 ]
 
@@ -3252,7 +3263,7 @@ dependencies = [
  "bytes",
  "cfg-if",
  "futures",
- "libc",
+ "libc 0.2.137",
  "log",
  "notify",
  "once_cell",
@@ -3321,7 +3332,7 @@ dependencies = [
  "ipnet",
  "iprange",
  "json5",
- "libc",
+ "libc 0.2.137",
  "log",
  "lru_time_cache",
  "nix 0.26.2",
@@ -3345,7 +3356,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6be9f7d5565b1483af3e72975e2dee33879b3b86bd48c0929fccf6585d79e65a"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "winapi",
 ]
 
@@ -3361,7 +3372,7 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
 dependencies = [
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -3380,7 +3391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53f7da44adcc42667d57483bd93f81295f27d66897804b757573b61b6f13288b"
 dependencies = [
  "lazy_static",
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -3407,7 +3418,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "winapi",
 ]
 
@@ -3511,13 +3522,30 @@ dependencies = [
 
 [[package]]
 name = "system-configuration"
+version = "0.4.0"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys 0.4.1",
+]
+
+[[package]]
+name = "system-configuration"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd"
 dependencies = [
  "bitflags",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.4.1"
+dependencies = [
+ "core-foundation-sys",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -3527,7 +3555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
 dependencies = [
  "core-foundation-sys",
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -3548,7 +3576,7 @@ dependencies = [
  "ipnetwork",
  "jnix",
  "lazy_static",
- "libc",
+ "libc 0.2.137",
  "log",
  "memoffset 0.6.4",
  "mnl",
@@ -3571,7 +3599,7 @@ dependencies = [
  "shell-escape",
  "socket2",
  "subslice",
- "system-configuration",
+ "system-configuration 0.5.0",
  "talpid-dbus",
  "talpid-openvpn",
  "talpid-routing",
@@ -3604,7 +3632,7 @@ dependencies = [
  "dbus",
  "err-derive",
  "lazy_static",
- "libc",
+ "libc 0.2.137",
  "log",
  "tokio",
 ]
@@ -3678,16 +3706,21 @@ dependencies = [
 name = "talpid-routing"
 version = "0.0.0"
 dependencies = [
+ "base64 0.20.0",
+ "bitflags",
  "err-derive",
  "futures",
  "ipnetwork",
  "lazy_static",
- "libc",
+ "libc 0.2.137",
  "log",
  "netlink-packet-route",
  "netlink-sys",
+ "nix 0.25.0",
  "rtnetlink",
  "socket2",
+ "system-configuration 0.4.0",
+ "talpid-time",
  "talpid-types",
  "talpid-windows-net",
  "tokio",
@@ -3700,7 +3733,7 @@ dependencies = [
 name = "talpid-time"
 version = "0.0.0"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "tokio",
 ]
 
@@ -3763,7 +3796,7 @@ version = "0.0.0"
 dependencies = [
  "err-derive",
  "futures",
- "libc",
+ "libc 0.2.137",
  "socket2",
  "winapi",
  "windows-sys 0.45.0",
@@ -3783,7 +3816,7 @@ dependencies = [
  "internet-checksum",
  "ipnetwork",
  "lazy_static",
- "libc",
+ "libc 0.2.137",
  "log",
  "netlink-packet-core",
  "netlink-packet-route",
@@ -3862,7 +3895,7 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 dependencies = [
- "libc",
+ "libc 0.2.137",
  "winapi",
 ]
 
@@ -3872,7 +3905,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
 dependencies = [
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]
@@ -3898,7 +3931,7 @@ checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
 dependencies = [
  "autocfg",
  "bytes",
- "libc",
+ "libc 0.2.137",
  "memchr",
  "mio",
  "num_cpus",
@@ -3961,7 +3994,7 @@ checksum = "35ccf89920b48afc418f18135342355d30ad048f3c95ba54670f50a52371a439"
 dependencies = [
  "cfg-if",
  "futures",
- "libc",
+ "libc 0.2.137",
  "log",
  "once_cell",
  "pin-project",
@@ -4253,7 +4286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cb3f24867499300ae21771a95bbaede2761497ae51094bbefcfd40646815b2a"
 dependencies = [
  "ioctl-sys",
- "libc",
+ "libc 0.2.137",
  "thiserror",
 ]
 
@@ -4490,7 +4523,7 @@ checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9"
 dependencies = [
  "either",
  "lazy_static",
- "libc",
+ "libc 0.2.137",
 ]
 
 [[package]]