diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:28:12 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:28:12 +0200 |
| commit | 57463530f3f8b687f238bc76020c0f168b19f0a8 (patch) | |
| tree | 820493847a8e55e5ceaa0742e996ae55bd49b7e0 /bgpd/bgp_fsm.c | |
| parent | Merge branch 'frr/pull/546' ("bgpd: resolve issue with sending vpn labels") (diff) | |
| parent | Merge branch 'frr/pull/575' (diff) | |
| download | frr-57463530f3f8b687f238bc76020c0f168b19f0a8.tar.xz frr-57463530f3f8b687f238bc76020c0f168b19f0a8.zip | |
Merge branch 'stable/3.0'
Conflicts:
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/interface.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_fsm.c')
| -rw-r--r-- | bgpd/bgp_fsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index c553af6d1..a25e0be22 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -1025,7 +1025,7 @@ bgp_stop (struct peer *peer) zlog_info ("%%ADJCHANGE: neighbor %s(%s) in vrf %s Down %s", peer->host, (peer->hostname) ? peer->hostname : "Unknown", - (vrf->vrf_id != VRF_DEFAULT) ? vrf->name : "Default", + vrf ? ((vrf->vrf_id != VRF_DEFAULT) ? vrf->name : "Default") : "", peer_down_str [(int) peer->last_reset]); } |