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

diff --cc src/libcharon/plugins/unity/unity_handler.c
index 39dd5f0963870ebbe516b6d10c9192d8ec124777,30573c7ffbbe04a92c2576d164fd7b5679549e06..9d145b93f947c28971d2c4d68e55c2a2a8fd128a
--- 1/src/libcharon/plugins/unity/unity_handler.c
--- 2/src/libcharon/plugins/unity/unity_handler.c
+++ b/src/libcharon/plugins/unity/unity_handler.c
@@@ -187,13 -186,16 +186,18 @@@ static job_requeue_t add_exclude_async(
                                                                         FALSE, 0, 0, NULL, NULL, FALSE);
                child_cfg->add_traffic_selector(child_cfg, FALSE,
                                                                                entry->ts->clone(entry->ts));
 -                              traffic_selector_create_from_subnet(host->clone(host), 32, 0, 0));
+               host = ike_sa->get_my_host(ike_sa);
+               child_cfg->add_traffic_selector(child_cfg, TRUE,
++                              traffic_selector_create_from_subnet(host->clone(host),
++                                                                                                      32, 0, 0, 65535));
+               charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
+ 
                enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, TRUE);
                while (enumerator->enumerate(enumerator, &host))
                {
-                       has_vip = TRUE;
                        child_cfg->add_traffic_selector(child_cfg, TRUE,
 -                              traffic_selector_create_from_subnet(host->clone(host), 32, 0, 0));
 +                              traffic_selector_create_from_subnet(host->clone(host),
 +                                                                                                      32, 0, 0, 65535));
                }
                enumerator->destroy(enumerator);
  

diff --cc src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
Simple merge