projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace Opaque and Strict options with a TunnelServer option.
[tinc]
/
src
/
event.c
diff --git
a/src/event.c
b/src/event.c
index
5663170
..
4d6431c
100644
(file)
--- a/
src/event.c
+++ b/
src/event.c
@@
-1,7
+1,7
@@
/*
event.c -- event queue
/*
event.c -- event queue
- Copyright (C) 2002 Guus Sliepen <guus@sliepen.eu.org>,
- 2002 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2002
-2003
Guus Sliepen <guus@sliepen.eu.org>,
+ 2002
-2003
Ivo Timmermans <ivo@o2w.nl>
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
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
@@
-17,28
+17,22
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: event.c,v 1.1.4.
7 2003/07/06 23:16:28
guus Exp $
+ $Id: event.c,v 1.1.4.
11 2003/08/28 21:05:10
guus Exp $
*/
*/
-#include "config.h"
-
-#include <stdlib.h>
-#include <xalloc.h>
-#include <string.h>
-#include <utils.h>
-#include <avl_tree.h>
-#include <time.h>
+#include "system.h"
+#include "avl_tree.h"
#include "event.h"
#include "event.h"
-
-#include "
system
.h"
+#include "utils.h"
+#include "
xalloc
.h"
avl_tree_t *event_tree;
extern time_t now;
int id;
avl_tree_t *event_tree;
extern time_t now;
int id;
-static int event_compare(
event_t *a,
event_t *b)
+static int event_compare(
const event_t *a, const
event_t *b)
{
if(a->time > b->time)
return 1;
{
if(a->time > b->time)
return 1;
@@
-67,7
+61,7
@@
event_t *new_event(void)
{
cp();
{
cp();
- return
(event_t *)
xmalloc_and_zero(sizeof(event_t));
+ return xmalloc_and_zero(sizeof(event_t));
}
void free_event(event_t *event)
}
void free_event(event_t *event)
@@
-99,7
+93,7
@@
event_t *get_expired_event(void)
cp();
if(event_tree->head) {
cp();
if(event_tree->head) {
- event =
(event_t *)
event_tree->head->data;
+ event = event_tree->head->data;
if(event->time < now) {
avl_delete(event_tree, event);
if(event->time < now) {
avl_delete(event_tree, event);