ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

Support RADIUS messages up to 4096 bytes, RADIUS EAP-Message fragmentation

This commit is contained in:
Martin Willi 2010-01-19 16:47:21 +01:00
parent 7eab4a1be6
commit 47498044c3
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/charon/plugins/eap_radius/eap_radius.c
View File

@ -117,22 +117,26 @@ static bool radius2ike(private_eap_radius_t *this,
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
eap_payload_t *payload; eap_payload_t *payload;
chunk_t data; chunk_t data, message = chunk_empty;
int type; int type;
enumerator = msg->create_enumerator(msg); enumerator = msg->create_enumerator(msg);
while (enumerator->enumerate(enumerator, &type, &data)) while (enumerator->enumerate(enumerator, &type, &data))
{ {
if (type == RAT_EAP_MESSAGE) if (type == RAT_EAP_MESSAGE && data.len)
{ {
*out = payload = eap_payload_create_data(data); message = chunk_cat("mc", message, data);
}
}
enumerator->destroy(enumerator);
if (message.len)
{
*out = payload = eap_payload_create_data(message);
free(message.ptr);
/* apply EAP method selected by RADIUS server */ /* apply EAP method selected by RADIUS server */
this->type = payload->get_type(payload, &this->vendor); this->type = payload->get_type(payload, &this->vendor);
enumerator->destroy(enumerator);
return TRUE; return TRUE;
} }
}
enumerator->destroy(enumerator);
return FALSE; return FALSE;
} }
@ -180,10 +184,18 @@ static status_t process(private_eap_radius_t *this,
{ {
radius_message_t *request, *response; radius_message_t *request, *response;
status_t status = FAILED; status_t status = FAILED;
chunk_t data;
request = radius_message_create_request(); request = radius_message_create_request();
request->add(request, RAT_USER_NAME, this->peer->get_encoding(this->peer)); request->add(request, RAT_USER_NAME, this->peer->get_encoding(this->peer));
request->add(request, RAT_EAP_MESSAGE, in->get_data(in)); data = in->get_data(in);
/* fragment data suitable for RADIUS (not more than 253 bytes) */
while (data.len > 253)
{
request->add(request, RAT_EAP_MESSAGE, chunk_create(data.ptr, 253));
data = chunk_skip(data, 253);
}
request->add(request, RAT_EAP_MESSAGE, data);
response = this->client->request(this->client, request); response = this->client->request(this->client, request);
if (response) if (response)

2
src/charon/plugins/eap_radius/radius_client.c
View File

@ -295,7 +295,7 @@ static radius_message_t* request(private_radius_client_t *this,
radius_message_t *response; radius_message_t *response;
bool retransmit = FALSE; bool retransmit = FALSE;
struct timeval tv; struct timeval tv;
char buf[1024]; char buf[4096];
fd_set fds; fd_set fds;
int res; int res;

1
src/charon/plugins/eap_radius/radius_message.c
View File

@ -269,6 +269,7 @@ static void add(private_radius_message_t *this, radius_attribute_type_t type,
{ {
rattr_t *attribute; rattr_t *attribute;
data.len = min(data.len, 253);
this->msg = realloc(this->msg, this->msg = realloc(this->msg,
ntohs(this->msg->length) + sizeof(rattr_t) + data.len); ntohs(this->msg->length) + sizeof(rattr_t) + data.len);
attribute = ((void*)this->msg) + ntohs(this->msg->length); attribute = ((void*)this->msg) + ntohs(this->msg->length);