pluto: Listen for kernel events via libhydra's kernel interface.

This commit is contained in:
Tobias Brunner
2010-09-02 19:04:22 +02:00
parent 40bbff5dbf
commit c6fd7549e8
4 changed files with 86 additions and 38 deletions
-27
View File
@@ -859,20 +859,6 @@ call_server(void)
maxfd = events_fd;
FD_SET(events_fd, &readfds);
#ifdef KLIPS
if (!no_klips)
{
int fd = *kernel_ops->async_fdp;
if (kernel_ops->process_queue)
kernel_ops->process_queue();
if (maxfd < fd)
maxfd = fd;
passert(!FD_ISSET(fd, &readfds));
FD_SET(fd, &readfds);
}
#endif
if (listening)
{
for (ifp = interfaces; ifp != NULL; ifp = ifp->next)
@@ -964,19 +950,6 @@ call_server(void)
ndes--;
}
#ifdef KLIPS
if (!no_klips && FD_ISSET(*kernel_ops->async_fdp, &readfds))
{
passert(ndes > 0);
DBG(DBG_CONTROL,
DBG_log(BLANK_FORMAT);
DBG_log("*received kernel message"));
kernel_ops->process_msg();
passert(GLOBALS_ARE_RESET());
ndes--;
}
#endif
for (ifp = interfaces; ifp != NULL; ifp = ifp->next)
{
if (FD_ISSET(ifp->fd, &readfds))