diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-01-21 12:43:28 +0000 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-01-21 12:43:28 +0000 |
| commit | 019a15f07196fd6c9546b9bc3f33139b64eb8ace (patch) | |
| tree | 1fb3cf067f834fb3c659ccaf5961fa2459505fe0 | |
| parent | 11e2451d43976e39503c7cc571d6acd7a3a4bd2a (diff) | |
| download | quagga-019a15f07196fd6c9546b9bc3f33139b64eb8ace.tar.bz2 quagga-019a15f07196fd6c9546b9bc3f33139b64eb8ace.tar.xz | |
Weed out last vestiges of FSM setting session->state.
| -rw-r--r-- | bgpd/bgp_fsm.c | 5 | ||||
| -rw-r--r-- | bgpd/bgp_session.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index 35cbbfa1..d26e7e6e 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -2031,10 +2031,7 @@ static bgp_fsm_action(bgp_fsm_establish) /* Establish self as primary and copy state up to session */ bgp_connection_make_primary(connection) ; - /* Change the session state and post event */ - assert(session->state == bgp_session_sEnabled) ; - - session->state = bgp_session_sEstablished ; + /* Post exciting session event */ bgp_fsm_post_exception(connection, bgp_session_eEstablished, NULL, 0) ; /* TODO: now would be a good time to withdraw the password from listener ? */ diff --git a/bgpd/bgp_session.c b/bgpd/bgp_session.c index 83fc419a..2b22b596 100644 --- a/bgpd/bgp_session.c +++ b/bgpd/bgp_session.c @@ -305,8 +305,6 @@ bgp_session_do_enable(mqueue_block mqb, mqb_flag_t flag) BGP_SESSION_LOCK(session) ; /*<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ - assert(session->state == bgp_session_sEnabled) ; - session->active = 1 ; bgp_fsm_enable_session(session) ; |