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

ike-sa: Keep track of the address of the gateway that redirected us

Browse Source
This commit is contained in:
Tobias Brunner
2016-03-04 16:02:58 +01:00
parent 489d154e63
commit e4af6e6b7a
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ike_sa.c
+20 -1
View File
@@ -287,6 +287,11 @@ struct private_ike_sa_t {
* Whether to follow IKEv2 redirects * Whether to follow IKEv2 redirects
*/ */
bool follow_redirects; bool follow_redirects;
/**
* Original gateway address from which we got redirected
*/
host_t *redirected_from;
}; };
/** /**
@@ -391,6 +396,12 @@ METHOD(ike_sa_t, set_other_host, void,
this->other_host = other; this->other_host = other;
} }
METHOD(ike_sa_t, get_redirected_from, host_t*,
private_ike_sa_t *this)
{
return this->redirected_from;
}
METHOD(ike_sa_t, get_peer_cfg, peer_cfg_t*, METHOD(ike_sa_t, get_peer_cfg, peer_cfg_t*,
private_ike_sa_t *this) private_ike_sa_t *this)
{ {
@@ -748,6 +759,8 @@ METHOD(ike_sa_t, set_state, void,
{ {
keepalives = TRUE; keepalives = TRUE;
} }
DESTROY_IF(this->redirected_from);
this->redirected_from = NULL;
} }
break; break;
} }
@@ -1960,7 +1973,7 @@ METHOD(ike_sa_t, handle_redirect, bool,
private_ike_sa_t *this, identification_t *gateway) private_ike_sa_t *this, identification_t *gateway)
{ {
char gw[BUF_LEN]; char gw[BUF_LEN];
host_t *other; host_t *other, *from;
DBG1(DBG_IKE, "redirected to %Y", gateway); DBG1(DBG_IKE, "redirected to %Y", gateway);
if (!this->follow_redirects) if (!this->follow_redirects)
@@ -1978,16 +1991,20 @@ METHOD(ike_sa_t, handle_redirect, bool,
gateway); gateway);
return FALSE; return FALSE;
} }
from = this->other_host->clone(this->other_host);
switch (this->state) switch (this->state)
{ {
case IKE_CONNECTING: case IKE_CONNECTING:
reset(this); reset(this);
set_other_host(this, other); set_other_host(this, other);
DESTROY_IF(this->redirected_from);
this->redirected_from = from;
return TRUE; return TRUE;
default: default:
DBG1(DBG_IKE, "unable to handle redirect for IKE_SA in state %N", DBG1(DBG_IKE, "unable to handle redirect for IKE_SA in state %N",
ike_sa_state_names, this->state); ike_sa_state_names, this->state);
other->destroy(other); other->destroy(other);
from->destroy(from);
return FALSE; return FALSE;
} }
} }
@@ -2505,6 +2522,7 @@ METHOD(ike_sa_t, destroy, void,
DESTROY_IF(this->other_id); DESTROY_IF(this->other_id);
DESTROY_IF(this->local_host); DESTROY_IF(this->local_host);
DESTROY_IF(this->remote_host); DESTROY_IF(this->remote_host);
DESTROY_IF(this->redirected_from);
DESTROY_IF(this->ike_cfg); DESTROY_IF(this->ike_cfg);
DESTROY_IF(this->peer_cfg); DESTROY_IF(this->peer_cfg);
@@ -2585,6 +2603,7 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator,
.send_dpd = _send_dpd, .send_dpd = _send_dpd,
.send_keepalive = _send_keepalive, .send_keepalive = _send_keepalive,
.handle_redirect = _handle_redirect, .handle_redirect = _handle_redirect,
.get_redirected_from = _get_redirected_from,
.get_keymat = _get_keymat, .get_keymat = _get_keymat,
.add_child_sa = _add_child_sa, .add_child_sa = _add_child_sa,
.get_child_sa = _get_child_sa, .get_child_sa = _get_child_sa,
src/libcharon/sa/ike_sa.h
+7
View File
@@ -857,6 +857,13 @@ struct ike_sa_t {
*/ */
bool (*handle_redirect)(ike_sa_t *this, identification_t *gateway); bool (*handle_redirect)(ike_sa_t *this, identification_t *gateway);
/**
* Get the address of the gateway that redirected us.
*
* @return original gateway address
*/
host_t *(*get_redirected_from)(ike_sa_t *this);
/** /**
* Get the keying material of this IKE_SA. * Get the keying material of this IKE_SA.
* *