ipsec-292.40.4.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / schedule.h

diff --git a/ipsec-tools/racoon/schedule.h b/ipsec-tools/racoon/schedule.h
index bd6659312e264a88c068f3c2f648495a7231e4ee..79fb504f7549bf48d5bd838b095442fdb82c9725 100644 (file)
--- a/ipsec-tools/racoon/schedule.h
+++ b/ipsec-tools/racoon/schedule.h
@@ -35,51 +35,38 @@
 #define _SCHEDULE_H
 
 #include <sys/queue.h>
 #define _SCHEDULE_H
 
 #include <sys/queue.h>

-#include "gnuc.h"
+#include <dispatch/dispatch.h>
+
+typedef int schedule_ref;

 
 /* scheduling table */
 /* the head is the nearest event. */
 struct sched {
 
 /* scheduling table */
 /* the head is the nearest event. */
 struct sched {

-       time_t xtime;           /* event time which is as time(3). */
-                               /*
-                                * if defined FIXY2038PROBLEM, this time
-                                * is from the time when called sched_init().
-                                */
-       void (*func) __P((void *)); /* call this function when timeout. */
-       void *param;            /* pointer to parameter */
-
-       int dead;               /* dead or alive */
-       long id;                /* for debug */
-       time_t created;         /* for debug */
-       time_t tick;            /* for debug */
-
+    schedule_ref ref;
+    time_t xtime;           /* event time which is as time(3). */
+       void (*func) (void *);  /* call this function when timeout. */
+       void *param;            /* pointer to parameter */
+       int dead;               /* dead or alive */

        TAILQ_ENTRY(sched) chain;
 };
 
 /* cancel schedule */
        TAILQ_ENTRY(sched) chain;
 };
 
 /* cancel schedule */

-#define SCHED_KILL(s)                                                          \
-do {                                                                           \
-       if(s != NULL){                                                                                                                  \
-               sched_kill(s);                                                         \
-               s = NULL;                                                              \
-       }\
+#define SCHED_KILL(s)               \
+do {                                \
+       if(s != 0){                     \
+               sched_kill(s);              \
+               s = 0;                      \
+       }                               \

 } while(0)
 
 } while(0)
 

-/* must be called after it's called from scheduler. */
-#define SCHED_INIT(s)  (s) = NULL
-
-struct scheddump {
-       time_t xtime;
-       long id;
-       time_t created;
-       time_t tick;
-};
-
-struct timeval *schedular __P((void));
-struct sched *sched_new __P((time_t, void (*func) __P((void *)), void *));
-void sched_kill __P((struct sched *));
-int sched_dump __P((caddr_t *, int *));
-void sched_init __P((void));
-void sched_scrub_param __P((void *));
+void timer_handler (struct sched *);
+schedule_ref sched_new (time_t, void (*func) (void *), void *);
+int sched_is_dead(schedule_ref ref);
+int sched_get_time(schedule_ref ref, time_t *time);
+void sched_kill (schedule_ref);
+void sched_killall(void);
+void sched_init (void);
+void sched_scrub_param (void *);
+time_t current_time (void);

 
 #endif /* _SCHEDULE_H */
 
 #endif /* _SCHEDULE_H */