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

Use send_no_marker to send NAT keepalives.

Browse Source
This commit is contained in:
Tobias Brunner
2012-08-08 15:12:25 +02:00
parent 30dc7dff4d
commit 75f8316332
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/network/sender.c
+3 -8
View File
@@ -127,15 +127,10 @@ METHOD(sender_t, send_, void,
if (dst->get_port(dst) != IKEV2_UDP_PORT && if (dst->get_port(dst) != IKEV2_UDP_PORT &&
src->get_port(src) != IKEV2_UDP_PORT) src->get_port(src) != IKEV2_UDP_PORT)
{ {
chunk_t marker = chunk_from_chars(0x00, 0x00, 0x00, 0x00), data; chunk_t data, marker = chunk_from_chars(0x00, 0x00, 0x00, 0x00);
data = packet->get_data(packet); data = chunk_cat("cc", marker, packet->get_data(packet));
/* NAT keepalives have no marker prepended */ packet->set_data(packet, data);
if (data.len != 1 || data.ptr[0] != 0xFF)
{
data = chunk_cat("cc", marker, data);
packet->set_data(packet, data);
}
} }
send_no_marker(this, packet); send_no_marker(this, packet);
src/libcharon/sa/ike_sa.c
+1 -1
View File
@@ -489,7 +489,7 @@ METHOD(ike_sa_t, send_keepalive, void,
data.len = 1; data.len = 1;
packet->set_data(packet, data); packet->set_data(packet, data);
DBG1(DBG_IKE, "sending keep alive"); DBG1(DBG_IKE, "sending keep alive");
charon->sender->send(charon->sender, packet); charon->sender->send_no_marker(charon->sender, packet);
diff = 0; diff = 0;
} }
job = send_keepalive_job_create(this->ike_sa_id); job = send_keepalive_job_create(this->ike_sa_id);