proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-03 16:24:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2005-01-05 Paul Jakma <paul@dishone.st>

Browse Source 
* 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.
This commit is contained in:
paul 2005-01-05 08:30:35 +00:00
parent a24a7e1b9e
commit 865b852cbf
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zebra/ChangeLog
View File

@ -1,3 +1,10 @@
2005-01-05 Paul Jakma <paul@dishone.st>
* 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.
2005-01-04 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* rtadv.c: (rtadv_recv_packet,rtadv_send_packet) Use ZCMSG_FIRSTHDR

9
zebra/kernel_socket.c
View File

@ -966,8 +966,13 @@ routing_socket ()
return;
}
if (fcntl (routing_sock, F_SETFL, O_NONBLOCK) < 0)
zlog_warn ("Can't set O_NONBLOCK to routing socket");
/* XXX: Socket should be NONBLOCK, however as we currently
* discard failed writes, this will lead to inconsistencies.
* For now, socket must be blocking.
*/
/*if (fcntl (routing_sock, F_SETFL, O_NONBLOCK) < 0)
zlog_warn ("Can't set O_NONBLOCK to routing socket");*/
if ( zserv_privs.change (ZPRIVS_LOWER) )
zlog_err ("routing_socket: Can't lower privileges");

8
zebra/zserv.c
View File

@ -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);