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

2004-10-29 Paul Jakma <paul@dishone.st>

Browse Source 
* vty.c: Move setting of sock to O_NONBLOCK from vty_serv_un
	  to vtysh_accept, where sock is the actual fd we wanted to set to
          O_NONBLOCK, ie the /connected/ vtysh unix socket.
This commit is contained in:
paul 2004-10-29 08:29:36 +00:00
parent 28f79728b6
commit dccfb1902c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ChangeLog
View File

@ -1,3 +1,9 @@
2004-10-29 Paul Jakma <paul@dishone.st>
* vty.c: Move setting of sock to O_NONBLOCK from vty_serv_un
to vtysh_accept, where sock is the actual fd we wanted to set to
O_NONBLOCK, ie the /connected/ vtysh unix socket.
2004-10-23 Hasso Tepper <hasso at quagga.net>
* zclient.c: Unbreak reading interface update message. Might fix

12
lib/vty.c
View File

@ -1902,12 +1902,6 @@ vty_serv_un (const char *path)
return;
}
/* set to non-blocking*/
if ( ((flags = fcntl (sock, F_GETFL)) == -1)
|| (fcntl (sock, F_SETFL, flags|O_NONBLOCK) == -1) )
zlog_warn ("vty_serv_un: could not set vty socket to non-blocking,"
" %s", strerror (errno));
umask (old_mask);
zprivs_get_ids(&ids);
@ -1952,6 +1946,12 @@ vtysh_accept (struct thread *thread)
return -1;
}
/* set to non-blocking*/
if ( ((flags = fcntl (sock, F_GETFL)) == -1)
|| (fcntl (sock, F_SETFL, flags|O_NONBLOCK) == -1) )
zlog_warn ("vty_serv_un: could not set vty socket to non-blocking,"
" %s", strerror (errno));
#ifdef VTYSH_DEBUG
printf ("VTY shell accept\n");
#endif /* VTYSH_DEBUG */