conntrack-tools.git, branch vyatta/VC6.4-2012.03.27/amd64

1:1.0.1-2+vyatta20+oxnard1

2012-03-03T10:21:37+00:00

new branch

2012-03-03T10:21:36+00:00

1:1.0.1-2+vyatta20

2012-02-08T19:53:16+00:00

Merge branch 'oxnard' of git.vyatta.com:/git/conntrack-tools into oxnard

2012-02-08T19:46:41+00:00

Merge branch 'upstream' into oxnard

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

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

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

conntrackd: fix parsing of expectation class, helper name and NAT

2012-02-07T20:30:40+00:00

I forgot to modify the body of msg2exp to include the recently committed support for the expectation class, helper name and NAT. This patch fixes the problem. Now in node-1 (primary), it shows: proto=17 src=192.168.11.4 dst=192.168.10.5 sport=0 dport=5060 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.10.5 master-dst=192.168.11.4 sport=5060 dport=5060 PERMANENT class=0 helper=sip [active since 31s] And it node-2 (secondary), it shows: proto=17 src=192.168.11.4 dst=192.168.10.5 sport=0 dport=5060 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.10.5 master-dst=192.168.11.4 sport=5060 dport=5060 PERMANENT class=0 helper=sip [active since 180s] This has been tested with the SIP conntrack helper. Signed-off-by: Pablo Neira Ayuso

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