bgpd: fix printfrr_bp for non initialized peers

Fix printfrr_bp for non initialized peers. For example:

> Sep 26 17:56:44 r1 bgpd[26295]: [GJPH1-W8PZV] Resetting peer (null)(Unknown) due to change in addpath config

Is now:

> Oct 02 14:00:59 r1 bgpd[12795]: [MNE5N-K0G4Z] Resetting peer 2.2.2.2 due to change in addpath config

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit b56cfc6c808d330a85a06421c7fc5f5f9066938f)

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 492092bac4c753eb8b65a765f991ecd680af2a40..b8389457f87caa525b78d5a20d0177989f362058 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -8610,6 +8610,12 @@ static ssize_t printfrr_bp(struct fbuf *buf, struct printfrr_eargs *ea,
        if (!peer)
                return bputs(buf, "(null)");
 
+       if (!peer->host) {
+               if (peer->conf_if)
+                       return bprintfrr(buf, "%s", peer->conf_if);
+               return bprintfrr(buf, "%pSU", &peer->connection->su);
+       }
+
        return bprintfrr(buf, "%s(%s)", peer->host,
                         peer->hostname ? peer->hostname : "Unknown");
 }