projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add #ifdefs in case not all platforms support IPv4 and IPv6 multicast.
[tinc]
/
src
/
event.c
diff --git
a/src/event.c
b/src/event.c
index
99e6a23
..
89ee022
100644
(file)
--- a/
src/event.c
+++ b/
src/event.c
@@
-28,7
+28,7
@@
avl_tree_t *event_tree;
extern time_t now;
avl_tree_t *event_tree;
extern time_t now;
-int id;
+
static
int id;
static int event_compare(const event_t *a, const event_t *b) {
if(a->time > b->time)
static int event_compare(const event_t *a, const event_t *b) {
if(a->time > b->time)
@@
-62,10
+62,10
@@
void expire_events(void) {
return;
event = event_tree->tail->data;
return;
event = event_tree->tail->data;
- if(event->time < now)
+ if(event->time <
=
now)
return;
return;
- diff =
1 +
event->time - now;
+ diff = event->time - now;
for(node = event_tree->head; node; node = node->next) {
event = node->data;
for(node = event_tree->head; node; node = node->next) {
event = node->data;
@@
-96,7
+96,7
@@
event_t *get_expired_event(void) {
if(event_tree->head) {
event = event_tree->head->data;
if(event_tree->head) {
event = event_tree->head->data;
- if(event->time < now) {
+ if(event->time <
=
now) {
avl_node_t *node = event_tree->head;
avl_unlink_node(event_tree, node);
free(node);
avl_node_t *node = event_tree->head;
avl_unlink_node(event_tree, node);
free(node);
@@
-106,3
+106,9
@@
event_t *get_expired_event(void) {
return NULL;
}
return NULL;
}
+
+event_t *peek_next_event(void) {
+ if (event_tree->head)
+ return event_tree->head->data;
+ return NULL;
+}