conntrack-tools.git/extensions, branch upstream

Merge remote-tracking branch 'source/master' into upstream

2015-10-02T06:43:42+00:00

src: Use stdint types

2015-05-21T12:46:53+00:00

Signed-off-by: Felix Janda Signed-off-by: Pablo Neira Ayuso

conntrack: fix doc/cli/test.sh create-expect

2015-02-11T15:34:27+00:00

when I run the test script of conntrack-tools sh doc/cli/test.sh create-expect the output is: conntrack v1.4.1 (conntrack-tools): You need to supply the `--reply-port-src' option for this command. Try `conntrack -h' or 'conntrack --help' for more information. This used to work without the --reply-port-src stuff using version 0.9.13 IIRC. Reported-by: Thomas Jarosch Signed-off-by: Pablo Neira Ayuso

icmp[v6]: --icmp[v6]-[type|code] are optional for updates and deletes

2012-03-27T09:20:14+00:00

Signed-off-by: Pablo Neira Ayuso

Revert "Merge of conntrack-tools from netfilter.org with support for dumping expectations in XML format."

2012-01-23T19:39:51+00:00

Generated files got committed by git commit -a, thus reverting the commit. This reverts commit d8def099fed622b42f7b66468981d6d5c7aac74c.

Merge of conntrack-tools from netfilter.org with support for dumping expectations in XML format.

2012-01-23T19:35:35+00:00

Updating upstream with merged content from netfilter conntrack-tools version 1.0.1

2012-01-12T22:45:24+00:00

conntrack: support SYN_SENT2 TCP state as --state parameter

2011-02-22T14:49:14+00:00

Since Linux kernel 2.6.31, the LISTEN state is SYN_SENT2. With this patch, we allow to use -p tcp --state SYN_SENT2 which was not possible so far. Signed-off-by: Pablo Neira Ayuso

debian conntrack 0.9.14-2

2010-06-14T22:51:25+00:00

conntrack: fix manually created TCP entries with window tracking enabled

2009-12-23T22:29:06+00:00

With this patch, we allow to manually create TCP entries in the table. Basically, we disable TCP window tracking for this entry to avoid problems. Reported-by: Roman Fiedler Signed-off-by: Pablo Neira Ayuso