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

ikev1: When sending fragments, use ports to decide if a non-ESP marker is added

Browse Source 
This is same same logic used by sender and might apply in some cases (e.g.
when initiating to port 4500).
This commit is contained in:
Tobias Brunner
2013-08-15 15:12:00 +02:00
parent e42ab08a73
commit c81a6ff907
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+8 -6
View File
@@ -413,7 +413,6 @@ static bool send_packet(private_task_manager_t *this, bool request,
{ {
bool use_frags = FALSE; bool use_frags = FALSE;
ike_cfg_t *ike_cfg; ike_cfg_t *ike_cfg;
host_t *src, *dst;
chunk_t data; chunk_t data;
ike_cfg = this->ike_sa->get_ike_cfg(this->ike_sa); ike_cfg = this->ike_sa->get_ike_cfg(this->ike_sa);
@@ -438,14 +437,17 @@ static bool send_packet(private_task_manager_t *this, bool request,
fragment_payload_t *fragment; fragment_payload_t *fragment;
u_int8_t num, count; u_int8_t num, count;
size_t len, frag_size; size_t len, frag_size;
bool nat; host_t *src, *dst;
/* reduce size due to non-ESP marker */
nat = this->ike_sa->has_condition(this->ike_sa, COND_NAT_ANY);
frag_size = this->frag.size - (nat ? 4 : 0);
src = packet->get_source(packet); src = packet->get_source(packet);
dst = packet->get_destination(packet); dst = packet->get_destination(packet);
frag_size = this->frag.size;
if (dst->get_port(dst) != IKEV2_UDP_PORT &&
src->get_port(src) != IKEV2_UDP_PORT)
{ /* reduce size due to non-ESP marker */
frag_size -= 4;
}
count = (data.len / (frag_size + 1)) + 1; count = (data.len / (frag_size + 1)) + 1;
DBG1(DBG_IKE, "sending IKE message with length of %zu bytes in " DBG1(DBG_IKE, "sending IKE message with length of %zu bytes in "