summaryrefslogtreecommitdiffstats
path: root/lib/vty_io.h
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2012-06-08 15:01:11 +0100
committerChris Hall <chris.hall@highwayman.com>2012-06-08 15:01:11 +0100
commit58b4a3411f12d3ef34ef52ab197729887074f321 (patch)
treee456eec427d977e2e723039b83d614d13edcf983 /lib/vty_io.h
parent12d01b8b9c68f5dc72f2accdb29a760feb31420a (diff)
downloadquagga-ex25b.tar.bz2
quagga-ex25b.tar.xz
Fix bugs in vty error handlingex25b
Advance version to 0.99.20ex25b. Bug fixes: * when closing a vty, if close() returned an error, the vtys would fall into a loop trying to recover. This was found on FreeBSD, which will return ECONNRESET on close(), which is not standard POSIX behaviour. * when closing a vty in response to EPIPE or ECONNRESET, managed to leave the vty mutex locked. This stopped the Routing Engine *dead* on the next CLI command that required the Routing Engine. SIGTERM/SIGINT would not stop bgpd -- a SIGKILL would be required. Other changes: * toned down the error reporting of EPIPE in the vty -- so no longer looks like an error... ...closing a vty by "exit" command is logged as "closed" ...closing a vty in response to the client closing their end of the connection is logged as "terminated: terminal closed", and no longer logs an EPIPE error. * changed error reporting on close() and shutdown() for vty, so that nothing is logged if an i/o error has already logged... ...so that redundant error messages are suppressed. * applied slightly finer jittering to bgpd timers. * work in progress on new vtysh.
Diffstat (limited to 'lib/vty_io.h')
-rw-r--r--lib/vty_io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vty_io.h b/lib/vty_io.h
index 3594d025..13139af3 100644
--- a/lib/vty_io.h
+++ b/lib/vty_io.h
@@ -375,7 +375,7 @@ struct vio_vf
/* General I/O
*
* Once an error has been posted -- see uty_vf_error() -- it is curtains
- * for the vio_vf. The io_error flag is to prevent multiple errors being
+ * for the vio_vf. The had_error flag is to prevent multiple errors being
* posted for the same vio_vf, because after the first error any subsequent
* errors are most likely a consequence of the first.
*
@@ -397,7 +397,7 @@ struct vio_vf
* line, or to return CMD_WAITING, which will then wait for some I/O to
* complete and signal the command loop to proceed.
*/
- bool io_error ; /* an I/O or timeout posted */
+ bool had_error ; /* an error has been posted */
bool blocking ; /* all I/O is blocking, pseudo or real */