diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-02-01 15:24:53 +0000 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-02-01 15:24:53 +0000 |
| commit | d5f02454cbd702fe23c8977d49e1c5420b02e362 (patch) | |
| tree | 1a28c41774be5e142937d08ebcd347ae1fc4e614 /bgpd/bgp_msg_read.c | |
| parent | e51f1f9733ddc294bffb50fc29f25dcdebf44d6d (diff) | |
| download | quagga-d5f02454cbd702fe23c8977d49e1c5420b02e362.tar.bz2 quagga-d5f02454cbd702fe23c8977d49e1c5420b02e362.tar.xz | |
Clearing up the reaping of connections, and handling of notifications.
modified: bgpd/bgp_connection.c
modified: bgpd/bgp_fsm.c
modified: bgpd/bgp_fsm.h
modified: bgpd/bgp_msg_read.c
modified: bgpd/bgp_peer.c
modified: bgpd/bgp_session.c
Diffstat (limited to 'bgpd/bgp_msg_read.c')
| -rw-r--r-- | bgpd/bgp_msg_read.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bgpd/bgp_msg_read.c b/bgpd/bgp_msg_read.c index c134a032..eca4697e 100644 --- a/bgpd/bgp_msg_read.c +++ b/bgpd/bgp_msg_read.c @@ -158,7 +158,7 @@ bgp_msg_header_bad_len(bgp_connection connection, uint8_t type, bgp_size_t size) connection->host, size, bgp_type_name[bgp_type_map[type]]) ; - bgp_fsm_raise_exception(connection, bgp_session_eInvalid_msg, + bgp_fsm_general_exception(connection, bgp_session_eInvalid_msg, bgp_notify_new_with_data(BGP_NOMC_HEADER, BGP_NOMS_H_BAD_LEN, (void*)¬ify_size, 2)) ; } ; @@ -181,7 +181,7 @@ bgp_msg_header_bad_type(bgp_connection connection, uint8_t type) connection->host, bgp_type_name[bgp_type_map[type]]) ; } ; - bgp_fsm_raise_exception(connection, bgp_session_eInvalid_msg, + bgp_fsm_general_exception(connection, bgp_session_eInvalid_msg, bgp_notify_new_with_data(BGP_NOMC_HEADER, BGP_NOMS_H_BAD_TYPE, (void*)&type, 1)) ; } ; @@ -246,7 +246,7 @@ bgp_msg_check_header(bgp_connection connection) plog_debug (connection->log, "%s unknown message type 0x%02x", connection->host, type); - bgp_fsm_raise_exception(connection, bgp_session_eInvalid_msg, + bgp_fsm_general_exception(connection, bgp_session_eInvalid_msg, bgp_notify_new_with_data(BGP_NOMC_HEADER, BGP_NOMS_H_BAD_TYPE, (void*)&type, 1)) ; } @@ -258,7 +258,7 @@ bgp_msg_check_header(bgp_connection connection) } else { - bgp_fsm_raise_exception(connection, bgp_session_eInvalid_msg, + bgp_fsm_general_exception(connection, bgp_session_eInvalid_msg, bgp_notify_new(BGP_NOMC_HEADER, BGP_NOMS_H_NOT_SYNC, 0)) ; qt = qBGP_MT_unknown ; /* force unknown message */ size = BGP_MH_HEAD_L ; /* can stop reading, now */ @@ -503,7 +503,7 @@ bgp_msg_open_receive (bgp_connection connection, bgp_size_t body_size) connection->route_refresh = open_recv->can_r_refresh ; connection->orf_prefix = open_recv->can_orf_prefix ; - bgp_fsm_event(connection, bgp_fsm_eReceive_OPEN_message) ; + bgp_fsm_open_received(connection) ; return ; @@ -511,7 +511,7 @@ bgp_msg_open_receive (bgp_connection connection, bgp_size_t body_size) * Failed. Reject the OPEN with the required notification. */ reject: - bgp_fsm_raise_exception(connection, bgp_session_eOpen_reject, notification); + bgp_fsm_general_exception(connection, bgp_session_eOpen_reject, notification); } ; /*------------------------------------------------------------------------------ @@ -1384,7 +1384,7 @@ bgp_msg_keepalive_receive (bgp_connection connection, bgp_size_t body_size) zlog_debug ("%s KEEPALIVE rcvd", connection->host); if (body_size == 0) - bgp_fsm_event(connection, bgp_fsm_eReceive_KEEPALIVE_message); + bgp_fsm_keepalive_received(connection) ; else bgp_msg_header_bad_len(connection, BGP_MT_KEEPALIVE, body_size) ; } ; @@ -1524,7 +1524,7 @@ bgp_msg_route_refresh_receive(bgp_connection connection, bgp_size_t body_size) if (ret < 0) { - bgp_fsm_raise_exception(connection, bgp_session_eInvalid_msg, + bgp_fsm_general_exception(connection, bgp_session_eInvalid_msg, bgp_notify_new(BGP_NOMC_CEASE, BGP_NOMS_UNSPECIFIC, 0)) ; return ; } |