denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charon-nm: Use VIP (if any) as local address

Browse Source 
NM will install this address on the provided device.
This commit is contained in:
Tobias Brunner
2013-03-19 16:25:26 +01:00
parent c15eea7306
commit 9cf09ecad7
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-nm/nm/nm_service.c
+10 -1
View File
@@ -87,11 +87,11 @@ static void signal_ipv4_config(NMVPNPlugin *plugin,
NMStrongswanPluginPrivate *priv = NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin); NMStrongswanPluginPrivate *priv = NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin);
GValue *val; GValue *val;
GHashTable *config; GHashTable *config;
enumerator_t *enumerator;
host_t *me; host_t *me;
nm_handler_t *handler; nm_handler_t *handler;
config = g_hash_table_new(g_str_hash, g_str_equal); config = g_hash_table_new(g_str_hash, g_str_equal);
me = ike_sa->get_my_host(ike_sa);
handler = priv->handler; handler = priv->handler;
/* NM requires a tundev, but netkey does not use one. Passing the physical /* NM requires a tundev, but netkey does not use one. Passing the physical
@@ -102,6 +102,15 @@ static void signal_ipv4_config(NMVPNPlugin *plugin,
g_value_set_string (val, priv->tun->get_name(priv->tun)); g_value_set_string (val, priv->tun->get_name(priv->tun));
g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val); g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
/* NM installs this IP address on the interface above, so we use the VIP if
* we got one.
*/
enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, TRUE);
if (!enumerator->enumerate(enumerator, &me))
{
me = ike_sa->get_my_host(ike_sa);
}
enumerator->destroy(enumerator);
val = g_slice_new0(GValue); val = g_slice_new0(GValue);
g_value_init(val, G_TYPE_UINT); g_value_init(val, G_TYPE_UINT);
g_value_set_uint(val, *(u_int32_t*)me->get_address(me).ptr); g_value_set_uint(val, *(u_int32_t*)me->get_address(me).ptr);