summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2009-04-18 17:05:13 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2009-04-18 17:05:13 +0200
commita9554339451a0698e33b0964d0e8113f714470a4 (patch)
treedc08eb7c4aca8a3075e583cf729fb069c112fc94 /src
parent575fc906a302599cb9afeb136096dfd96bb57b17 (diff)
downloadconntrack-tools-a9554339451a0698e33b0964d0e8113f714470a4.tar.gz
conntrack-tools-a9554339451a0698e33b0964d0e8113f714470a4.zip
conntrack: add GRE support
This patch adds GRE support for the command line tool conntrack. With this patch, we support all protocols available in the kernel. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/conntrack.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 8a0c548..8a45bf9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ CLEANFILES = read_config_yy.c read_config_lex.c
sbin_PROGRAMS = conntrack conntrackd
conntrack_SOURCES = conntrack.c
-conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_sctp.la ../extensions/libct_proto_dccp.la ../extensions/libct_proto_unknown.la
+conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_sctp.la ../extensions/libct_proto_dccp.la ../extensions/libct_proto_gre.la ../extensions/libct_proto_unknown.la
conntrack_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@
conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c rbtree.c \
diff --git a/src/conntrack.c b/src/conntrack.c
index 8e28d86..42b5133 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -1056,6 +1056,7 @@ int main(int argc, char *argv[])
register_dccp();
register_icmp();
register_icmpv6();
+ register_gre();
register_unknown();
/* disable explicit missing arguments error output from getopt_long */