From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 23 Aug 2017 13:48:36 +0000 (+0200)
Subject: zebra: don't print 0.0.0.0:0 for FPM config
X-Git-Tag: frr-4.0-dev~378^2~9
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9d1c2659293a757a672bf0aa0d2f5ca20a2b28e5;p=mirror%2Ffrr.git

zebra: don't print 0.0.0.0:0 for FPM config

Fixes: #319
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index b88bce9e82..8c0700ac8b 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1589,8 +1589,10 @@ static int fpm_remote_srv_write(struct vty *vty)
 
 	in.s_addr = zfpm_g->fpm_server;
 
-	if (zfpm_g->fpm_server != FPM_DEFAULT_IP
-	    || zfpm_g->fpm_port != FPM_DEFAULT_PORT)
+	if ((zfpm_g->fpm_server != FPM_DEFAULT_IP
+		&& zfpm_g->fpm_server != INADDR_ANY)
+	    || (zfpm_g->fpm_port != FPM_DEFAULT_PORT
+		&& zfpm_g->fpm_port != 0))
 		vty_out(vty, "fpm connection ip %s port %d\n", inet_ntoa(in),
 			zfpm_g->fpm_port);