diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-06-13 17:37:58 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-06-13 17:37:58 +0200 |
| commit | 645bb0b10e8144a2b40201e4da6e200d5663b886 (patch) | |
| tree | c527bd7bcc578e2835b1e6e156118c76ff1cb660 /ospf6d | |
| parent | Merge pull request #687 (nexthop refactoring) (diff) | |
| parent | Merge pull request #681 (ASAN warnings) (diff) | |
| download | frr-645bb0b10e8144a2b40201e4da6e200d5663b886.tar.xz frr-645bb0b10e8144a2b40201e4da6e200d5663b886.zip | |
Merge branch 'stable/3.0'
Dropped:
redhat/README.rpm_build.md
redhat/daemons
redhat/frr.init
redhat/frr.logrotate
redhat/frr.spec.in
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_intra.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c index 5d415a68c..6acd45b7c 100644 --- a/ospf6d/ospf6_intra.c +++ b/ospf6d/ospf6_intra.c @@ -1620,6 +1620,7 @@ ospf6_intra_brouter_calculation (struct ospf6_area *oa) zlog_info ("brouter %s disappears via area %s", brouter_name, oa->name); ospf6_route_remove (brouter, oa->ospf6->brouter_table); + brouter = NULL; } else if (CHECK_FLAG (brouter->flag, OSPF6_ROUTE_ADD) || CHECK_FLAG (brouter->flag, OSPF6_ROUTE_CHANGE)) @@ -1643,8 +1644,12 @@ ospf6_intra_brouter_calculation (struct ospf6_area *oa) /* But re-originate summaries */ ospf6_abr_originate_summary (brouter); } - UNSET_FLAG (brouter->flag, OSPF6_ROUTE_ADD); - UNSET_FLAG (brouter->flag, OSPF6_ROUTE_CHANGE); + + if (brouter) + { + UNSET_FLAG (brouter->flag, OSPF6_ROUTE_ADD); + UNSET_FLAG (brouter->flag, OSPF6_ROUTE_CHANGE); + } } if (IS_OSPF6_DEBUG_BROUTER_SPECIFIC_AREA_ID (oa->area_id)) |