bgpd: transfer raw input buffer to new peer

During initial session establishment, bgpd performs a "connection
transfer" to a new peer struct if the connection was initiated passively
(i.e. by the remote peer). With the addition of buffered input, I forgot
to transfer the raw input buffer to the new peer. This resulted in
infrequent failures during session handshaking whereby half of a packet
would be thrown away in the middle of a read causing us to send a NOTIFY
for an unsynchronized header. Usually the transfer coincided with a
clean input buffer, hence why it only showed up once in a while.

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index f7c031610d0fcbaf1af50ff47b5906f9557361ef..b97bebd7bb22407f13de2966e55f4f30351a1469 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -181,6 +181,8 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
                while (from_peer->ibuf->head)
                        stream_fifo_push(peer->ibuf,
                                         stream_fifo_pop(from_peer->ibuf));
+
+               stream_copy(peer->ibuf_work, from_peer->ibuf_work);
        }
        pthread_mutex_unlock(&from_peer->io_mtx);
        pthread_mutex_unlock(&peer->io_mtx);

diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c
index 8ce6276c033fd96476fd46dd4c62ce2890ce1855..80e7f13dab4676c3363ad9c6c79dd27a7158a5ab 100644 (file)
--- a/bgpd/bgp_io.c
+++ b/bgpd/bgp_io.c
@@ -155,7 +155,6 @@ void bgp_reads_on(struct peer *peer)
        assert(peer->ibuf);
        assert(peer->fd);
        assert(peer->ibuf_work);
-       assert(stream_get_endp(peer->ibuf_work) == 0);
        assert(peer->obuf);
        assert(!peer->t_connect_check_r);
        assert(!peer->t_connect_check_w);