proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 03:27:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15055 from opensourcerouting/fix/zebra_ipv6_ll_configured

Browse Source 
zebra: Push all configured IP addresses when the interface comes up
This commit is contained in:
Russ White 2024-01-02 10:42:08 -05:00 committed by GitHub
commit 2e69afd9da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
zebra/interface.c
View File

@ -1054,6 +1054,8 @@ void if_up(struct interface *ifp, bool install_connected)
event_add_timer(zrouter.master, if_zebra_speed_update, ifp, 0, event_add_timer(zrouter.master, if_zebra_speed_update, ifp, 0,
&zif->speed_update); &zif->speed_update);
event_ignore_late_timer(zif->speed_update); event_ignore_late_timer(zif->speed_update);
if_addr_wakeup(ifp);
} }
/* Interface goes down. We have to manage different behavior of based /* Interface goes down. We have to manage different behavior of based
@ -2498,28 +2500,21 @@ static void ifs_dump_brief_vty(struct vty *vty, struct vrf *vrf)
v6_list_size++; v6_list_size++;
} }
frr_each (if_connected, ifp->connected, connected) { frr_each (if_connected, ifp->connected, connected) {
if (CHECK_FLAG(connected->conf, ZEBRA_IFC_REAL) if (!CHECK_FLAG(connected->flags, ZEBRA_IFA_SECONDARY) &&
&& !CHECK_FLAG(connected->flags, (connected->address->family == AF_INET6)) {
ZEBRA_IFA_SECONDARY)
&& (connected->address->family == AF_INET6)) {
p = connected->address; p = connected->address;
/* Don't print link local pfx */ if (first_pfx_printed) {
if (!IN6_IS_ADDR_LINKLOCAL(&p->u.prefix6)) { vty_out(vty, "%-40s", "");
if (first_pfx_printed) { if (v6_list_size > 1)
/* padding to prepare row only vty_out(vty, "+ ");
* for ip addr */ vty_out(vty, "%pFX\n", p);
vty_out(vty, "%-40s", ""); } else {
if (v6_list_size > 1) if (v6_list_size > 1)
vty_out(vty, "+ "); vty_out(vty, "+ ");
vty_out(vty, "%pFX\n", p); vty_out(vty, "%pFX\n", p);
} else {
if (v6_list_size > 1)
vty_out(vty, "+ ");
vty_out(vty, "%pFX\n", p);
}
first_pfx_printed = true;
break;
} }
first_pfx_printed = true;
break;
} }
} }
if (!first_pfx_printed) if (!first_pfx_printed)
@ -2547,12 +2542,7 @@ static void ifs_dump_brief_vty_json(json_object *json, struct vrf *vrf)
json_addrs = json_object_new_array(); json_addrs = json_object_new_array();
json_object_object_add(json_if, "addresses", json_addrs); json_object_object_add(json_if, "addresses", json_addrs);
frr_each (if_connected, ifp->connected, connected) { frr_each (if_connected, ifp->connected, connected) {
if (CHECK_FLAG(connected->conf, ZEBRA_IFC_REAL) if (!CHECK_FLAG(connected->flags, ZEBRA_IFA_SECONDARY)) {
&& !CHECK_FLAG(connected->flags,
ZEBRA_IFA_SECONDARY)
&& !(connected->address->family == AF_INET6
&& IN6_IS_ADDR_LINKLOCAL(
&connected->address->u.prefix6))) {
char buf[PREFIX2STR_BUFFER]; char buf[PREFIX2STR_BUFFER];
json_array_string_add( json_array_string_add(
@ -2760,8 +2750,7 @@ static void if_dump_vty(struct vty *vty, struct interface *ifp)
} }
frr_each (if_connected, ifp->connected, connected) { frr_each (if_connected, ifp->connected, connected) {
if (CHECK_FLAG(connected->conf, ZEBRA_IFC_REAL) if (connected->address->family == AF_INET6)
&& (connected->address->family == AF_INET6))
connected_dump_vty(vty, NULL, connected); connected_dump_vty(vty, NULL, connected);
} }
@ -3137,8 +3126,7 @@ static void if_dump_vty_json(struct vty *vty, struct interface *ifp,
} }
frr_each (if_connected, ifp->connected, connected) { frr_each (if_connected, ifp->connected, connected) {
if (CHECK_FLAG(connected->conf, ZEBRA_IFC_REAL) if (connected->address->family == AF_INET6)
&& (connected->address->family == AF_INET6))
connected_dump_vty(vty, json_addrs, connected); connected_dump_vty(vty, json_addrs, connected);
} }