/*
event.c -- I/O, timeout and signal event handling
- Copyright (C) 2012-2021 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2012-2022 Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
#include "system.h"
-#include "dropin.h"
+
+#include <assert.h>
#ifdef HAVE_SYS_EPOLL_H
#include <sys/epoll.h>
#include "net.h"
struct timeval now;
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
#ifdef HAVE_SYS_EPOLL_H
static int epollset = 0;
static bool running;
#ifdef HAVE_SYS_EPOLL_H
-static inline int event_epoll_init() {
+static inline int event_epoll_init(void) {
/* NOTE: 1024 limit is only used on ancient (pre 2.6.27) kernels.
Decent kernels will ignore this value making it unlimited.
epoll_create1 might be better, but these kernels would not be supported
#endif
static int io_compare(const io_t *a, const io_t *b) {
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
return a->fd - b->fd;
#else
}
io->fd = fd;
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
if(io->fd != -1) {
io->event = WSACreateEvent();
#endif
}
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
void io_add_event(io_t *io, io_cb_t cb, void *data, WSAEVENT event) {
io->event = event;
io_add(io, cb, data, -1, 0);
return;
}
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
#ifdef HAVE_SYS_EPOLL_H
epoll_ctl(epollset, EPOLL_CTL_DEL, io->fd, NULL);
}
io_set(io, 0);
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
if(io->fd != -1 && WSACloseEvent(io->event) == FALSE) {
abort();
};
}
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
// From Matz's Ruby
#ifndef NSIG
static io_t signalio;
static int pipefd[2] = {-1, -1};
-static signal_t *signal_handle[NSIG + 1] = {};
+static signal_t *signal_handle[NSIG + 1] = {NULL};
static void signal_handler(int signum) {
unsigned char num = signum;
- write(pipefd[1], &num, 1);
+
+ if(write(pipefd[1], &num, 1) != 1) {
+ // Pipe full or broken, nothing we can do about it.
+ }
}
static void signalio_handler(void *data, int flags) {
bool event_loop(void) {
running = true;
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
#ifdef HAVE_SYS_EPOLL_H
}
#else
+ assert(WSA_WAIT_EVENT_0 == 0);
while(running) {
struct timeval diff;
break;
}
- if(result < WSA_WAIT_EVENT_0 || result >= WSA_WAIT_EVENT_0 + event_count - event_offset) {
+ if(result >= event_count - event_offset) {
return false;
}
/* Look up io in the map by index. */
- event_index = result - WSA_WAIT_EVENT_0 + event_offset;
+ event_index = result + event_offset;
io_t *io = io_map[event_index];
if(io->fd == -1) {