diff options
Diffstat (limited to 'bgpd/bgp_connection.c')
| -rw-r--r-- | bgpd/bgp_connection.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bgpd/bgp_connection.c b/bgpd/bgp_connection.c index d7997dba..24c86230 100644 --- a/bgpd/bgp_connection.c +++ b/bgpd/bgp_connection.c @@ -20,8 +20,9 @@ */ #include <zebra.h> -#include "bgpd/bgp_connection.h" +#include "misc.h" +#include "bgpd/bgp_connection.h" #include "bgpd/bgpd.h" #include "bgpd/bgp_fsm.h" #include "bgpd/bgp_engine.h" @@ -154,7 +155,7 @@ bgp_connection_init_new(bgp_connection connection, bgp_session session, /* Link back to session, point at its mutex and point session here */ connection->session = session ; - connection->p_mutex = &session->mutex ; + connection->p_mutex = session->mutex ; connection->lock_count = 0 ; /* no question about it */ connection->ordinal = ordinal ; @@ -347,7 +348,7 @@ bgp_connection_free(bgp_connection connection) /* Free any components which still exist */ connection->qf = qps_file_free(connection->qf) ; connection->hold_timer = qtimer_free(connection->hold_timer) ; - connection->keepalive_timer = qtimer_free(connection->hold_timer) ; + connection->keepalive_timer = qtimer_free(connection->keepalive_timer) ; bgp_notify_unset(&connection->notification) ; bgp_open_state_unset(&connection->open_recv) ; @@ -678,7 +679,7 @@ bgp_connection_stop(bgp_connection connection, bool stop_writer) connection->notification_pending = 0 ; /* Empty out the pending queue and remove from connection queue */ - mqueue_local_reset_keep(&connection->pending_queue) ; + mqueue_local_reset(&connection->pending_queue, keep_it) ; bgp_connection_queue_del(connection) ; /* If required: set write buffer *unwritable* (and empty). */ |