conntrack-tools.git/src, branch upstream

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

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

conntrack: add zone direction support

2015-09-29T18:39:42+00:00

This patch adds support for zone directions. Since all options have the orig/reply as a prefix, I named it --orig-zone and --reply-zone to stay consistent with the rest of the cmdline options. As for the option chars, there was no unallocated reasonable combination, thus only long options are officially exposed in the help, similarly as in other cases. Test suite results, after patch: OK: 79 BAD: 0 Signed-off-by: Daniel Borkmann Signed-off-by: Pablo Neira Ayuso

nfct: Update syntax to specify command before subsystem

2015-08-26T18:43:55+00:00

This patch gets the nfct syntax in sync with nft so it looks like this: nfct object ... instead of: nfct object ... This patch retains backward compatibility so you can still use the old syntax. The manpage and tests have been also updated to promote the adoption of this syntax. We should have little existing clients of this tool as we can only use this to configure the cttimeout and cthelper infrastructures. Signed-off-by: Pablo Neira Ayuso

nfct: don't link against libnetfilter_conntrack

2015-08-26T18:43:55+00:00

The nfct program uses none of the symbols of libnetfilter_conntrack. Linking against it means that distributors have to maintain an useless depedency. This was spotted by the dpkg-shlibdeps tool. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso

conntrackd: missing break in expectation message parser function

2015-08-18T17:22:07+00:00

Fortunately, the TLVs come in order in the message, however, if the order is changed we'll incorrectly set up the expectation. Signed-off-by: Pablo Neira Ayuso

conntrackd: use strncpy to set up the cache name

2015-08-18T17:22:07+00:00

This is not exposed, but use the strncpy() variant to calm down static code validators. Signed-off-by: Pablo Neira Ayuso

conntrackd: simplify branch in tcp_accept()

2015-08-18T17:22:07+00:00

The same code is executed regardless the reason why accept() has failed. Signed-off-by: Pablo Neira Ayuso

conntrackd: fix error handling in nfq_queue_cb()

2015-08-18T17:22:06+00:00

Make sure we have a clean exit on error, everything needs to be properly released. Signed-off-by: Pablo Neira Ayuso

conntrackd: fix descriptor leak in do_local_request()

2015-08-18T17:22:06+00:00

Signed-off-by: Pablo Neira Ayuso

conntrackd: fix leak in fork_process_new()

2015-08-18T17:22:06+00:00

Release the child_process structure in case that fork() fails. Signed-off-by: Pablo Neira Ayuso