diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:00:46 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:30:17 +0100 |
| commit | f4b356490dc03d3758b50da11b1548254fb56138 (patch) | |
| tree | ead2e56720973f2f1c7eebe0ae032f2c826bc328 /bgpd/bgp_network.c | |
| parent | 7d5fe54553c735a12e3fc40c3d9f0e59c79a33c6 (diff) | |
| parent | 2442cdc3064f87860972ce6397fbaab52e200a00 (diff) | |
| download | quagga-f4b356490dc03d3758b50da11b1548254fb56138.tar.bz2 quagga-f4b356490dc03d3758b50da11b1548254fb56138.tar.xz | |
Merge branch 'patches/sh_bgp-write-cork' into dn42
Conflicts:
lib/sockunion.c
Diffstat (limited to 'bgpd/bgp_network.c')
| -rw-r--r-- | bgpd/bgp_network.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index be01bbd6..83b1142e 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -150,6 +150,7 @@ bgp_accept (struct thread *thread) zlog_err ("[Error] BGP socket accept failed (%s)", safe_strerror (errno)); return -1; } + set_nonblocking (bgp_sock); if (BGP_DEBUG (events, EVENTS)) zlog_debug ("[Event] BGP connection from host %s", inet_sutop (&su, buf)); |