From 944f922aebac63e0a668b4d9abae418a57a6720d Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sun, 22 Nov 2015 19:39:29 +0100 Subject: Bugfixes * src/ctl.c (cmd_reboot, ctl_shutdown): Use code 221 to indicate that we are going to close clonnection (ctlwr): Check return from write. * src/pies.c: Handle SIGPIPE --- src/ctl.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/ctl.c') diff --git a/src/ctl.c b/src/ctl.c index eef1aae..f9f2d76 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -893,7 +893,7 @@ cmd_reboot (struct ctlio *io, size_t argc, char **argv) { io->action = ACTION_RESTART; io->state = CTL_ACTION_STATE; - ctlio_reply (io, "250", "Rebooting, closing connection"); + ctlio_reply (io, "221", "Rebooting, closing connection"); } static void @@ -901,7 +901,7 @@ cmd_shutdown (struct ctlio *io, size_t argc, char **argv) { io->action = ACTION_STOP; io->state = CTL_ACTION_STATE; - ctlio_reply (io, "250", "Shuttign down, connection will be closed"); + ctlio_reply (io, "221", "Shutting down, connection will be closed"); } static int ctlrd (int fd, void *data); @@ -951,7 +951,17 @@ ctlwr (int fd, void *data) struct ctlio *io = data; // logmsg (LOG_DEBUG, "%s called", __FUNCTION__); if (ctlbuf_read (&io->obuf, &c, 1)) - write (fd, &c, 1); + { + ssize_t rc = write (fd, &c, 1); + if (rc != 1) { + if (rc == 0) + logmsg (LOG_ERR, "error writing to control socket"); + else + logmsg (LOG_ERR, "error writing to control socket: %s", + strerror (errno)); + return ctlio_end (fd, io); + } + } else if (io->state == CTL_END_STATE) return ctlio_end (fd, io); else if (io->state == CTL_ACTION_STATE) -- cgit v1.2.1