client+server: Terminate gracefully when receiving a signal

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/client.c b/src/client.c
index 45ea2ad3e7f7c111292a080cadaa34d306fcab82..c47653168fb7a41dd3f77f0dd6c199695f719676 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -205,6 +205,10 @@ int fireperf_client(struct fireperf_config* conf) {
        while (!conf->terminated && !timeout_expired) {
                int fds = epoll_wait(epollfd, events, EPOLL_MAX_EVENTS, -1);
                if (fds < 1) {
+                       // We terminate gracefully when we receive a signal
+                       if (errno == EINTR)
+                               break;
+
                        ERROR(conf, "epoll_wait() failed: %s\n", strerror(errno));
                        goto ERROR;
                }

diff --git a/src/server.c b/src/server.c
index 1d62a6c0d6f3847edb828e39ca353a809b821db6..bb21b6cdf404245311592e4fc3fdc2926ff5fa34 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -151,6 +151,10 @@ int fireperf_server(struct fireperf_config* conf) {
        while (!conf->terminated) {
                int fds = epoll_wait(epollfd, events, EPOLL_MAX_EVENTS, -1);
                if (fds < 1) {
+                       // We terminate gracefully when we receive a signal
+                       if (errno == EINTR)
+                               break;
+
                        ERROR(conf, "epoll_wait() failed: %s\n", strerror(errno));
                        goto ERROR;
                }