conntrack-tools.git/src, branch vyatta/VC6.4-2012.03.27/amd64conntrack-tools i.e. conntrack and conntrackd (mirror of https://github.com/vyos/conntrack-tools.git)
https://git.amelek.net/vyos/conntrack-tools.git/atom?h=vyatta%2FVC6.4-2012.03.27%2Famd642012-02-08T19:43:43+00:00Merge branch 'upstream' into oxnard2012-02-08T19:43:43+00:00Gaurav Sinhagaurav.sinha@vyatta.com2012-02-08T19:43:43+00:00urn:sha1:21e68c7e4653ff077d0f0182b5d1da2f8645b6c6Merge branch 'master' of git://git.netfilter.org/conntrack-tools into upstream2012-02-08T19:31:31+00:00Gaurav Sinhagaurav.sinha@vyatta.com2012-02-08T19:31:31+00:00urn:sha1:9f9a63cecdc6ac4f449d3eacda6c591f0de9fbf3conntrackd: fix parsing of expectation class, helper name and NAT2012-02-07T20:30:40+00:00Pablo Neira Ayusopablo@netfilter.org2012-02-07T20:25:48+00:00urn:sha1:167eb3e2028561ab2cc0f2b7b6ff9d24c56514f6
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 <pablo@netfilter.org>
conntrackd: support expectfn synchronization for expectations2012-02-06T23:53:16+00:00Pablo Neira Ayusopablo@netfilter.org2012-02-05T20:42:31+00:00urn:sha1:a07ef78b7f3d6628f889f2f2167fb5e748eb567e
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
conntrackd: add support to synchronize helper name2012-02-06T23:53:10+00:00Pablo Neira Ayusopablo@netfilter.org2012-02-06T23:53:10+00:00urn:sha1:721fbbde40ee5ecc966c144be11516839ab86728
For both conntrack and expectations.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
conntrackd: add NAT expectation support2012-02-06T23:50:15+00:00Pablo Neira Ayusopablo@netfilter.org2012-02-06T23:27:51+00:00urn:sha1:8259e6dca13127e51f81ca7e75e419969417597f
This patch adds the missing bits to support NAT expectation support.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
conntrackd: add support expectation class synchronization2012-02-06T23:26:59+00:00Pablo Neira Ayusopablo@netfilter.org2012-02-05T20:03:43+00:00urn:sha1:f7824f63ae45c4979abe95fd3e7702eacd63bec1
This patch adds support for synchronizing the expectation class.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Merge branch 'upstream' into oxnard2012-01-23T19:43:15+00:00Gaurav Sinhagaurav.sinha@vyatta.com2012-01-23T19:43:15+00:00urn:sha1:c482ddb3278aee162250d53ccb3b2bd2c5987b2dRevert "Merge of conntrack-tools from netfilter.org with support for dumping expectations in XML format."2012-01-23T19:39:51+00:00Gaurav Sinhagaurav.sinha@vyatta.com2012-01-23T19:39:51+00:00urn:sha1:66da74b336fe66472f9b5d16f730e0261c5ef4af
Generated files got committed by git commit -a, thus reverting the commit.
This reverts commit d8def099fed622b42f7b66468981d6d5c7aac74c.
Merge of conntrack-tools from netfilter.org with support for dumping expectations in XML format.2012-01-23T19:35:35+00:00Gaurav Sinhagaurav.sinha@vyatta.com2012-01-23T19:35:35+00:00urn:sha1:d8def099fed622b42f7b66468981d6d5c7aac74c