diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:15:04 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:23:13 +0200 |
| commit | 92eedda1fb1b9c9fb2c31153677a033bee4573d3 (patch) | |
| tree | d99e2aa0ac3346dc20c766026e717cf69b0abbbb /bgpd/bgp_fsm.c | |
| parent | Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes") (diff) | |
| parent | Pre-revert nonmergeable changes (diff) | |
| download | frr-92eedda1fb1b9c9fb2c31153677a033bee4573d3.tar.xz frr-92eedda1fb1b9c9fb2c31153677a033bee4573d3.zip | |
Merge branch stable/2.0 into stable/3.0
Conflicts:
bgpd/bgp_fsm.c
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/redistribute.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 424eec55c..fbca83c75 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -1026,7 +1026,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]); } |