conntrack-tools.git/include, branch user_space_helpers

Merge branch 'cthelper9' of git://git.netfilter.org/conntrack-tools into user_space_helpers

2012-05-30T14:54:05+00:00

Conflicts: .gitignore src/run.c

conntrackd: add cthelper infrastructure (+ example FTP helper)

2012-05-28T10:34:59+00:00

This patch adds the user-space helper infrastructure. It also contains the implementation of the FTP helper in user-space. There's one example file that you can use to configure conntrackd as user-space connection tracking helper under: doc/helper/conntrackd.conf Signed-off-by: Pablo Neira Ayuso

conntrackd: move ctnetlink code to ctnl.c (removed from run.c)

2012-05-28T10:34:58+00:00

This patch moves the specific ctnetlink code to ctnl.c to prepare the introduction of the cthelper infrastructure. Signed-off-by: Pablo Neira Ayuso

conntrackd: generalize file descriptor infrastructure

2012-05-28T10:34:32+00:00

This patch generalizes the select-based file descriptor infrastructure by allowing you to register file descriptors and its callbacks. Instead of hardcoding the descriptors that needs to be checked. Now, struct fds_item contains a callback and pointer to data that is passed to it: struct fds_item { struct list_head head; int fd; + void (*cb)(void *data); + void *data; }; Then, we check which ones are active in the select_main_step() function: list_for_each_entry(cur, &STATE(fds)->list, head) { if (FD_ISSET(cur->fd, &readfds)) cur->cb(cur->data); } And it invoked the corresponding callback. I had to slightly modify the channel infrastructure to fit it into the changes. This modularity is required for the upcoming cthelper support. Signed-off-by: Pablo Neira Ayuso

src: integrate nfct into the conntrack-tools tree

2012-05-26T13:29:19+00:00

I'll need for the upcoming cthelper infrastructure. Moreover, we avoid more fragmentation in the netfilter user-space utilities. And the plan is that `nfct' will replace `conntrack' at some point. Signed-off-by: Pablo Neira Ayuso

Merge branch 'master' of git://git.netfilter.org/conntrack-tools into upstream

2012-02-08T19:31:31+00:00

conntrackd: support expectfn synchronization for expectations

2012-02-06T23:53:16+00:00

Signed-off-by: Pablo Neira Ayuso

conntrackd: add support to synchronize helper name

2012-02-06T23:53:10+00:00

For both conntrack and expectations. Signed-off-by: Pablo Neira Ayuso

conntrackd: add NAT expectation support

2012-02-06T23:50:15+00:00

This patch adds the missing bits to support NAT expectation support. Signed-off-by: Pablo Neira Ayuso

conntrackd: add support expectation class synchronization

2012-02-06T23:26:59+00:00

This patch adds support for synchronizing the expectation class. Signed-off-by: Pablo Neira Ayuso