conntrack-tools.git, branch vyatta/VC6.5R1/i386

1:1.0.1-2+vyatta35

2012-09-12T21:06:02+00:00

conntrackd: parse: fix wrong maximum length for ATTR_EXP_FN

2012-09-12T21:05:08+00:00

It was set to NFCT_HELPER_NAME_MAX (16 bytes), but we have function names that are larger, eg. nf-nat-follow-master which is 18 bytes long. This leads to hitting malformed message while synchronizing expectations. I'll add some new constant to libnetfilter_conntrack instead of hardcoding this, later. Reported-by: Gaurav Sinha Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 46faeab56cf4117f41cb6f1f1c40a9c18a81372f) (cherry picked from commit 0cf70ce9b1bcb63d54d9514558b74ae2bde39d9f)

1:1.0.1-2+vyatta34

2012-07-31T17:25:55+00:00

fixing 8243: fix will selectively flush the conntrack table on master, ignoring ignored addresses during flush

2012-07-31T17:25:05+00:00

1:1.0.1-2+vyatta33

2012-07-07T00:04:59+00:00

conntrackd: fix commit operation, needs to be synchronous

2012-07-07T00:03:36+00:00

While adding the expectation support for conntrackd, I accidentally broke synchrony in 'conntrackd -c' command. Basically, conntrackd -c should not return control to the shell until the cache has been committed. Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 7eb63b5872f07903d952aa5cfd6ad0e7647a066a) (cherry picked from commit 93d244a982f80a691bfb6eb4e17e2cccc32a5cb9)

conntrackd: add bugtrap notice in case of flush while commit in progress

2012-07-07T00:03:18+00:00

Flushing the external cache, ie. conntrackd -f, while commit is in progress is not allowed anymore, ie. conntrackd -c. Note that conntrackd -c is synchronous. Thus, it returns control to the caller once the commit has finished. Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 8648ae6d08bb84030c2c3519454532f6e04e31d9) (cherry picked from commit 3611b5f5992837224205361c25cfed55c47af8c4)

1:1.0.1-2+vyatta32

2012-06-07T17:37:08+00:00

Merge branch 'cthelper12' of git://git.netfilter.org/conntrack-tools into pacifica

2012-06-07T17:36:39+00:00

Conflicts: include/helper.h src/expect.c src/helpers/ftp.c src/helpers/rpc.c src/helpers/tns.c tests/conntrackd/cthelper/main.c tests/conntrackd/cthelper/run-test.sh

tests: conntrackd: add cthelper-test infrastructure

2012-06-07T15:39:38+00:00

This patch adds the automated testing infrastructure the user-space helpers. Basically, this adds the `cthelper-test' program that can be invoked from the command line: ./cthelper-test pcaps/oracle-tns-redirect.pcap tns tcp 1521 To test the helper with one PCAP file that contains traces of Oracle TNS traffic. It also provides tweaks to test the DNAT content mangling code: ./cthelper-test pcaps/oracle-tns-redirect.pcap tns tcp 1521 dnat This will also allow fuzzy testing of user-space helper, for further validation, not yet implemented. To compile this tool, you have to run: ./configure make check under the qa/cthelper-test/ directory. I'm doing like this because this directory is not included in the standalone tarball that make distcheck generates (I don't want to bloat it with development tools that can be retrieved from the git repository). Signed-off-by: Pablo Neira Ayuso