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

Use message hook to catch virtual IP, as it is not yet set in ike_updown

Browse Source
This commit is contained in:
Martin Willi
2010-03-25 14:39:32 +01:00
parent 479a7b7d17
commit dc70a5bb0b
1 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/farp/farp_listener.c
+30 -12
View File
@@ -60,21 +60,36 @@ static bool equals(host_t *a, host_t *b)
METHOD(listener_t, ike_updown, bool, METHOD(listener_t, ike_updown, bool,
private_farp_listener_t *this, ike_sa_t *ike_sa, bool up) private_farp_listener_t *this, ike_sa_t *ike_sa, bool up)
{ {
host_t *ip; if (!up)
ip = ike_sa->get_virtual_ip(ike_sa, FALSE);
if (ip)
{ {
this->lock->write_lock(this->lock); host_t *ip;
if (up)
{ ip = ike_sa->get_virtual_ip(ike_sa, FALSE);
ip = ip->clone(ip); if (ip)
ip = this->ips->put(this->ips, ip, ip);
}
else
{ {
this->lock->write_lock(this->lock);
ip = this->ips->remove(this->ips, ip); ip = this->ips->remove(this->ips, ip);
this->lock->unlock(this->lock);
DESTROY_IF(ip);
} }
}
return TRUE;
}
METHOD(listener_t, message_hook, bool,
private_farp_listener_t *this, ike_sa_t *ike_sa,
message_t *message, bool incoming)
{
if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED &&
message->get_exchange_type(message) == IKE_AUTH &&
!message->get_request(message))
{
host_t *ip;
ip = ike_sa->get_virtual_ip(ike_sa, FALSE);
ip = ip->clone(ip);
this->lock->write_lock(this->lock);
ip = this->ips->put(this->ips, ip, ip);
this->lock->unlock(this->lock); this->lock->unlock(this->lock);
DESTROY_IF(ip); DESTROY_IF(ip);
} }
@@ -119,7 +134,10 @@ farp_listener_t *farp_listener_create()
INIT(this, INIT(this,
.public = { .public = {
.listener.ike_updown = _ike_updown, .listener = {
.ike_updown = _ike_updown,
.message = _message_hook,
},
.is_active = _is_active, .is_active = _is_active,
.destroy = _destroy, .destroy = _destroy,
}, },