proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 00:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1524 from dslicenc/zebra-ra-display-cm18702

Browse Source 
zebra: do not display ipv6 ra commands created by bgpd
This commit is contained in:
Renato Westphal 2017-12-11 15:37:26 -02:00 committed by GitHub
commit f8582ec77a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/interface.h
View File

@ -170,7 +170,12 @@ struct rtadvconf {
#define RTADV_PREF_MEDIUM 0x0 /* Per RFC4191. */ #define RTADV_PREF_MEDIUM 0x0 /* Per RFC4191. */
u_char inFastRexmit; /* True if we're rexmits faster than usual */ u_char inFastRexmit; /* True if we're rexmits faster than usual */
u_char configured; /* Has operator configured RA? */
/* Track if RA was configured by BGP or by the Operator or both */
u_char ra_configured; /* Was RA configured? */
#define BGP_RA_CONFIGURED (1<<0) /* BGP configured RA? */
#define VTY_RA_CONFIGURED (1<<1) /* Operator configured RA? */
#define VTY_RA_INTERVAL_CONFIGURED (1<<2) /* Operator configured RA interval */
int int
NumFastReXmitsRemain; /* Loaded first with number of fast NumFastReXmitsRemain; /* Loaded first with number of fast
rexmits to do */ rexmits to do */

46
zebra/rtadv.c
View File

@ -838,16 +838,21 @@ void zebra_interface_radv_set(struct zserv *client, u_short length,
zif = ifp->info; zif = ifp->info;
if (enable) { if (enable) {
SET_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED);
ipv6_nd_suppress_ra_set(ifp, RA_ENABLE); ipv6_nd_suppress_ra_set(ifp, RA_ENABLE);
if (ra_interval if (ra_interval
&& (ra_interval * 1000) < zif->rtadv.MaxRtrAdvInterval) && (ra_interval * 1000) < zif->rtadv.MaxRtrAdvInterval
&& !CHECK_FLAG(zif->rtadv.ra_configured,
VTY_RA_INTERVAL_CONFIGURED))
zif->rtadv.MaxRtrAdvInterval = ra_interval * 1000; zif->rtadv.MaxRtrAdvInterval = ra_interval * 1000;
} else { } else {
if (!zif->rtadv.configured) { UNSET_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED);
if (!CHECK_FLAG(zif->rtadv.ra_configured,
VTY_RA_INTERVAL_CONFIGURED))
zif->rtadv.MaxRtrAdvInterval = zif->rtadv.MaxRtrAdvInterval =
RTADV_MAX_RTR_ADV_INTERVAL; RTADV_MAX_RTR_ADV_INTERVAL;
if (!CHECK_FLAG(zif->rtadv.ra_configured, VTY_RA_CONFIGURED))
ipv6_nd_suppress_ra_set(ifp, RA_SUPPRESS); ipv6_nd_suppress_ra_set(ifp, RA_SUPPRESS);
}
} }
stream_failure: stream_failure:
return; return;
@ -870,8 +875,10 @@ DEFUN (ipv6_nd_suppress_ra,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
ipv6_nd_suppress_ra_set(ifp, RA_SUPPRESS); if (!CHECK_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED))
zif->rtadv.configured = 0; ipv6_nd_suppress_ra_set(ifp, RA_SUPPRESS);
UNSET_FLAG(zif->rtadv.ra_configured, VTY_RA_CONFIGURED);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -894,7 +901,7 @@ DEFUN (no_ipv6_nd_suppress_ra,
} }
ipv6_nd_suppress_ra_set(ifp, RA_ENABLE); ipv6_nd_suppress_ra_set(ifp, RA_ENABLE);
zif->rtadv.configured = 1; SET_FLAG(zif->rtadv.ra_configured, VTY_RA_CONFIGURED);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -929,6 +936,7 @@ DEFUN (ipv6_nd_ra_interval_msec,
if (interval % 1000) if (interval % 1000)
zns->rtadv.adv_msec_if_count++; zns->rtadv.adv_msec_if_count++;
SET_FLAG(zif->rtadv.ra_configured, VTY_RA_INTERVAL_CONFIGURED);
zif->rtadv.MaxRtrAdvInterval = interval; zif->rtadv.MaxRtrAdvInterval = interval;
zif->rtadv.MinRtrAdvInterval = 0.33 * interval; zif->rtadv.MinRtrAdvInterval = 0.33 * interval;
zif->rtadv.AdvIntervalTimer = 0; zif->rtadv.AdvIntervalTimer = 0;
@ -966,6 +974,7 @@ DEFUN (ipv6_nd_ra_interval,
/* convert to milliseconds */ /* convert to milliseconds */
interval = interval * 1000; interval = interval * 1000;
SET_FLAG(zif->rtadv.ra_configured, VTY_RA_INTERVAL_CONFIGURED);
zif->rtadv.MaxRtrAdvInterval = interval; zif->rtadv.MaxRtrAdvInterval = interval;
zif->rtadv.MinRtrAdvInterval = 0.33 * interval; zif->rtadv.MinRtrAdvInterval = 0.33 * interval;
zif->rtadv.AdvIntervalTimer = 0; zif->rtadv.AdvIntervalTimer = 0;
@ -995,9 +1004,15 @@ DEFUN (no_ipv6_nd_ra_interval,
if (zif->rtadv.MaxRtrAdvInterval % 1000) if (zif->rtadv.MaxRtrAdvInterval % 1000)
zns->rtadv.adv_msec_if_count--; zns->rtadv.adv_msec_if_count--;
zif->rtadv.MaxRtrAdvInterval = RTADV_MAX_RTR_ADV_INTERVAL; UNSET_FLAG(zif->rtadv.ra_configured, VTY_RA_INTERVAL_CONFIGURED);
zif->rtadv.MinRtrAdvInterval = RTADV_MIN_RTR_ADV_INTERVAL;
if (CHECK_FLAG(zif->rtadv.ra_configured, BGP_RA_CONFIGURED))
zif->rtadv.MaxRtrAdvInterval = 10000;
else
zif->rtadv.MaxRtrAdvInterval = RTADV_MAX_RTR_ADV_INTERVAL;
zif->rtadv.AdvIntervalTimer = zif->rtadv.MaxRtrAdvInterval; zif->rtadv.AdvIntervalTimer = zif->rtadv.MaxRtrAdvInterval;
zif->rtadv.MinRtrAdvInterval = RTADV_MIN_RTR_ADV_INTERVAL;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1552,15 +1567,20 @@ static int rtadv_config_write(struct vty *vty, struct interface *ifp)
if (!(if_is_loopback(ifp) if (!(if_is_loopback(ifp)
|| CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK))) { || CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK))) {
if (zif->rtadv.AdvSendAdvertisements) if (zif->rtadv.AdvSendAdvertisements
&& CHECK_FLAG(zif->rtadv.ra_configured, VTY_RA_CONFIGURED))
vty_out(vty, " no ipv6 nd suppress-ra\n"); vty_out(vty, " no ipv6 nd suppress-ra\n");
} }
interval = zif->rtadv.MaxRtrAdvInterval; interval = zif->rtadv.MaxRtrAdvInterval;
if (interval % 1000) if (CHECK_FLAG(zif->rtadv.ra_configured, VTY_RA_INTERVAL_CONFIGURED)) {
vty_out(vty, " ipv6 nd ra-interval msec %d\n", interval); if (interval % 1000)
else if (interval != RTADV_MAX_RTR_ADV_INTERVAL) vty_out(vty, " ipv6 nd ra-interval msec %d\n",
vty_out(vty, " ipv6 nd ra-interval %d\n", interval / 1000); interval);
else if (interval != RTADV_MAX_RTR_ADV_INTERVAL)
vty_out(vty, " ipv6 nd ra-interval %d\n",
interval / 1000);
}
if (zif->rtadv.AdvIntervalOption) if (zif->rtadv.AdvIntervalOption)
vty_out(vty, " ipv6 nd adv-interval-option\n"); vty_out(vty, " ipv6 nd adv-interval-option\n");