From: paul Date: Wed, 5 Jan 2005 08:14:13 +0000 (+0000) Subject: 2005-01-05 Paul Jakma X-Git-Tag: frr-2.0-rc1~3254 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a24a7e1b9e145d4c855d0aa4d919a79f598c645b;p=mirror%2Ffrr.git 2005-01-05 Paul Jakma * bgp_packet.c: (bgp_write) set socket to nonblock while writing this should be generalised. See bugzilla #102. Fix supplied by wawa@yandex-team.ru (Vladimir Ivanov). --- diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog index b9d0cd5923..79414defb8 100644 --- a/bgpd/ChangeLog +++ b/bgpd/ChangeLog @@ -1,3 +1,9 @@ +2005-01-05 Paul Jakma + + * bgp_packet.c: (bgp_write) set socket to nonblock while writing + this should be generalised. See bugzilla #102. Fix supplied by + wawa@yandex-team.ru (Vladimir Ivanov). + 2004-12-08 Andrew J. Schorr * *.c: Change level of debug messages to LOG_DEBUG. diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 4eb7050c0f..5640e2b7b0 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -566,10 +566,17 @@ bgp_write (struct thread *thread) while (1) { int writenum; + int val; s = bgp_write_packet (peer); if (! s) return 0; + + /* XXX: FIXME, the socket should be NONBLOCK from the start + * status shouldnt need to be toggled on each write + */ + val = fcntl (peer->fd, F_GETFL, 0); + fcntl (peer->fd, F_SETFL, val|O_NONBLOCK); /* Number of bytes to be sent. */ writenum = stream_get_endp (s) - stream_get_getp (s); @@ -577,6 +584,7 @@ bgp_write (struct thread *thread) /* Call write() system call. */ num = write (peer->fd, STREAM_PNT (s), writenum); write_errno = errno; + fcntl (peer->fd, F_SETFL, val); if (num <= 0) { /* Partial write. */