diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2012-06-08 15:01:11 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2012-06-08 15:01:11 +0100 |
| commit | 58b4a3411f12d3ef34ef52ab197729887074f321 (patch) | |
| tree | e456eec427d977e2e723039b83d614d13edcf983 /lib/vty_io_basic.h | |
| parent | 12d01b8b9c68f5dc72f2accdb29a760feb31420a (diff) | |
| download | quagga-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_basic.h')
| -rw-r--r-- | lib/vty_io_basic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/vty_io_basic.h b/lib/vty_io_basic.h index 5c122873..3f731905 100644 --- a/lib/vty_io_basic.h +++ b/lib/vty_io_basic.h @@ -124,6 +124,8 @@ struct vio_vfd vfd_type_t type ; /* used for half-close */ vfd_io_type_t io_type ; /* read, write, read/write */ + bool failed ; /* avoid repeated error messages */ + /* The rest of the vfd is to do with managing read/write ready and * read/write timeouts for *non* blocking vfd. * @@ -219,6 +221,7 @@ extern vio_vfd vio_vfd_new(int fd, vfd_type_t type, extern void vio_vfd_set_read_action(vio_vfd vfd, vio_vfd_action* action) ; extern void vio_vfd_set_write_action(vio_vfd vfd, vio_vfd_action* action) ; extern void vio_vfd_set_action_info(vio_vfd vfd, void* action_info) ; +extern void vio_vfd_set_failed(vio_vfd vfd) ; extern vio_vfd vio_vfd_read_close(vio_vfd vfd) ; extern vio_vfd vio_vfd_close(vio_vfd vfd) ; extern on_off_b vio_vfd_set_read(vio_vfd vfd, on_off_b how, |