diff options
| -rw-r--r-- | proto/bgp/bgp.c | 9 | ||||
| -rw-r--r-- | proto/bgp/packets.c | 4 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 378cc85d..253322c6 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -434,6 +434,15 @@ bgp_sock_err(sock *sk, int err) struct bgp_conn *conn = sk->data; struct bgp_proto *p = conn->bgp; + /* + * This error hook may be called either asynchronously from main + * loop, or synchronously from sk_send(). But sk_send() is called + * only from bgp_tx() and bgp_kick_tx(), which are both called + * asynchronously from main loop. Moreover, they end if err hook is + * called. Therefore, we could suppose that it is always called + * asynchronously. + */ + bgp_store_error(p, conn, BE_SOCKET, err); if (err) diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index 21601825..1e9d6465 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -594,7 +594,7 @@ bgp_kick_tx(void *vconn) struct bgp_conn *conn = vconn; DBG("BGP: kicking TX\n"); - while (bgp_fire_tx(conn)) + while (bgp_fire_tx(conn) > 0) ; } @@ -604,7 +604,7 @@ bgp_tx(sock *sk) struct bgp_conn *conn = sk->data; DBG("BGP: TX hook\n"); - while (bgp_fire_tx(conn)) + while (bgp_fire_tx(conn) > 0) ; } diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index dc7146f5..456644b2 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -1216,7 +1216,8 @@ sk_maybe_write(sock *s) if (errno != EINTR && errno != EAGAIN) { reset_tx_buffer(s); - s->err_hook(s, errno); + /* EPIPE is just a connection close notification during TX */ + s->err_hook(s, (errno != EPIPE) ? errno : 0); return -1; } return 0; |