upstream: 1.18
This commit is contained in:
parent
8e468ffc54
commit
ff84fef381
88 changed files with 6525 additions and 26617 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
event.c -- I/O, timeout and signal event handling
|
||||
Copyright (C) 2012-2013 Guus Sliepen <guus@tinc-vpn.org>
|
||||
Copyright (C) 2012-2021 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
|
||||
|
|
@ -378,7 +378,7 @@ bool event_loop(void) {
|
|||
while(running) {
|
||||
struct timeval diff;
|
||||
struct timeval *tv = get_time_remaining(&diff);
|
||||
DWORD timeout_ms = tv ? (tv->tv_sec * 1000 + tv->tv_usec / 1000 + 1) : WSA_INFINITE;
|
||||
DWORD timeout_ms = tv ? (DWORD)(tv->tv_sec * 1000 + tv->tv_usec / 1000 + 1) : WSA_INFINITE;
|
||||
|
||||
if(!event_count) {
|
||||
Sleep(timeout_ms);
|
||||
|
|
@ -436,7 +436,7 @@ bool event_loop(void) {
|
|||
}
|
||||
|
||||
if(result < WSA_WAIT_EVENT_0 || result >= WSA_WAIT_EVENT_0 + event_count - event_offset) {
|
||||
return(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Look up io in the map by index. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue