proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-27 17:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5203 from qlyoung/fix-vrrp-error-alternations

Browse Source 
vrrpd: fix startup error message reporting
This commit is contained in:
Renato Westphal 2019-10-23 21:16:04 -03:00 committed by GitHub
commit f935dca78f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vrrpd/vrrp.c
View File

@ -281,7 +281,7 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
{ {
struct vrrp_router *r; struct vrrp_router *r;
bool start; bool start;
const char *whynot = NULL; const char *whynot;
if (vr->shutdown || vr->ifp == NULL) if (vr->shutdown || vr->ifp == NULL)
return; return;
@ -289,27 +289,28 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
r = vr->v4; r = vr->v4;
/* Must not already be started */ /* Must not already be started */
start = r->fsm.state == VRRP_STATE_INITIALIZE; start = r->fsm.state == VRRP_STATE_INITIALIZE;
whynot = NULL;
/* Must have a parent interface */ /* Must have a parent interface */
start = start && (vr->ifp != NULL); start = start && (vr->ifp != NULL);
whynot = (!start && !whynot) ? "No base interface" : NULL; whynot = (!start && !whynot) ? "No base interface" : whynot;
#if 0 #if 0
/* Parent interface must be up */ /* Parent interface must be up */
start = start && if_is_operative(vr->ifp); start = start && if_is_operative(vr->ifp);
#endif #endif
/* Parent interface must have at least one v4 */ /* Parent interface must have at least one v4 */
start = start && vr->ifp->connected->count > 1; start = start && vr->ifp->connected->count > 1;
whynot = (!start && !whynot) ? "No primary IPv4 address" : NULL; whynot = (!start && !whynot) ? "No primary IPv4 address" : whynot;
/* Must have a macvlan interface */ /* Must have a macvlan interface */
start = start && (r->mvl_ifp != NULL); start = start && (r->mvl_ifp != NULL);
whynot = (!start && !whynot) ? "No VRRP interface" : NULL; whynot = (!start && !whynot) ? "No VRRP interface" : whynot;
#if 0 #if 0
/* Macvlan interface must be admin up */ /* Macvlan interface must be admin up */
start = start && CHECK_FLAG(r->mvl_ifp->flags, IFF_UP); start = start && CHECK_FLAG(r->mvl_ifp->flags, IFF_UP);
#endif #endif
/* Must have at least one VIP configured */ /* Must have at least one VIP configured */
start = start && r->addrs->count > 0; start = start && r->addrs->count > 0;
whynot = whynot = (!start && !whynot) ? "No Virtual IP address configured"
(!start && !whynot) ? "No Virtual IP address configured" : NULL; : whynot;
if (start) if (start)
vrrp_event(r, VRRP_EVENT_STARTUP); vrrp_event(r, VRRP_EVENT_STARTUP);
else if (whynot) else if (whynot)
@ -320,19 +321,20 @@ void vrrp_check_start(struct vrrp_vrouter *vr)
r = vr->v6; r = vr->v6;
/* Must not already be started */ /* Must not already be started */
start = r->fsm.state == VRRP_STATE_INITIALIZE; start = r->fsm.state == VRRP_STATE_INITIALIZE;
whynot = NULL;
/* Must not be v2 */ /* Must not be v2 */
start = start && vr->version != 2; start = start && vr->version != 2;
whynot = (!start && !whynot) ? "VRRPv2 does not support v6" : NULL; whynot = (!start && !whynot) ? "VRRPv2 does not support v6" : whynot;
/* Must have a parent interface */ /* Must have a parent interface */
start = start && (vr->ifp != NULL); start = start && (vr->ifp != NULL);
whynot = (!start && !whynot) ? "No base interface" : NULL; whynot = (!start && !whynot) ? "No base interface" : whynot;
#if 0 #if 0
/* Parent interface must be up */ /* Parent interface must be up */
start = start && if_is_operative(vr->ifp); start = start && if_is_operative(vr->ifp);
#endif #endif
/* Must have a macvlan interface */ /* Must have a macvlan interface */
start = start && (r->mvl_ifp != NULL); start = start && (r->mvl_ifp != NULL);
whynot = (!start && !whynot) ? "No VRRP interface" : NULL; whynot = (!start && !whynot) ? "No VRRP interface" : whynot;
#if 0 #if 0
/* Macvlan interface must be admin up */ /* Macvlan interface must be admin up */
start = start && CHECK_FLAG(r->mvl_ifp->flags, IFF_UP); start = start && CHECK_FLAG(r->mvl_ifp->flags, IFF_UP);