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

listen for CHILD_SA state changes only until it has been installed

Browse Source
This commit is contained in:
Martin Willi
2009-07-03 16:16:00 +02:00
parent 7be566dc1f
commit 6e61122727
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/nm/nm_service.c
+5 -3
View File
@@ -173,6 +173,7 @@ static bool child_state_change(listener_t *listener, ike_sa_t *ike_sa,
{ {
case CHILD_INSTALLED: case CHILD_INSTALLED:
signal_ipv4_config(private->plugin, ike_sa, child_sa); signal_ipv4_config(private->plugin, ike_sa, child_sa);
listener->child_state_change = NULL;
break; break;
case CHILD_DESTROYING: case CHILD_DESTROYING:
signal_failure(private->plugin, signal_failure(private->plugin,
@@ -208,6 +209,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
{ {
nm_creds_t *creds; nm_creds_t *creds;
NMSettingVPN *settings; NMSettingVPN *settings;
listener_t *listener;
identification_t *user = NULL, *gateway; identification_t *user = NULL, *gateway;
const char *address, *str; const char *address, *str;
bool virtual, encap, ipcomp; bool virtual, encap, ipcomp;
@@ -459,8 +461,9 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
* Register listener * Register listener
*/ */
NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->ike_sa = ike_sa; NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->ike_sa = ike_sa;
charon->bus->add_listener(charon->bus, listener = &NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->listener;
&NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->listener); listener->child_state_change = child_state_change;
charon->bus->add_listener(charon->bus, listener);
charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa); charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa);
return TRUE; return TRUE;
} }
@@ -556,7 +559,6 @@ static void nm_strongswan_plugin_init(NMStrongswanPlugin *plugin)
private->plugin = NM_VPN_PLUGIN(plugin); private->plugin = NM_VPN_PLUGIN(plugin);
memset(&private->listener.log, 0, sizeof(listener_t)); memset(&private->listener.log, 0, sizeof(listener_t));
private->listener.ike_state_change = ike_state_change; private->listener.ike_state_change = ike_state_change;
private->listener.child_state_change = child_state_change;
private->listener.ike_keys = ike_keys; private->listener.ike_keys = ike_keys;
} }