diff options
| -rw-r--r-- | AUTHORS (renamed from daemon/AUTHORS) | 0 | ||||
| -rw-r--r-- | CHANGELOG (renamed from daemon/CHANGELOG) | 0 | ||||
| -rw-r--r-- | CONTRIBUTORS (renamed from daemon/CONTRIBUTORS) | 0 | ||||
| -rw-r--r-- | ChangeLog (renamed from cli/ChangeLog) | 0 | ||||
| -rw-r--r-- | INSTALL (renamed from daemon/INSTALL) | 0 | ||||
| -rw-r--r-- | Make_global.am (renamed from daemon/Make_global.am) | 0 | ||||
| -rw-r--r-- | Makefile.am (renamed from daemon/Makefile.am) | 4 | ||||
| -rw-r--r-- | TODO (renamed from daemon/TODO) | 0 | ||||
| -rwxr-xr-x | autogen.sh (renamed from daemon/autogen.sh) | 0 | ||||
| -rw-r--r-- | configure.in (renamed from daemon/configure.in) | 10 | ||||
| -rw-r--r-- | conntrack.8 (renamed from cli/conntrack.8) | 0 | ||||
| -rw-r--r-- | examples/Makefile.am (renamed from daemon/examples/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/debian.conntrackd.init.d (renamed from daemon/examples/debian.conntrackd.init.d) | 0 | ||||
| -rw-r--r-- | examples/stats/Makefile.am (renamed from daemon/examples/stats/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/stats/conntrackd.conf (renamed from daemon/examples/stats/conntrackd.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/Makefile.am (renamed from daemon/examples/sync/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/Makefile.am (renamed from daemon/examples/sync/nack/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/README (renamed from daemon/examples/sync/nack/README) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/node1/Makefile.am (renamed from daemon/examples/sync/nack/node1/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/node1/conntrackd.conf (renamed from daemon/examples/sync/nack/node1/conntrackd.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/node1/keepalived.conf (renamed from daemon/examples/sync/nack/node1/keepalived.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/node2/Makefile.am (renamed from daemon/examples/sync/nack/node2/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/node2/conntrackd.conf (renamed from daemon/examples/sync/nack/node2/conntrackd.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/nack/node2/keepalived.conf (renamed from daemon/examples/sync/nack/node2/keepalived.conf) | 0 | ||||
| -rwxr-xr-x | examples/sync/nack/script_backup.sh (renamed from daemon/examples/sync/nack/script_backup.sh) | 0 | ||||
| -rwxr-xr-x | examples/sync/nack/script_master.sh (renamed from daemon/examples/sync/nack/script_master.sh) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/Makefile.am (renamed from daemon/examples/sync/persistent/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/README (renamed from daemon/examples/sync/persistent/README) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/node1/Makefile.am (renamed from daemon/examples/sync/persistent/node1/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/node1/conntrackd.conf (renamed from daemon/examples/sync/persistent/node1/conntrackd.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/node1/keepalived.conf (renamed from daemon/examples/sync/persistent/node1/keepalived.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/node2/Makefile.am (renamed from daemon/examples/sync/persistent/node2/Makefile.am) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/node2/conntrackd.conf (renamed from daemon/examples/sync/persistent/node2/conntrackd.conf) | 0 | ||||
| -rw-r--r-- | examples/sync/persistent/node2/keepalived.conf (renamed from daemon/examples/sync/persistent/node2/keepalived.conf) | 0 | ||||
| -rwxr-xr-x | examples/sync/persistent/script_backup.sh (renamed from daemon/examples/sync/persistent/script_backup.sh) | 0 | ||||
| -rwxr-xr-x | examples/sync/persistent/script_master.sh (renamed from daemon/examples/sync/persistent/script_master.sh) | 0 | ||||
| -rw-r--r-- | extensions/Makefile.am (renamed from cli/extensions/Makefile.am) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_icmp.c (renamed from cli/extensions/libct_proto_icmp.c) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_icmp.man (renamed from cli/extensions/libct_proto_icmp.man) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_sctp.c (renamed from cli/extensions/libct_proto_sctp.c) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_tcp.c (renamed from cli/extensions/libct_proto_tcp.c) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_tcp.man (renamed from cli/extensions/libct_proto_tcp.man) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_udp.c (renamed from cli/extensions/libct_proto_udp.c) | 0 | ||||
| -rw-r--r-- | extensions/libct_proto_udp.man (renamed from cli/extensions/libct_proto_udp.man) | 0 | ||||
| -rw-r--r-- | include/Makefile.am (renamed from daemon/include/Makefile.am) | 0 | ||||
| -rw-r--r-- | include/alarm.h (renamed from daemon/include/alarm.h) | 0 | ||||
| -rw-r--r-- | include/buffer.h (renamed from daemon/include/buffer.h) | 0 | ||||
| -rw-r--r-- | include/cache.h (renamed from daemon/include/cache.h) | 0 | ||||
| -rw-r--r-- | include/conntrack.h (renamed from cli/include/conntrack.h) | 0 | ||||
| -rw-r--r-- | include/conntrackd.h (renamed from daemon/include/conntrackd.h) | 0 | ||||
| -rw-r--r-- | include/debug.h (renamed from daemon/include/debug.h) | 0 | ||||
| -rw-r--r-- | include/hash.h (renamed from daemon/include/hash.h) | 0 | ||||
| -rw-r--r-- | include/ignore.h (renamed from daemon/include/ignore.h) | 0 | ||||
| -rw-r--r-- | include/jhash.h (renamed from daemon/include/jhash.h) | 0 | ||||
| -rw-r--r-- | include/linux_list.h (renamed from daemon/include/linux_list.h) | 0 | ||||
| -rw-r--r-- | include/local.h (renamed from daemon/include/local.h) | 0 | ||||
| -rw-r--r-- | include/log.h (renamed from daemon/include/log.h) | 0 | ||||
| -rw-r--r-- | include/mcast.h (renamed from daemon/include/mcast.h) | 0 | ||||
| -rw-r--r-- | include/network.h (renamed from daemon/include/network.h) | 0 | ||||
| -rw-r--r-- | include/slist.h (renamed from daemon/include/slist.h) | 0 | ||||
| -rw-r--r-- | include/state_helper.h (renamed from daemon/include/state_helper.h) | 0 | ||||
| -rw-r--r-- | include/sync.h (renamed from daemon/include/sync.h) | 0 | ||||
| -rw-r--r-- | include/us-conntrack.h (renamed from daemon/include/us-conntrack.h) | 0 | ||||
| -rw-r--r-- | src/Makefile.am (renamed from daemon/src/Makefile.am) | 6 | ||||
| -rw-r--r-- | src/alarm.c (renamed from daemon/src/alarm.c) | 0 | ||||
| -rw-r--r-- | src/buffer.c (renamed from daemon/src/buffer.c) | 0 | ||||
| -rw-r--r-- | src/cache.c (renamed from daemon/src/cache.c) | 0 | ||||
| -rw-r--r-- | src/cache_iterators.c (renamed from daemon/src/cache_iterators.c) | 0 | ||||
| -rw-r--r-- | src/cache_lifetime.c (renamed from daemon/src/cache_lifetime.c) | 0 | ||||
| -rw-r--r-- | src/cache_timer.c (renamed from daemon/src/cache_timer.c) | 0 | ||||
| -rw-r--r-- | src/checksum.c (renamed from daemon/src/checksum.c) | 0 | ||||
| -rw-r--r-- | src/conntrack.c (renamed from cli/src/conntrack.c) | 0 | ||||
| -rw-r--r-- | src/hash.c (renamed from daemon/src/hash.c) | 0 | ||||
| -rw-r--r-- | src/ignore_pool.c (renamed from daemon/src/ignore_pool.c) | 0 | ||||
| -rw-r--r-- | src/local.c (renamed from daemon/src/local.c) | 0 | ||||
| -rw-r--r-- | src/lock.c (renamed from daemon/src/lock.c) | 0 | ||||
| -rw-r--r-- | src/log.c (renamed from daemon/src/log.c) | 0 | ||||
| -rw-r--r-- | src/main.c (renamed from daemon/src/main.c) | 0 | ||||
| -rw-r--r-- | src/mcast.c (renamed from daemon/src/mcast.c) | 0 | ||||
| -rw-r--r-- | src/netlink.c (renamed from daemon/src/netlink.c) | 0 | ||||
| -rw-r--r-- | src/network.c (renamed from daemon/src/network.c) | 0 | ||||
| -rw-r--r-- | src/proxy.c (renamed from daemon/src/proxy.c) | 0 | ||||
| -rw-r--r-- | src/read_config_lex.l (renamed from daemon/src/read_config_lex.l) | 0 | ||||
| -rw-r--r-- | src/read_config_yy.y (renamed from daemon/src/read_config_yy.y) | 0 | ||||
| -rw-r--r-- | src/run.c (renamed from daemon/src/run.c) | 0 | ||||
| -rw-r--r-- | src/state_helper.c (renamed from daemon/src/state_helper.c) | 0 | ||||
| -rw-r--r-- | src/state_helper_tcp.c (renamed from daemon/src/state_helper_tcp.c) | 0 | ||||
| -rw-r--r-- | src/stats-mode.c (renamed from daemon/src/stats-mode.c) | 0 | ||||
| -rw-r--r-- | src/sync-mode.c (renamed from daemon/src/sync-mode.c) | 0 | ||||
| -rw-r--r-- | src/sync-nack.c (renamed from daemon/src/sync-nack.c) | 0 | ||||
| -rw-r--r-- | src/sync-notrack.c (renamed from daemon/src/sync-notrack.c) | 0 | ||||
| -rw-r--r-- | src/traffic_stats.c (renamed from daemon/src/traffic_stats.c) | 0 | ||||
| -rw-r--r-- | test.sh (renamed from cli/test.sh) | 0 |
93 files changed, 12 insertions, 8 deletions
diff --git a/daemon/CHANGELOG b/CHANGELOG index afab61d..afab61d 100644 --- a/daemon/CHANGELOG +++ b/CHANGELOG diff --git a/daemon/CONTRIBUTORS b/CONTRIBUTORS index c5e40b4..c5e40b4 100644 --- a/daemon/CONTRIBUTORS +++ b/CONTRIBUTORS diff --git a/cli/ChangeLog b/ChangeLog index 1524ef6..1524ef6 100644 --- a/cli/ChangeLog +++ b/ChangeLog diff --git a/daemon/Make_global.am b/Make_global.am index 685add7..685add7 100644 --- a/daemon/Make_global.am +++ b/Make_global.am diff --git a/daemon/Makefile.am b/Makefile.am index 998f4c6..8a4ce7c 100644 --- a/daemon/Makefile.am +++ b/Makefile.am @@ -8,8 +8,8 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 # EXTRA_DIST = $(man_MANS) Make_global.am debian EXTRA_DIST = Make_global.am CHANGELOG TODO -SUBDIRS = src -DIST_SUBDIRS = include src examples +SUBDIRS = src extensions +DIST_SUBDIRS = include src extensions examples LINKOPTS = -lnfnetlink -lnetfilter_conntrack -lpthread AM_CFLAGS = -g diff --git a/daemon/autogen.sh b/autogen.sh index e76d3ef..e76d3ef 100755 --- a/daemon/autogen.sh +++ b/autogen.sh diff --git a/daemon/configure.in b/configure.in index 92e512a..5bd9815 100644 --- a/daemon/configure.in +++ b/configure.in @@ -90,10 +90,10 @@ dnl AC_CHECK_FUNCS([memset]) dnl-------------------------------- -dnl if test ! -z "$libdir"; then -dnl MODULE_DIR="\\\"$libdir/conntrack/\\\"" -dnl CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR" -dnl fi +if test ! -z "$libdir"; then + MODULE_DIR="\\\"$libdir/conntrack/\\\"" + CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR" +fi dnl-------------------------------- @@ -103,4 +103,4 @@ dnl debug/src/Makefile dnl extensions/Makefile dnl src/Makefile]) -AC_OUTPUT(Makefile src/Makefile include/Makefile examples/Makefile examples/stats/Makefile examples/sync/Makefile examples/sync/persistent/Makefile examples/sync/nack/Makefile examples/sync/persistent/node1/Makefile examples/sync/persistent/node2/Makefile examples/sync/nack/node1/Makefile examples/sync/nack/node2/Makefile) +AC_OUTPUT(Makefile src/Makefile include/Makefile extensions/Makefile examples/Makefile examples/stats/Makefile examples/sync/Makefile examples/sync/persistent/Makefile examples/sync/nack/Makefile examples/sync/persistent/node1/Makefile examples/sync/persistent/node2/Makefile examples/sync/nack/node1/Makefile examples/sync/nack/node2/Makefile) diff --git a/cli/conntrack.8 b/conntrack.8 index 307180b..307180b 100644 --- a/cli/conntrack.8 +++ b/conntrack.8 diff --git a/daemon/examples/Makefile.am b/examples/Makefile.am index be83d42..be83d42 100644 --- a/daemon/examples/Makefile.am +++ b/examples/Makefile.am diff --git a/daemon/examples/debian.conntrackd.init.d b/examples/debian.conntrackd.init.d index ba847dd..ba847dd 100644 --- a/daemon/examples/debian.conntrackd.init.d +++ b/examples/debian.conntrackd.init.d diff --git a/daemon/examples/stats/Makefile.am b/examples/stats/Makefile.am index b43c3b8..b43c3b8 100644 --- a/daemon/examples/stats/Makefile.am +++ b/examples/stats/Makefile.am diff --git a/daemon/examples/stats/conntrackd.conf b/examples/stats/conntrackd.conf index e514ac0..e514ac0 100644 --- a/daemon/examples/stats/conntrackd.conf +++ b/examples/stats/conntrackd.conf diff --git a/daemon/examples/sync/Makefile.am b/examples/sync/Makefile.am index 28e7643..28e7643 100644 --- a/daemon/examples/sync/Makefile.am +++ b/examples/sync/Makefile.am diff --git a/daemon/examples/sync/nack/Makefile.am b/examples/sync/nack/Makefile.am index 6fd99b1..6fd99b1 100644 --- a/daemon/examples/sync/nack/Makefile.am +++ b/examples/sync/nack/Makefile.am diff --git a/daemon/examples/sync/nack/README b/examples/sync/nack/README index 66987f7..66987f7 100644 --- a/daemon/examples/sync/nack/README +++ b/examples/sync/nack/README diff --git a/daemon/examples/sync/nack/node1/Makefile.am b/examples/sync/nack/node1/Makefile.am index edc0ed7..edc0ed7 100644 --- a/daemon/examples/sync/nack/node1/Makefile.am +++ b/examples/sync/nack/node1/Makefile.am diff --git a/daemon/examples/sync/nack/node1/conntrackd.conf b/examples/sync/nack/node1/conntrackd.conf index f24fa7e..f24fa7e 100644 --- a/daemon/examples/sync/nack/node1/conntrackd.conf +++ b/examples/sync/nack/node1/conntrackd.conf diff --git a/daemon/examples/sync/nack/node1/keepalived.conf b/examples/sync/nack/node1/keepalived.conf index 41aa35b..41aa35b 100644 --- a/daemon/examples/sync/nack/node1/keepalived.conf +++ b/examples/sync/nack/node1/keepalived.conf diff --git a/daemon/examples/sync/nack/node2/Makefile.am b/examples/sync/nack/node2/Makefile.am index edc0ed7..edc0ed7 100644 --- a/daemon/examples/sync/nack/node2/Makefile.am +++ b/examples/sync/nack/node2/Makefile.am diff --git a/daemon/examples/sync/nack/node2/conntrackd.conf b/examples/sync/nack/node2/conntrackd.conf index 4f15773..4f15773 100644 --- a/daemon/examples/sync/nack/node2/conntrackd.conf +++ b/examples/sync/nack/node2/conntrackd.conf diff --git a/daemon/examples/sync/nack/node2/keepalived.conf b/examples/sync/nack/node2/keepalived.conf index 41aa35b..41aa35b 100644 --- a/daemon/examples/sync/nack/node2/keepalived.conf +++ b/examples/sync/nack/node2/keepalived.conf diff --git a/daemon/examples/sync/nack/script_backup.sh b/examples/sync/nack/script_backup.sh index 813e375..813e375 100755 --- a/daemon/examples/sync/nack/script_backup.sh +++ b/examples/sync/nack/script_backup.sh diff --git a/daemon/examples/sync/nack/script_master.sh b/examples/sync/nack/script_master.sh index ff1dbc0..ff1dbc0 100755 --- a/daemon/examples/sync/nack/script_master.sh +++ b/examples/sync/nack/script_master.sh diff --git a/daemon/examples/sync/persistent/Makefile.am b/examples/sync/persistent/Makefile.am index 6fd99b1..6fd99b1 100644 --- a/daemon/examples/sync/persistent/Makefile.am +++ b/examples/sync/persistent/Makefile.am diff --git a/daemon/examples/sync/persistent/README b/examples/sync/persistent/README index 36b5989..36b5989 100644 --- a/daemon/examples/sync/persistent/README +++ b/examples/sync/persistent/README diff --git a/daemon/examples/sync/persistent/node1/Makefile.am b/examples/sync/persistent/node1/Makefile.am index edc0ed7..edc0ed7 100644 --- a/daemon/examples/sync/persistent/node1/Makefile.am +++ b/examples/sync/persistent/node1/Makefile.am diff --git a/daemon/examples/sync/persistent/node1/conntrackd.conf b/examples/sync/persistent/node1/conntrackd.conf index 90afeb7..90afeb7 100644 --- a/daemon/examples/sync/persistent/node1/conntrackd.conf +++ b/examples/sync/persistent/node1/conntrackd.conf diff --git a/daemon/examples/sync/persistent/node1/keepalived.conf b/examples/sync/persistent/node1/keepalived.conf index 41aa35b..41aa35b 100644 --- a/daemon/examples/sync/persistent/node1/keepalived.conf +++ b/examples/sync/persistent/node1/keepalived.conf diff --git a/daemon/examples/sync/persistent/node2/Makefile.am b/examples/sync/persistent/node2/Makefile.am index edc0ed7..edc0ed7 100644 --- a/daemon/examples/sync/persistent/node2/Makefile.am +++ b/examples/sync/persistent/node2/Makefile.am diff --git a/daemon/examples/sync/persistent/node2/conntrackd.conf b/examples/sync/persistent/node2/conntrackd.conf index aee4a29..aee4a29 100644 --- a/daemon/examples/sync/persistent/node2/conntrackd.conf +++ b/examples/sync/persistent/node2/conntrackd.conf diff --git a/daemon/examples/sync/persistent/node2/keepalived.conf b/examples/sync/persistent/node2/keepalived.conf index 41aa35b..41aa35b 100644 --- a/daemon/examples/sync/persistent/node2/keepalived.conf +++ b/examples/sync/persistent/node2/keepalived.conf diff --git a/daemon/examples/sync/persistent/script_backup.sh b/examples/sync/persistent/script_backup.sh index 8ea2ad8..8ea2ad8 100755 --- a/daemon/examples/sync/persistent/script_backup.sh +++ b/examples/sync/persistent/script_backup.sh diff --git a/daemon/examples/sync/persistent/script_master.sh b/examples/sync/persistent/script_master.sh index 70c26c9..70c26c9 100755 --- a/daemon/examples/sync/persistent/script_master.sh +++ b/examples/sync/persistent/script_master.sh diff --git a/cli/extensions/Makefile.am b/extensions/Makefile.am index 5366ee3..5366ee3 100644 --- a/cli/extensions/Makefile.am +++ b/extensions/Makefile.am diff --git a/cli/extensions/libct_proto_icmp.c b/extensions/libct_proto_icmp.c index e7cb04d..e7cb04d 100644 --- a/cli/extensions/libct_proto_icmp.c +++ b/extensions/libct_proto_icmp.c diff --git a/cli/extensions/libct_proto_icmp.man b/extensions/libct_proto_icmp.man index 3b860d0..3b860d0 100644 --- a/cli/extensions/libct_proto_icmp.man +++ b/extensions/libct_proto_icmp.man diff --git a/cli/extensions/libct_proto_sctp.c b/extensions/libct_proto_sctp.c index 1c8f0d1..1c8f0d1 100644 --- a/cli/extensions/libct_proto_sctp.c +++ b/extensions/libct_proto_sctp.c diff --git a/cli/extensions/libct_proto_tcp.c b/extensions/libct_proto_tcp.c index ee24206..ee24206 100644 --- a/cli/extensions/libct_proto_tcp.c +++ b/extensions/libct_proto_tcp.c diff --git a/cli/extensions/libct_proto_tcp.man b/extensions/libct_proto_tcp.man index 41783f8..41783f8 100644 --- a/cli/extensions/libct_proto_tcp.man +++ b/extensions/libct_proto_tcp.man diff --git a/cli/extensions/libct_proto_udp.c b/extensions/libct_proto_udp.c index 48079e0..48079e0 100644 --- a/cli/extensions/libct_proto_udp.c +++ b/extensions/libct_proto_udp.c diff --git a/cli/extensions/libct_proto_udp.man b/extensions/libct_proto_udp.man index c67fedf..c67fedf 100644 --- a/cli/extensions/libct_proto_udp.man +++ b/extensions/libct_proto_udp.man diff --git a/daemon/include/Makefile.am b/include/Makefile.am index e669d73..e669d73 100644 --- a/daemon/include/Makefile.am +++ b/include/Makefile.am diff --git a/daemon/include/alarm.h b/include/alarm.h index 93e6482..93e6482 100644 --- a/daemon/include/alarm.h +++ b/include/alarm.h diff --git a/daemon/include/buffer.h b/include/buffer.h index 8d72dfb..8d72dfb 100644 --- a/daemon/include/buffer.h +++ b/include/buffer.h diff --git a/daemon/include/cache.h b/include/cache.h index 7d9559a..7d9559a 100644 --- a/daemon/include/cache.h +++ b/include/cache.h diff --git a/cli/include/conntrack.h b/include/conntrack.h index fb3b9b6..fb3b9b6 100644 --- a/cli/include/conntrack.h +++ b/include/conntrack.h diff --git a/daemon/include/conntrackd.h b/include/conntrackd.h index a5f7a3a..a5f7a3a 100644 --- a/daemon/include/conntrackd.h +++ b/include/conntrackd.h diff --git a/daemon/include/debug.h b/include/debug.h index 67f2c71..67f2c71 100644 --- a/daemon/include/debug.h +++ b/include/debug.h diff --git a/daemon/include/hash.h b/include/hash.h index fd971e7..fd971e7 100644 --- a/daemon/include/hash.h +++ b/include/hash.h diff --git a/daemon/include/ignore.h b/include/ignore.h index 40cb02d..40cb02d 100644 --- a/daemon/include/ignore.h +++ b/include/ignore.h diff --git a/daemon/include/jhash.h b/include/jhash.h index 38b8780..38b8780 100644 --- a/daemon/include/jhash.h +++ b/include/jhash.h diff --git a/daemon/include/linux_list.h b/include/linux_list.h index 57b56d7..57b56d7 100644 --- a/daemon/include/linux_list.h +++ b/include/linux_list.h diff --git a/daemon/include/local.h b/include/local.h index 350b8bf..350b8bf 100644 --- a/daemon/include/local.h +++ b/include/local.h diff --git a/daemon/include/log.h b/include/log.h index 9ecff30..9ecff30 100644 --- a/daemon/include/log.h +++ b/include/log.h diff --git a/daemon/include/mcast.h b/include/mcast.h index 0f3e3cd..0f3e3cd 100644 --- a/daemon/include/mcast.h +++ b/include/mcast.h diff --git a/daemon/include/network.h b/include/network.h index dab50db..dab50db 100644 --- a/daemon/include/network.h +++ b/include/network.h diff --git a/daemon/include/slist.h b/include/slist.h index ab7fa34..ab7fa34 100644 --- a/daemon/include/slist.h +++ b/include/slist.h diff --git a/daemon/include/state_helper.h b/include/state_helper.h index 1ed0b79..1ed0b79 100644 --- a/daemon/include/state_helper.h +++ b/include/state_helper.h diff --git a/daemon/include/sync.h b/include/sync.h index 7756c87..7756c87 100644 --- a/daemon/include/sync.h +++ b/include/sync.h diff --git a/daemon/include/us-conntrack.h b/include/us-conntrack.h index 3d71e22..3d71e22 100644 --- a/daemon/include/us-conntrack.h +++ b/include/us-conntrack.h diff --git a/daemon/src/Makefile.am b/src/Makefile.am index 5d1c6cb..381f8ac 100644 --- a/daemon/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,11 @@ YACC=@YACC@ -d CLEANFILES = read_config_yy.c read_config_lex.c -sbin_PROGRAMS = conntrackd +sbin_PROGRAMS = conntrack conntrackd + +conntrack_SOURCES = conntrack.c +conntrack_LDFLAGS = -rdynamic + conntrackd_SOURCES = alarm.c main.c run.c hash.c buffer.c \ local.c log.c mcast.c netlink.c proxy.c lock.c \ ignore_pool.c \ diff --git a/daemon/src/alarm.c b/src/alarm.c index 1a465c2..1a465c2 100644 --- a/daemon/src/alarm.c +++ b/src/alarm.c diff --git a/daemon/src/buffer.c b/src/buffer.c index fa0b859..fa0b859 100644 --- a/daemon/src/buffer.c +++ b/src/buffer.c diff --git a/daemon/src/cache.c b/src/cache.c index 6f7442b..6f7442b 100644 --- a/daemon/src/cache.c +++ b/src/cache.c diff --git a/daemon/src/cache_iterators.c b/src/cache_iterators.c index 5d5d22b..5d5d22b 100644 --- a/daemon/src/cache_iterators.c +++ b/src/cache_iterators.c diff --git a/daemon/src/cache_lifetime.c b/src/cache_lifetime.c index ae54df2..ae54df2 100644 --- a/daemon/src/cache_lifetime.c +++ b/src/cache_lifetime.c diff --git a/daemon/src/cache_timer.c b/src/cache_timer.c index 213b59a..213b59a 100644 --- a/daemon/src/cache_timer.c +++ b/src/cache_timer.c diff --git a/daemon/src/checksum.c b/src/checksum.c index 41866ff..41866ff 100644 --- a/daemon/src/checksum.c +++ b/src/checksum.c diff --git a/cli/src/conntrack.c b/src/conntrack.c index 30fbf69..30fbf69 100644 --- a/cli/src/conntrack.c +++ b/src/conntrack.c diff --git a/daemon/src/hash.c b/src/hash.c index 274a140..274a140 100644 --- a/daemon/src/hash.c +++ b/src/hash.c diff --git a/daemon/src/ignore_pool.c b/src/ignore_pool.c index 5946617..5946617 100644 --- a/daemon/src/ignore_pool.c +++ b/src/ignore_pool.c diff --git a/daemon/src/local.c b/src/local.c index eef70ad..eef70ad 100644 --- a/daemon/src/local.c +++ b/src/local.c diff --git a/daemon/src/lock.c b/src/lock.c index cd68baf..cd68baf 100644 --- a/daemon/src/lock.c +++ b/src/lock.c diff --git a/daemon/src/log.c b/src/log.c index 88cadea..88cadea 100644 --- a/daemon/src/log.c +++ b/src/log.c diff --git a/daemon/src/main.c b/src/main.c index 1c75970..1c75970 100644 --- a/daemon/src/main.c +++ b/src/main.c diff --git a/daemon/src/mcast.c b/src/mcast.c index 9904544..9904544 100644 --- a/daemon/src/mcast.c +++ b/src/mcast.c diff --git a/daemon/src/netlink.c b/src/netlink.c index 0bde632..0bde632 100644 --- a/daemon/src/netlink.c +++ b/src/netlink.c diff --git a/daemon/src/network.c b/src/network.c index b9be318..b9be318 100644 --- a/daemon/src/network.c +++ b/src/network.c diff --git a/daemon/src/proxy.c b/src/proxy.c index b9bb04e..b9bb04e 100644 --- a/daemon/src/proxy.c +++ b/src/proxy.c diff --git a/daemon/src/read_config_lex.l b/src/read_config_lex.l index dee90c9..dee90c9 100644 --- a/daemon/src/read_config_lex.l +++ b/src/read_config_lex.l diff --git a/daemon/src/read_config_yy.y b/src/read_config_yy.y index 1668919..1668919 100644 --- a/daemon/src/read_config_yy.y +++ b/src/read_config_yy.y diff --git a/daemon/src/run.c b/src/run.c index 67437d8..67437d8 100644 --- a/daemon/src/run.c +++ b/src/run.c diff --git a/daemon/src/state_helper.c b/src/state_helper.c index 81b0d09..81b0d09 100644 --- a/daemon/src/state_helper.c +++ b/src/state_helper.c diff --git a/daemon/src/state_helper_tcp.c b/src/state_helper_tcp.c index af714dc..af714dc 100644 --- a/daemon/src/state_helper_tcp.c +++ b/src/state_helper_tcp.c diff --git a/daemon/src/stats-mode.c b/src/stats-mode.c index 9647bbf..9647bbf 100644 --- a/daemon/src/stats-mode.c +++ b/src/stats-mode.c diff --git a/daemon/src/sync-mode.c b/src/sync-mode.c index b32bef7..b32bef7 100644 --- a/daemon/src/sync-mode.c +++ b/src/sync-mode.c diff --git a/daemon/src/sync-nack.c b/src/sync-nack.c index 288dba4..288dba4 100644 --- a/daemon/src/sync-nack.c +++ b/src/sync-nack.c diff --git a/daemon/src/sync-notrack.c b/src/sync-notrack.c index 2b5ae38..2b5ae38 100644 --- a/daemon/src/sync-notrack.c +++ b/src/sync-notrack.c diff --git a/daemon/src/traffic_stats.c b/src/traffic_stats.c index b510b77..b510b77 100644 --- a/daemon/src/traffic_stats.c +++ b/src/traffic_stats.c |