summaryrefslogtreecommitdiff
path: root/bgpd
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2008-10-02 16:27:16 +0100
committerPaul Jakma <paul@quagga.net>2008-10-02 16:27:16 +0100
commit8c1bbc7205c5e2a0266e0bf9af42862cf730fbcf (patch)
tree0c433d2128c492302df16b9a20501be4cfd66c66 /bgpd
parent5635b778afcb3b6b3560871a292dc789f8dca5e9 (diff)
parent6e1992638864c3847d35bf9442989bce4c81de13 (diff)
Merge branch 'bgpd/fsm'
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_packet.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 271a21a0..1422bad6 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1304,8 +1304,8 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
}
else if (ret == 0 && realpeer->status != Active
&& realpeer->status != OpenSent
- && realpeer->status != OpenConfirm)
-
+ && realpeer->status != OpenConfirm
+ && realpeer->status != Connect)
{
/* XXX: This is an awful problem..
*
@@ -1363,8 +1363,9 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
}
if (BGP_DEBUG (events, EVENTS))
- zlog_debug ("%s [Event] Transfer temporary BGP peer to existing one",
- peer->host);
+ zlog_debug ("%s [Event] Transfer accept BGP peer to real (state %s)",
+ peer->host,
+ LOOKUP (bgp_status_msg, realpeer->status));
bgp_stop (realpeer);