diff --git a/Cargo.toml b/Cargo.toml index 1f35b82..2613935 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = [ "bgpd", - "netlink", +# "netlink", # Tests "tests/integration_tests" diff --git a/bgpd/Cargo.toml b/bgpd/Cargo.toml index 599ca9c..602c901 100644 --- a/bgpd/Cargo.toml +++ b/bgpd/Cargo.toml @@ -8,16 +8,16 @@ edition = "2021" name = "bgp_server" path = "src/main.rs" -[[bin]] -name = "route_client" -path = "src/route_client/main.rs" +#[[bin]] +#name = "route_client" +#path = "src/route_client/main.rs" [[bin]] name = "streamer_cli" path = "src/streamer_cli/main.rs" [dependencies] -anyhow = "1.0.56" +anyhow = "1.0.71" byteorder = "1.4.3" bytes = "1.*" clap = {version = "3.2.8", features = ["cargo", "derive"]} @@ -25,7 +25,7 @@ futures = "0.3" ipnet = "2.3.0" libc = "0.2.126" log = "0.4" -nom = "6.1.2" +nom = "7.1" prost = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.64" @@ -37,13 +37,10 @@ tokio-stream = { version = "0.1.7", features = ["net"] } tokio-util = { version = "0.6.7", features = ["codec"] } tonic = { version = "0.5", features = ["compression"] } tracing = "0.1" -tracing-subscriber = "0.2" +tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } ip_network_table-deps-treebitmap = "0.5.0" -warp = "0.3" -rtnetlink = "0.9.1" -netlink-packet-route = "0.11.0" -netlink = { path = "../netlink" } -neli = "0.6.2" +warp = "0.3.5" +# neli = "0.6.2" async-trait = "0.1.57" [build-dependencies] diff --git a/bgpd/src/lib.rs b/bgpd/src/lib.rs index a393cbc..786c428 100644 --- a/bgpd/src/lib.rs +++ b/bgpd/src/lib.rs @@ -1,3 +1,3 @@ pub mod bgp_packet; -pub mod route_client; +// pub mod route_client; pub mod server; diff --git a/bgpd/src/main.rs b/bgpd/src/main.rs index 1157280..67a5ad5 100644 --- a/bgpd/src/main.rs +++ b/bgpd/src/main.rs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -use bgpd::server::config::ServerConfig; use bgpd::server::bgp_server::Server; +use bgpd::server::config::ServerConfig; use clap::{App, Arg}; use core::sync::atomic::AtomicBool; use libc::SIGUSR1;