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

Make check whether to use IKEv1 fragmentation more readable

Browse Source
This commit is contained in:
Martin Willi
2013-03-14 14:20:55 +01:00
parent 552b8ad5f5
commit 49960f021d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/task_manager_v1.c
+14 -5
View File
@@ -411,7 +411,7 @@ static bool send_fragment(private_task_manager_t *this, bool request,
static bool send_packet(private_task_manager_t *this, bool request, static bool send_packet(private_task_manager_t *this, bool request,
packet_t *packet) packet_t *packet)
{ {
fragmentation_t fragmentation = FRAGMENTATION_NO; bool use_frags = FALSE;
ike_cfg_t *ike_cfg; ike_cfg_t *ike_cfg;
host_t *src, *dst; host_t *src, *dst;
chunk_t data; chunk_t data;
@@ -419,12 +419,21 @@ static bool send_packet(private_task_manager_t *this, bool request,
ike_cfg = this->ike_sa->get_ike_cfg(this->ike_sa); ike_cfg = this->ike_sa->get_ike_cfg(this->ike_sa);
if (ike_cfg) if (ike_cfg)
{ {
fragmentation = ike_cfg->fragmentation(ike_cfg); switch (ike_cfg->fragmentation(ike_cfg))
{
case FRAGMENTATION_FORCE:
use_frags = TRUE;
break;
case FRAGMENTATION_YES:
use_frags = this->ike_sa->supports_extension(this->ike_sa,
EXT_IKE_FRAGMENTATION);
break;
default:
break;
}
} }
data = packet->get_data(packet); data = packet->get_data(packet);
if (data.len > this->frag.size && (fragmentation == FRAGMENTATION_FORCE || if (data.len > this->frag.size && use_frags)
(this->ike_sa->supports_extension(this->ike_sa, EXT_IKE_FRAGMENTATION) &&
fragmentation == FRAGMENTATION_YES)))
{ {
fragment_payload_t *fragment; fragment_payload_t *fragment;
u_int8_t num, count; u_int8_t num, count;