nDPIsrvd collectd-exec overhaul.

 * Install targets updated.
 * Removed nDPIsrvd.h token validation function (done automatically by token_get).

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/nDPIsrvd.c b/nDPIsrvd.c
index 082a5c53a..0d51bce00 100644
--- a/nDPIsrvd.c
+++ b/nDPIsrvd.c
@@ -719,20 +719,22 @@ int main(int argc, char ** argv)
         goto error;
     }
 
-    struct epoll_event accept_event = {};
-    accept_event.data.fd = json_sockfd;
-    accept_event.events = EPOLLIN;
-    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, json_sockfd, &accept_event) < 0)
     {
-        syslog(LOG_DAEMON | LOG_ERR, "Error adding JSON fd to epoll: %s", strerror(errno));
-        goto error;
+        struct epoll_event accept_event = {.data.fd = json_sockfd, .events = EPOLLIN};
+        if (epoll_ctl(epollfd, EPOLL_CTL_ADD, json_sockfd, &accept_event) < 0)
+        {
+            syslog(LOG_DAEMON | LOG_ERR, "Error adding JSON fd to epoll: %s", strerror(errno));
+            goto error;
+        }
     }
-    accept_event.data.fd = serv_sockfd;
-    accept_event.events = EPOLLIN;
-    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, serv_sockfd, &accept_event) < 0)
+
     {
-        syslog(LOG_DAEMON | LOG_ERR, "Error adding INET fd to epoll: %s", strerror(errno));
-        goto error;
+        struct epoll_event accept_event = {.data.fd = serv_sockfd, .events = EPOLLIN};
+        if (epoll_ctl(epollfd, EPOLL_CTL_ADD, serv_sockfd, &accept_event) < 0)
+        {
+            syslog(LOG_DAEMON | LOG_ERR, "Error adding INET fd to epoll: %s", strerror(errno));
+            goto error;
+        }
     }
 
     retval = mainloop(epollfd);