diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | include/alarm.h | 17 | ||||
| -rw-r--r-- | include/conntrackd.h | 6 | ||||
| -rw-r--r-- | include/ignore.h | 1 | ||||
| -rw-r--r-- | include/network.h | 6 | ||||
| -rw-r--r-- | src/cache_iterators.c | 1 | ||||
| -rw-r--r-- | src/cache_wt.c | 1 | ||||
| -rw-r--r-- | src/main.c | 4 | ||||
| -rw-r--r-- | src/netlink.c | 4 | ||||
| -rw-r--r-- | src/network.c | 1 | ||||
| -rw-r--r-- | src/run.c | 1 | ||||
| -rw-r--r-- | src/stats-mode.c | 2 | ||||
| -rw-r--r-- | src/sync-mode.c | 4 | ||||
| -rw-r--r-- | src/traffic_stats.c | 1 |
14 files changed, 46 insertions, 4 deletions
@@ -57,6 +57,7 @@ o fix illegal use of return in the yacc code, use break instead o fix wrong invocations after prototype cleanup o set the return type of the parse functions to "void" o use the comma operator instead of curly braces +o add missing function prototypes version 0.9.5 (2007/07/29) ------------------------------ diff --git a/include/alarm.h b/include/alarm.h index fbe34f6..c68e7f4 100644 --- a/include/alarm.h +++ b/include/alarm.h @@ -17,4 +17,21 @@ set_alarm_expiration(struct alarm_list *t, long tv_sec, long tv_usec) t->tv.tv_usec = tv_usec; } +void set_alarm_function(struct alarm_list *t, + void (*fcn)(struct alarm_list *a, void *data)); + +void set_alarm_data(struct alarm_list *t, void *data); + +void init_alarm(struct alarm_list *t); + +void add_alarm(struct alarm_list *alarm); + +void del_alarm(struct alarm_list *alarm); + +void mod_alarm(struct alarm_list *alarm, unsigned long sc, unsigned long usc); + +int get_next_alarm(struct timeval *tv, struct timeval *next_alarm); + +int do_alarm_run(struct timeval *next_alarm); + #endif diff --git a/include/conntrackd.h b/include/conntrackd.h index e8b90cc..33732a4 100644 --- a/include/conntrackd.h +++ b/include/conntrackd.h @@ -175,4 +175,10 @@ extern struct ct_mode stats_mode; #define MAX(x, y) x > y ? x : y +/* These live in run.c */ +void killer(int foo); +void local_handler(int fd, void *data); +int init(void); +void run(void); + #endif diff --git a/include/ignore.h b/include/ignore.h index 40cb02d..96deb93 100644 --- a/include/ignore.h +++ b/include/ignore.h @@ -8,5 +8,6 @@ struct ignore_pool { struct ignore_pool *ignore_pool_create(u_int8_t family); void ignore_pool_destroy(struct ignore_pool *ip); int ignore_pool_add(struct ignore_pool *ip, void *data); +int ignore_pool_test(struct ignore_pool *ip, struct nf_conntrack *ct); #endif diff --git a/include/network.h b/include/network.h index e92f6c3..88ff43b 100644 --- a/include/network.h +++ b/include/network.h @@ -54,6 +54,8 @@ void build_netmsg(struct nf_conntrack *ct, int query, struct nethdr *net); int prepare_send_netmsg(struct mcast_sock *m, void *data); int mcast_send_netmsg(struct mcast_sock *m, void *data); int mcast_recv_netmsg(struct mcast_sock *m, void *data, int len); +int handle_netmsg(struct nethdr *net); +int mcast_track_seq(u_int32_t seq, u_int32_t *exp_seq); struct mcast_conf; @@ -161,4 +163,8 @@ struct netattr { #define NTA_ALIGN(len) (((len) + NTA_ALIGNTO - 1) & ~(NTA_ALIGNTO - 1)) #define NTA_LENGTH(len) (NTA_ALIGN(sizeof(struct netattr)) + (len)) +void build_netpld(struct nf_conntrack *ct, struct netpld *pld, int query); + +void parse_netpld(struct nf_conntrack *ct, struct netpld *pld, int *query); + #endif diff --git a/src/cache_iterators.c b/src/cache_iterators.c index 85f87ab..d43ae6f 100644 --- a/src/cache_iterators.c +++ b/src/cache_iterators.c @@ -20,6 +20,7 @@ #include "jhash.h" #include "hash.h" #include "conntrackd.h" +#include "netlink.h" #include <libnetfilter_conntrack/libnetfilter_conntrack.h> #include <errno.h> #include "us-conntrack.h" diff --git a/src/cache_wt.c b/src/cache_wt.c index 2a9d8e7..fee17e2 100644 --- a/src/cache_wt.c +++ b/src/cache_wt.c @@ -16,6 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "netlink.h" #include <stdio.h> #include "conntrackd.h" #include "us-conntrack.h" @@ -61,10 +61,6 @@ void show_usage(char *progname) fprintf(stdout, "%s\n", usage_options); } -/* These live in run.c */ -int init(void); -void run(void); - void set_operation_mode(int *current, int want, char *argv[]) { if (*current == NOT_SET) { diff --git a/src/netlink.c b/src/netlink.c index ab945d8..7800b10 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -16,7 +16,11 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "netlink.h" #include "conntrackd.h" +#include "traffic_stats.h" +#include "ignore.h" +#include "log.h" #include <libnfnetlink/libnfnetlink.h> #include <libnetfilter_conntrack/libnetfilter_conntrack.h> #include <errno.h> diff --git a/src/network.c b/src/network.c index 8f1dc94..e7ffbac 100644 --- a/src/network.c +++ b/src/network.c @@ -20,6 +20,7 @@ #include "network.h" #include "us-conntrack.h" #include "sync.h" +#include "log.h" static unsigned int seq_set, cur_seq; @@ -19,6 +19,7 @@ */ #include "conntrackd.h" +#include "netlink.h" #include <libnetfilter_conntrack/libnetfilter_conntrack.h> #include <errno.h> #include "us-conntrack.h" diff --git a/src/stats-mode.c b/src/stats-mode.c index de53751..0983b97 100644 --- a/src/stats-mode.c +++ b/src/stats-mode.c @@ -16,6 +16,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "netlink.h" +#include "traffic_stats.h" #include <stdlib.h> #include "cache.h" #include "log.h" diff --git a/src/sync-mode.c b/src/sync-mode.c index c3630b6..8be8c18 100644 --- a/src/sync-mode.c +++ b/src/sync-mode.c @@ -16,6 +16,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "netlink.h" +#include "traffic_stats.h" +#include "log.h" #include <stdlib.h> #include "cache.h" #include "conntrackd.h" @@ -28,6 +31,7 @@ #include "sync.h" #include "network.h" #include "debug.h" +#include <unistd.h> static void do_mcast_handler_step(struct nethdr *net) { diff --git a/src/traffic_stats.c b/src/traffic_stats.c index b510b77..b2cdaae 100644 --- a/src/traffic_stats.c +++ b/src/traffic_stats.c @@ -16,6 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "traffic_stats.h" #include "cache.h" #include "hash.h" #include "conntrackd.h" |