proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 21:01:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10825 from fdumontet6WIND/ospfdefaultoriginatedissue2

Browse Source 
ospfd: fix ospf default route wrongly sent back
This commit is contained in:
Russ White 2022-03-29 11:29:51 -04:00 committed by GitHub
commit 1ab250f173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospfd/ospf_zebra.c
View File

@ -1280,6 +1280,7 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
{ {
struct zapi_route api; struct zapi_route api;
struct prefix_ipv4 p; struct prefix_ipv4 p;
struct prefix pgen;
unsigned long ifindex; unsigned long ifindex;
struct in_addr nexthop; struct in_addr nexthop;
struct external_info *ei; struct external_info *ei;
@ -1302,13 +1303,17 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS)
if (IPV4_NET127(ntohl(p.prefix.s_addr))) if (IPV4_NET127(ntohl(p.prefix.s_addr)))
return 0; return 0;
pgen.family = p.family;
pgen.prefixlen = p.prefixlen;
pgen.u.prefix4 = p.prefix;
/* Re-destributed route is default route. /* Re-destributed route is default route.
* Here, route type is used as 'ZEBRA_ROUTE_KERNEL' for * Here, route type is used as 'ZEBRA_ROUTE_KERNEL' for
* updating ex-info. But in resetting (no default-info * updating ex-info. But in resetting (no default-info
* originate)ZEBRA_ROUTE_MAX is used to delete the ex-info. * originate)ZEBRA_ROUTE_MAX is used to delete the ex-info.
* Resolved this inconsistency by maintaining same route type. * Resolved this inconsistency by maintaining same route type.
*/ */
if (is_default_prefix4(&p)) if ((is_default_prefix(&pgen)) && (api.type != ZEBRA_ROUTE_OSPF))
rt_type = DEFAULT_ROUTE; rt_type = DEFAULT_ROUTE;
if (IS_DEBUG_OSPF(zebra, ZEBRA_REDISTRIBUTE)) if (IS_DEBUG_OSPF(zebra, ZEBRA_REDISTRIBUTE))