conntrack: fix parsing payload len
Merge branch 'master' of https://git.netfilter.org/libnetfilter_conntrack
Merge remote-tracking branch 'netfilter/master'
Merge remote-tracking branch 'netfilter/master'
Merge remote-tracking branch 'netfilter/master'
Merge remote-tracking branch 'netfilter/master'
conntrack: api: add two new bitmask functions

This patch adds two functions, useful for ulogd IPFIX
output module.

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: Florian Westphal <fw@strlen.de>
qa: add tests for new bitmask functions

for nfct_bitmask_clear() and nfct_bitmask_equal()

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: Florian Westphal <fw@strlen.de>
Merge remote-tracking branch 'netfilter/master'
Merge branch 'master' of https://github.com/chamaken/libnetfilter_conntrack
qa: build unshared nfct environment

nssocket forks new netns child and set network environment defined in
nssocket.h

    * connect parent by veth peer
    * device names and addresses are VETH_...
    * set default gateway device to dummy, named DUMMY_LINK_NAME

It enables get socket fd from child ns by nssocket(), see example
ct_tcp_event.c

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
conntrack: add mark event filter

This patch adds mark filter for event listener, using same struct
nfct_filter_dump_mark.

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
xcnt: add XCOUNTERS

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Merge branch 'master' into testing