bgpd: fix some formatting in bgp_io.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-08-04 14:27:42 -04:00
parent 1588f6f441
commit 85145b6264
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F

View File

@ -478,59 +478,48 @@ static uint16_t bgp_read(struct peer *peer)
nbytes = stream_read_try(peer->ibuf_work, peer->fd, readsize); nbytes = stream_read_try(peer->ibuf_work, peer->fd, readsize);
if (nbytes <= 0) // handle errors switch (nbytes) {
{ /* Fatal error; tear down session */
switch (nbytes) { case -1:
case -1: // fatal error; tear down the session zlog_err("%s [Error] bgp_read_packet error: %s", peer->host,
zlog_err("%s [Error] bgp_read_packet error: %s", safe_strerror(errno));
peer->host, safe_strerror(errno));
if (peer->status == Established) { if (peer->status == Established) {
if (CHECK_FLAG(peer->sflags, if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_MODE)) {
PEER_STATUS_NSF_MODE)) { peer->last_reset = PEER_DOWN_NSF_CLOSE_SESSION;
peer->last_reset = SET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT);
PEER_DOWN_NSF_CLOSE_SESSION; } else
SET_FLAG(peer->sflags, peer->last_reset = PEER_DOWN_CLOSE_SESSION;
PEER_STATUS_NSF_WAIT);
} else
peer->last_reset =
PEER_DOWN_CLOSE_SESSION;
}
BGP_EVENT_ADD(peer, TCP_fatal_error);
SET_FLAG(status, BGP_IO_FATAL_ERR);
break;
case 0: // TCP session closed
if (bgp_debug_neighbor_events(peer))
zlog_debug(
"%s [Event] BGP connection closed fd %d",
peer->host, peer->fd);
if (peer->status == Established) {
if (CHECK_FLAG(peer->sflags,
PEER_STATUS_NSF_MODE)) {
peer->last_reset =
PEER_DOWN_NSF_CLOSE_SESSION;
SET_FLAG(peer->sflags,
PEER_STATUS_NSF_WAIT);
} else
peer->last_reset =
PEER_DOWN_CLOSE_SESSION;
}
BGP_EVENT_ADD(peer, TCP_connection_closed);
SET_FLAG(status, BGP_IO_FATAL_ERR);
break;
case -2: // temporary error; come back later
SET_FLAG(status, BGP_IO_TRANS_ERR);
break;
default:
break;
} }
return status; BGP_EVENT_ADD(peer, TCP_fatal_error);
SET_FLAG(status, BGP_IO_FATAL_ERR);
break;
/* Received EOF / TCP session closed */
case 0:
if (bgp_debug_neighbor_events(peer))
zlog_debug("%s [Event] BGP connection closed fd %d",
peer->host, peer->fd);
if (peer->status == Established) {
if (CHECK_FLAG(peer->sflags, PEER_STATUS_NSF_MODE)) {
peer->last_reset = PEER_DOWN_NSF_CLOSE_SESSION;
SET_FLAG(peer->sflags, PEER_STATUS_NSF_WAIT);
} else
peer->last_reset = PEER_DOWN_CLOSE_SESSION;
}
BGP_EVENT_ADD(peer, TCP_connection_closed);
SET_FLAG(status, BGP_IO_FATAL_ERR);
break;
/* EAGAIN or EWOULDBLOCK; come back later */
case -2:
SET_FLAG(status, BGP_IO_TRANS_ERR);
break;
default:
break;
} }
return status; return status;