Merge branch 'connmark'
authorMartin Willi <martin@revosec.ch>
Fri, 20 Feb 2015 14:59:19 +0000 (15:59 +0100)
committerMartin Willi <martin@revosec.ch>
Fri, 20 Feb 2015 15:34:54 +0000 (16:34 +0100)
commitc72fa57a00bbb90d97343d6e340c5c0f1aab16be
tree1be78ecc0892a5581fee359112a6257d2232d995
parent45ab5b0fcae2620b88a0cd167f09eb440aebfca7
parent1e1e88e6d921831b5453752a391c8c1438dec649
Merge branch 'connmark'

Introduce a connmark plugin that uses Netfilter conntracks mark to select the
correct return-path SAs for client-initiated connections. This can be used
to distinguish transport mode clients behind the same NAT router.

Fixes #365.