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

some cleanups

Browse Source 
not installing %any DNS servers
This commit is contained in:
Martin Willi
2007-03-08 16:58:59 +00:00
parent 8d0cd21a01
commit 8b8dd69dee
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/tasks/ike_auth.c
+5 -9
View File
@@ -370,11 +370,9 @@ static status_t process_eap(private_ike_auth_t *this, message_t *message)
switch (this->eap_auth->process(this->eap_auth, eap, &eap)) switch (this->eap_auth->process(this->eap_auth, eap, &eap))
{ {
case NEED_MORE: case NEED_MORE:
DBG1(DBG_IKE, "eap processed, but more needed");
break; break;
case SUCCESS: case SUCCESS:
/* EAP exchange completed, now create and process AUTH */ /* EAP exchange completed, now create and process AUTH */
DBG1(DBG_IKE, "eap processed, got EAP_SUCCESS");
this->public.task.build = (status_t(*)(task_t*,message_t*))build_auth_eap; this->public.task.build = (status_t(*)(task_t*,message_t*))build_auth_eap;
this->public.task.process = (status_t(*)(task_t*,message_t*))process_auth_eap; this->public.task.process = (status_t(*)(task_t*,message_t*))process_auth_eap;
return NEED_MORE; return NEED_MORE;
@@ -403,7 +401,6 @@ static status_t build_eap(private_ike_auth_t *this, message_t *message)
if (this->initiator) if (this->initiator)
{ {
DBG1(DBG_IKE, "adding payload to message");
chunk_t chunk = this->eap_payload->get_data(this->eap_payload); chunk_t chunk = this->eap_payload->get_data(this->eap_payload);
eap = eap_payload_create_data(chunk); eap = eap_payload_create_data(chunk);
message->add_payload(message, (payload_t*)eap); message->add_payload(message, (payload_t*)eap);
@@ -440,6 +437,11 @@ static status_t build_i(private_ike_auth_t *this, message_t *message)
return collect_my_init_data(this, message); return collect_my_init_data(this, message);
} }
if (build_id(this, message) != SUCCESS)
{
return FAILED;
}
policy = this->ike_sa->get_policy(this->ike_sa); policy = this->ike_sa->get_policy(this->ike_sa);
if (policy->get_auth_method(policy) == AUTH_EAP) if (policy->get_auth_method(policy) == AUTH_EAP)
{ {
@@ -453,10 +455,6 @@ static status_t build_i(private_ike_auth_t *this, message_t *message)
} }
} }
if (build_id(this, message) != SUCCESS)
{
return FAILED;
}
return NEED_MORE; return NEED_MORE;
} }
@@ -644,7 +642,6 @@ static void migrate(private_ike_auth_t *this, ike_sa_t *ike_sa)
chunk_free(&this->other_nonce); chunk_free(&this->other_nonce);
DESTROY_IF(this->my_packet); DESTROY_IF(this->my_packet);
DESTROY_IF(this->other_packet); DESTROY_IF(this->other_packet);
//DESTROY_IF(this->eap_payload);
if (this->eap_auth) if (this->eap_auth)
{ {
this->eap_auth->authenticator_interface.destroy( this->eap_auth->authenticator_interface.destroy(
@@ -678,7 +675,6 @@ static void destroy(private_ike_auth_t *this)
chunk_free(&this->other_nonce); chunk_free(&this->other_nonce);
DESTROY_IF(this->my_packet); DESTROY_IF(this->my_packet);
DESTROY_IF(this->other_packet); DESTROY_IF(this->other_packet);
//DESTROY_IF(this->eap_payload);
if (this->eap_auth) if (this->eap_auth)
{ {
this->eap_auth->authenticator_interface.destroy( this->eap_auth->authenticator_interface.destroy(
src/charon/sa/tasks/ike_config.c
+4 -1
View File
@@ -348,7 +348,10 @@ static status_t process_i(private_ike_config_t *this, message_t *message)
while (this->dns->remove_last(this->dns, (void**)&ip) == SUCCESS) while (this->dns->remove_last(this->dns, (void**)&ip) == SUCCESS)
{ {
this->ike_sa->add_dns_server(this->ike_sa, ip); if (!ip->is_anyaddr(ip))
{
this->ike_sa->add_dns_server(this->ike_sa, ip);
}
ip->destroy(ip); ip->destroy(ip);
} }
} }