diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-20 23:51:23 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-01-20 23:51:23 +0000 |
| commit | bcae271764d18e570a5fca382eeea748add4af62 (patch) | |
| tree | 27dd1b721b8635145aafe17dbec7cc83d25a4cf1 /include | |
| parent | 00ad2e9e1c6cf9e14c76660f2b748247c1f4bd83 (diff) | |
| download | conntrack-tools-bcae271764d18e570a5fca382eeea748add4af62.tar.gz conntrack-tools-bcae271764d18e570a5fca382eeea748add4af62.zip | |
Based on patch from Max Kellermann <max@duempel.org>:
merge mod_alarm() into add_alarm(), remove alarm_set_expiration()
Diffstat (limited to 'include')
| -rw-r--r-- | include/alarm.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/alarm.h b/include/alarm.h index 2f78885..f0bbb95 100644 --- a/include/alarm.h +++ b/include/alarm.h @@ -14,13 +14,6 @@ struct alarm_list { void (*function)(struct alarm_list *a, void *data); }; -static inline void -set_alarm_expiration(struct alarm_list *t, long tv_sec, long tv_usec) -{ - t->tv.tv_sec = tv_sec; - t->tv.tv_usec = tv_usec; -} - int init_alarm_hash(void); void destroy_alarm_hash(void); @@ -29,12 +22,10 @@ void init_alarm(struct alarm_list *t, void *data, void (*fcn)(struct alarm_list *a, void *data)); -void add_alarm(struct alarm_list *alarm); +void add_alarm(struct alarm_list *alarm, unsigned long sc, unsigned long usc); void del_alarm(struct alarm_list *alarm); -void mod_alarm(struct alarm_list *alarm, unsigned long sc, unsigned long usc); - int get_next_alarm_run(struct timeval *next_alarm); int do_alarm_run(struct timeval *next_alarm); |