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

Added log message if peer does not accept/provide IPComp proposal.

Browse Source
This commit is contained in:
Tobias Brunner
2012-05-24 15:32:28 +02:00
parent 47b448b807
commit 3451ecd7ac
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/quick_mode.c
+12 -2
View File
@@ -887,12 +887,17 @@ METHOD(task_t, process_r, status_t,
{ {
list = sa_payload->get_ipcomp_proposals(sa_payload, list = sa_payload->get_ipcomp_proposals(sa_payload,
&this->cpi_i); &this->cpi_i);
if (!list->get_count(list))
{
DBG1(DBG_IKE, "expected IPComp proposal but peer did "
"not send one, IPComp disabled");
this->cpi_i = 0;
}
} }
} }
if (!list || !list->get_count(list)) if (!list || !list->get_count(list))
{ {
DESTROY_IF(list); DESTROY_IF(list);
this->cpi_i = 0;
list = sa_payload->get_proposals(sa_payload); list = sa_payload->get_proposals(sa_payload);
} }
private = this->ike_sa->supports_extension(this->ike_sa, private = this->ike_sa->supports_extension(this->ike_sa,
@@ -1047,11 +1052,16 @@ METHOD(task_t, process_i, status_t,
{ {
list = sa_payload->get_ipcomp_proposals(sa_payload, list = sa_payload->get_ipcomp_proposals(sa_payload,
&this->cpi_r); &this->cpi_r);
if (!list->get_count(list))
{
DBG1(DBG_IKE, "peer did not acccept our IPComp proposal, "
"IPComp disabled");
this->cpi_i = 0;
}
} }
if (!list || !list->get_count(list)) if (!list || !list->get_count(list))
{ {
DESTROY_IF(list); DESTROY_IF(list);
this->cpi_i = 0;
list = sa_payload->get_proposals(sa_payload); list = sa_payload->get_proposals(sa_payload);
} }
private = this->ike_sa->supports_extension(this->ike_sa, private = this->ike_sa->supports_extension(this->ike_sa,