vrrpd: set sockets to -1 after closing

This also fixes a bug where assigning the same address as a VIP twice
would succeed the second time even if it actually failed both times.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index b01bcb939c5791cfb9c16e21969af6ea88b719c6..14347c239f96f8f988a66828acfa0d2383ca97e8 100644 (file)
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -1001,10 +1001,14 @@ done:
                zlog_warn(VRRP_LOGPFX VRRP_LOGPFX_VRID
                          "Failed to initialize VRRP %s router",
                          r->vr->vrid, family2str(r->family));
-               if (r->sock_rx >= 0)
+               if (r->sock_rx >= 0) {
                        close(r->sock_rx);
-               if (r->sock_tx >= 0)
+                       r->sock_rx = -1;
+               }
+               if (r->sock_tx >= 0) {
                        close(r->sock_tx);
+                       r->sock_tx = -1;
+               }
                ret = -1;
        }