diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-09-19 19:31:21 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-09-19 19:39:49 +0200 |
| commit | 08f263e40981483e96fab9d7c864722abe45df0d (patch) | |
| tree | 939dfce1c2f18a37cb355de5413f8b9852a220e7 /nDPIsrvd.c | |
| parent | 015a739efda638737adeed521ca5ba43708949f0 (diff) | |
nDPId: Reduced flow-updates for TCP flows to 1/4 of the timeout value.
* nDPId: Fixed broken validation tests.
* nDPId: Removed TICK_RESOLUTION, not required anymore.
* c-collectd: Improved total layer4 payload calculation/update handling.
* c-collectd: Updated RRD Graph script according to total layer4 payload changes.
* py-flow-info.py: Fixed several bugs and syntax errors.
* Python scripts: Added dirname(argv[0]) as search path for nDPIsrvd.py.
* nDPIsrvd&nDPId-test: Fixed missing EPOLLERR check.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'nDPIsrvd.c')
| -rw-r--r-- | nDPIsrvd.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nDPIsrvd.c b/nDPIsrvd.c index df0c76b41..7053570ea 100644 --- a/nDPIsrvd.c +++ b/nDPIsrvd.c @@ -1293,12 +1293,6 @@ static int handle_data_event(int epollfd, struct epoll_event * const event) if ((event->events & EPOLLIN) == 0 && (event->events & EPOLLOUT) == 0) { -#ifdef NO_MAIN - if ((event->events & EPOLLHUP) != 0) - { - return 1; - } -#endif logger(1, "Can not handle event mask: %d", event->events); return 1; } @@ -1370,7 +1364,7 @@ static int mainloop(int epollfd) for (int i = 0; i < nready; i++) { - if (events[i].events & EPOLLERR || events[i].events & EPOLLHUP) + if ((events[i].events & EPOLLERR) != 0 || (events[i].events & EPOLLHUP) != 0) { if (events[i].data.fd != collector_un_sockfd && events[i].data.fd != distributor_un_sockfd && events[i].data.fd != distributor_in_sockfd) |