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

moved batch size calculation into pb_tnc_batch_t

Browse Source
This commit is contained in:
Andreas Steffen
2012-07-11 17:09:05 +02:00
parent d7dcbc95a9
commit a5c79d0175
4 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnccs_20/tnccs_20.c
+8 -11
View File
@@ -639,29 +639,26 @@ METHOD(tls_t, build, status_t,
{
pb_tnc_batch_t *batch;
pb_tnc_msg_t *msg;
chunk_t msg_value, data;
chunk_t data;
int msg_count;
size_t batch_len;
enumerator_t *enumerator;
if (this->state_machine->send_batch(this->state_machine, this->batch_type))
{
batch = pb_tnc_batch_create(this->is_server, this->batch_type);
batch_len = PB_TNC_BATCH_HEADER_SIZE;
batch = pb_tnc_batch_create(this->is_server, this->batch_type,
min(this->max_batch_len, *buflen));
enumerator = this->messages->create_enumerator(this->messages);
while (enumerator->enumerate(enumerator, &msg))
{
msg->build(msg);
msg_value = msg->get_encoding(msg);
batch_len += PB_TNC_HEADER_SIZE + msg_value.len;
if (batch_len > min(this->max_batch_len, *buflen))
if (batch->add_msg(batch, msg))
{
this->messages->remove_at(this->messages, enumerator);
}
else
{
/* message does not fit into batch of maximum size */
break;
}
batch->add_msg(batch, msg);
this->messages->remove_at(this->messages, enumerator);
}
enumerator->destroy(enumerator);