diff -Naur dsc-200706121022.orig/collector/dsc/lookup3.c dsc-200706121022/collector/dsc/lookup3.c --- dsc-200706121022.orig/collector/dsc/lookup3.c 2007-05-14 22:03:22.000000000 +0200 +++ dsc-200706121022/collector/dsc/lookup3.c 2007-12-04 18:33:53.920025000 +0100 @@ -37,7 +37,7 @@ #include /* defines printf for tests */ #include /* defines time_t for timings in the test */ -#include /* defines uint32_t etc */ +#include /* defines uint32_t etc */ #include /* attempt to define endianness */ #ifdef linux # include /* attempt to define endianness */ diff -Naur dsc-200706121022.orig/collector/dsc/pcap.c dsc-200706121022/collector/dsc/pcap.c --- dsc-200706121022.orig/collector/dsc/pcap.c 2007-06-12 18:02:15.000000000 +0200 +++ dsc-200706121022/collector/dsc/pcap.c 2007-12-04 18:35:34.060024000 +0100 @@ -963,17 +963,18 @@ finish_ts = last_ts; } else { gettimeofday(&start_ts, NULL); - finish_ts.tv_sec = ((start_ts.tv_sec / 60) + 1) * 60; + finish_ts.tv_sec = start_ts.tv_sec + 60; finish_ts.tv_usec = 0; while (last_ts.tv_sec < finish_ts.tv_sec) { fd_set *R = Pcap_select(&pcap_fdset, 0, 250000); if (NULL == R) { gettimeofday(&last_ts, NULL); - } - for (i = 0; i < n_pcap; i++) { - if (FD_ISSET(pcap_fileno(pcap[i]), &pcap_fdset)) { - pcap_dispatch(pcap[i], 50, handle_pcap, NULL); - } + } else { + for (i = 0; i < n_pcap; i++) { + if (FD_ISSET(pcap_fileno(pcap[i]), R)) { + pcap_dispatch(pcap[i], 50, handle_pcap, NULL); + } + } } } } diff -Naur dsc-200706121022.orig/collector/dsc/xmalloc.c dsc-200706121022/collector/dsc/xmalloc.c --- dsc-200706121022.orig/collector/dsc/xmalloc.c 2007-05-15 19:39:30.000000000 +0200 +++ dsc-200706121022/collector/dsc/xmalloc.c 2007-12-04 18:33:53.921890000 +0100 @@ -5,6 +5,8 @@ #include #include #include +#include +#include #include "xmalloc.h" #include "syslog_debug.h"