From b308e58f904fbcb5026a67ac3eb830c856068725 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Tue, 31 Jan 2023 09:59:00 +0100
Subject: [PATCH] temporary stable zettabgp without FQDN capability support

---
 Cargo.lock           |  3 ++-
 Cargo.toml           |  2 +-
 src/bgp_collector.rs | 13 +------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2a4e92..e8b7f84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1076,7 +1076,8 @@ dependencies = [
 [[package]]
 name = "zettabgp"
 version = "0.3.3"
-source = "git+https://github.com/wobcom/zettabgp?branch=more-capabilities#33124011de88b8ff0e6db4f5ca46b1e0fee163bb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d72efdc26d7ba16ebd69a2b01d5592eb2e0131d6bae38c192db3f122d166fe67"
 dependencies = [
  "log",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 726445d..9cd049a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ tokio = { version = "1.23.0", features = ["rt", "macros", "time", "rt-multi-thre
 tokio-stream = "0.1.11"
 tokio-util = { version = "0.7.4", features = ["codec"] }
 weak-table = "0.3.2"
-zettabgp = { git = "https://github.com/wobcom/zettabgp", branch = "more-capabilities" }
+zettabgp = "0.3.3"
 nibbletree = { version = "0.1.0", path = "./nibbletree", features = ["ipnet"] }
 
 [[bin]]
diff --git a/src/bgp_collector.rs b/src/bgp_collector.rs
index ff62ffc..1547a6e 100644
--- a/src/bgp_collector.rs
+++ b/src/bgp_collector.rs
@@ -33,21 +33,10 @@ pub async fn run_peer(cfg: PeerConfig, table: impl Table, stream: TcpStream, cli
         ),
         stream,
     );
-    let open_message = dumper.start_active().await?;
+    dumper.start_active().await?;
     let stream = dumper.lifecycle();
     pin_mut!(stream);
     let client_name = cfg.name_override
-        .or(open_message.caps.iter().find_map(|x| {
-            if let BgpCapability::CapFQDN(hostname, domainname) = x {
-                let mut name = hostname.to_string();
-                if domainname != "" {
-                    name = format!("{}.{}", name, domainname);
-                }
-                Some(name)
-            } else {
-                None
-            }
-        }))
         .unwrap_or(client_addr.ip().to_string());
     table.client_up(client_addr, Client { client_name, ..Default::default() }).await;
     loop {