DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

EAP-TNC server: Fix processing when last message is fragmented

Browse source 
If the last message from the EAP-TNC server was fragmented, the
fragment processing lost the DONE/FAIL state and did not know how
to handle the final ACK from the peer. Fix this by remembering the
earlier DONE/FAIL state when fragmenting a frame.
This commit is contained in:
Jouni Malinen 2010-02-13 18:03:52 +02:00
parent b29d086d50
commit 62477841a1
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/eap_server/eap_tnc.c
View file

@ -1,6 +1,6 @@
/* /*
* EAP server method: EAP-TNC (Trusted Network Connect) * EAP server method: EAP-TNC (Trusted Network Connect)
* Copyright (c) 2007-2008, Jouni Malinen <j@w1.fi> * Copyright (c) 2007-2010, Jouni Malinen <j@w1.fi>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -29,6 +29,8 @@ struct eap_tnc_data {
struct wpabuf *out_buf; struct wpabuf *out_buf;
size_t out_used; size_t out_used;
size_t fragment_size; size_t fragment_size;
int was_done:1;
int was_fail:1;
}; };
@ -231,6 +233,10 @@ static struct wpabuf * eap_tnc_build_msg(struct eap_tnc_data *data, u8 id)
"(%lu more to send)", (unsigned long) send_len, "(%lu more to send)", (unsigned long) send_len,
(unsigned long) wpabuf_len(data->out_buf) - (unsigned long) wpabuf_len(data->out_buf) -
data->out_used); data->out_used);
if (data->state == FAIL)
data->was_fail = 1;
else if (data->state == DONE)
data->was_done = 1;
data->state = WAIT_FRAG_ACK; data->state = WAIT_FRAG_ACK;
} }
@ -460,7 +466,12 @@ static void eap_tnc_process(struct eap_sm *sm, void *priv,
return; return;
} }
wpa_printf(MSG_DEBUG, "EAP-TNC: Fragment acknowledged"); wpa_printf(MSG_DEBUG, "EAP-TNC: Fragment acknowledged");
data->state = CONTINUE; if (data->was_fail)
data->state = FAIL;
else if (data->was_done)
data->state = DONE;
else
data->state = CONTINUE;
return; return;
} }