]> git.ipfire.org Git - people/ms/strongswan.git/commit
projects / people / ms / strongswan.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a36b49f a2fd08d)
Merge branch 'vip-shunts'
authorMartin Willi <martin@revosec.ch>
Fri, 1 Mar 2013 10:30:13 +0000 (11:30 +0100)
committerMartin Willi <martin@revosec.ch>
Fri, 1 Mar 2013 10:30:13 +0000 (11:30 +0100)
commitec1b4e6638598b5c77684cd01ab4caeaf3e230a4
tree1dcfc3c5a74cd570ed494377de27cbcc52fffb8atree | snapshot
parenta36b49f3cb941869127bccd0a30fd1ff4905dc82commit | diff
parenta2fd08dd26eadb75c4a58506fd916a9adf6d23b3commit | diff
Merge branch 'vip-shunts'

Installs bypass policies for the physical address if a virtual address is
assigned, and installs a proper source route to actually use the physical
address for bypassed destinations.

Conflicts:
src/libcharon/plugins/unity/unity_handler.c
src/libcharon/plugins/unity/unity_handler.c diff1 | diff2 | blob | history
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c diff1 | diff2 | blob | history
Michael's strongswan development tree