]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #9028 from mobash-rasool/ospfv3-asbr-summarisation
authorRuss White <russ@riw.us>
Fri, 30 Jul 2021 10:37:50 +0000 (06:37 -0400)
committerGitHub <noreply@github.com>
Fri, 30 Jul 2021 10:37:50 +0000 (06:37 -0400)
Ospfv3 ASBR summarisation feature

13 files changed:
1  2 
doc/user/ospf6d.rst
ospf6d/ospf6_abr.c
ospf6d/ospf6_asbr.c
ospf6d/ospf6_flood.c
ospf6d/ospf6_interface.c
ospf6d/ospf6_intra.c
ospf6d/ospf6_nssa.c
ospf6d/ospf6_route.c
ospf6d/ospf6_route.h
ospf6d/ospf6_top.c
ospf6d/ospf6_top.h
ospf6d/subdir.am
tests/topotests/lib/ospf.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 80f0e7d26bf791891b2f2d28577b6b56a8fd2bd8,43de870ad7391c662da5190b8817c6770fa1765f..cd3139d28a54c650463a575f6b95a506a053bc7b
@@@ -433,10 -484,9 +484,10 @@@ struct ospf6_route *ospf6_route_copy(st
  {
        struct ospf6_route *new;
  
-       new = ospf6_route_create();
+       new = ospf6_route_create(route->ospf6);
        new->type = route->type;
        memcpy(&new->prefix, &route->prefix, sizeof(struct prefix));
 +      new->prefix_options = route->prefix_options;
        new->installed = route->installed;
        new->changed = route->changed;
        new->flag = route->flag;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge