From 51e681afa31d57afa047dfb2abdf4fea9c98eda1 Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 5 Jan 2005 08:30:35 +0000 Subject: 2005-01-05 Paul Jakma * zserv.c: (zebra_accept) Comment out setting of socket to NONBLOCK for now, as we dont actually deal with with resending.... See bugzilla #122, fix from wawa@yandex-team.ru (Vladimir Ivanov). * kernel_socket.c: (routing_socket) ditto. --- zebra/zserv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'zebra/zserv.c') diff --git a/zebra/zserv.c b/zebra/zserv.c index 47eb49a4..10616b41 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1374,10 +1374,14 @@ zebra_accept (struct thread *thread) } /* Make client socket non-blocking. */ - + /* XXX: We dont requeue failed writes, so this leads to inconsistencies. + * for now socket must remain blocking, regardless of risk of deadlocks. + */ + /* val = fcntl (client_sock, F_GETFL, 0); fcntl (client_sock, F_SETFL, (val | O_NONBLOCK)); - + */ + /* Create new zebra client. */ zebra_client_create (client_sock); -- cgit v1.2.3