migrate to netlinklib

4 files changed, 8 insertions, 30 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 7b354c5..f6e29b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,12 +56,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "bitfield"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac"
-
-[[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -691,7 +685,7 @@ name = "rsdsl_dslite"
 version = "0.1.0"
 dependencies = [
  "ipnet",
- "rsdsl_netlinkd",
+ "rsdsl_netlinklib",
  "rsdsl_pd_config",
  "serde_json",
  "signal-hook",
@@ -701,30 +695,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "rsdsl_ip_config"
-version = "0.2.4"
-source = "git+https://github.com/rsdsl/ip_config.git#b68885346f4aa8a3216645c65e92f7c7a2c5ff51"
+name = "rsdsl_netlinklib"
+version = "0.2.0"
+source = "git+https://github.com/rsdsl/netlinklib.git#fa4720e74d3f93f6c908e479d9fbb90d54b9ba8c"
 dependencies = [
- "serde",
-]
-
-[[package]]
-name = "rsdsl_netlinkd"
-version = "0.7.1"
-source = "git+https://github.com/rsdsl/netlinkd.git#ed35bb384a77ba78baa6898df45ef4e7150a9df2"
-dependencies = [
- "bitfield",
  "futures",
- "futures-util",
- "ipnet",
  "libc",
  "netlink-packet-route",
- "rsdsl_ip_config",
- "rsdsl_pd_config",
  "rtnetlink",
- "serde_json",
- "signal-hook",
- "sysinfo",
  "thiserror",
  "tokio",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index baf7228..8ef777a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 ipnet = "2.8.0"
-rsdsl_netlinkd = { git = "https://github.com/rsdsl/netlinkd.git", version = "0.7.1" }
+rsdsl_netlinklib = { git = "https://github.com/rsdsl/netlinklib.git", version = "0.2.0", default-features = false, features = ["tunnel"] }
 rsdsl_pd_config = { git = "https://github.com/rsdsl/pd_config.git", version = "0.1.0" }
 serde_json = "1.0"
 signal-hook = "0.3.17"
diff --git a/src/error.rs b/src/error.rs
index 9b239b5..4e20f07 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -14,8 +14,8 @@ pub enum Error {
 
     #[error("ipnet prefix len: {0}")]
     IpnetPrefixLen(#[from] ipnet::PrefixLenError),
-    #[error("rsdsl_netlinkd: {0}")]
-    RsdslNetlinkd(#[from] rsdsl_netlinkd::Error),
+    #[error("netlinklib error: {0}")]
+    Netlinklib(#[from] rsdsl_netlinklib::Error),
     #[error("serde_json: {0}")]
     SerdeJson(#[from] serde_json::Error),
     #[error("trust_dns_resolver resolve: {0}")]
diff --git a/src/main.rs b/src/main.rs
index 67f71f6..dad2847 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use std::thread;
 use std::time::Duration;
 
 use ipnet::Ipv6Net;
-use rsdsl_netlinkd::tunnel::IpIp6;
+use rsdsl_netlinklib::tunnel::IpIp6;
 use rsdsl_pd_config::PdConfig;
 use signal_hook::{consts::SIGUSR1, iterator::Signals};
 use sysinfo::{ProcessExt, Signal, System, SystemExt};