P2P: Send WPS-FAIL event to parent interface, too

[libeap.git] / src / eap_peer / eap_tnc.c

diff --git a/src/eap_peer/eap_tnc.c b/src/eap_peer/eap_tnc.c
index b2705f7..6c95f72 100644 (file)
--- a/src/eap_peer/eap_tnc.c
+++ b/src/eap_peer/eap_tnc.c
@@ -21,7 +21,7 @@
 
 
 struct eap_tnc_data {
-       enum { WAIT_START, MSG, WAIT_FRAG_ACK, DONE, FAIL } state;
+       enum { WAIT_START, PROC_MSG, WAIT_FRAG_ACK, DONE, FAIL } state;
        struct tncc_data *tncc;
        struct wpabuf *in_buf;
        struct wpabuf *out_buf;
@@ -73,12 +73,13 @@ static struct wpabuf * eap_tnc_build_frag_ack(u8 id, u8 code)
 {
        struct wpabuf *msg;
 
-       msg = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_TNC, 0, code, id);
+       msg = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_TNC, 1, code, id);
        if (msg == NULL) {
                wpa_printf(MSG_ERROR, "EAP-TNC: Failed to allocate memory "
                           "for fragment ack");
                return NULL;
        }
+       wpabuf_put_u8(msg, EAP_TNC_VERSION); /* Flags */
 
        wpa_printf(MSG_DEBUG, "EAP-TNC: Send fragment ack");
 
@@ -262,14 +263,14 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv,
                   "Message Length %u", flags, message_length);
 
        if (data->state == WAIT_FRAG_ACK) {
-               if (len != 0) {
+               if (len > 1) {
                        wpa_printf(MSG_DEBUG, "EAP-TNC: Unexpected payload in "
                                   "WAIT_FRAG_ACK state");
                        ret->ignore = TRUE;
                        return NULL;
                }
                wpa_printf(MSG_DEBUG, "EAP-TNC: Fragment acknowledged");
-               data->state = MSG;
+               data->state = PROC_MSG;
                return eap_tnc_build_msg(data, ret, id);
        }
 
@@ -295,12 +296,12 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv,
                        wpa_printf(MSG_DEBUG, "EAP-TNC: Server did not use "
                                   "start flag in the first message");
                        ret->ignore = TRUE;
-                       return NULL;
+                       goto fail;
                }
 
                tncc_init_connection(data->tncc);
 
-               data->state = MSG;
+               data->state = PROC_MSG;
        } else {
                enum tncc_process_res res;
 
@@ -308,7 +309,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv,
                        wpa_printf(MSG_DEBUG, "EAP-TNC: Server used start "
                                   "flag again");
                        ret->ignore = TRUE;
-                       return NULL;
+                       goto fail;
                }
 
                res = tncc_process_if_tnccs(data->tncc,
@@ -317,7 +318,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv,
                switch (res) {
                case TNCCS_PROCESS_ERROR:
                        ret->ignore = TRUE;
-                       return NULL;
+                       goto fail;
                case TNCCS_PROCESS_OK_NO_RECOMMENDATION:
                case TNCCS_RECOMMENDATION_ERROR:
                        wpa_printf(MSG_DEBUG, "EAP-TNC: No "
@@ -351,7 +352,7 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv,
        ret->allowNotifications = TRUE;
 
        if (data->out_buf) {
-               data->state = MSG;
+               data->state = PROC_MSG;
                return eap_tnc_build_msg(data, ret, id);
        }
 
@@ -402,8 +403,13 @@ static struct wpabuf * eap_tnc_process(struct eap_sm *sm, void *priv,
                          wpabuf_head(resp), wpabuf_len(resp));
 
        data->out_buf = resp;
-       data->state = MSG;
+       data->state = PROC_MSG;
        return eap_tnc_build_msg(data, ret, id);
+
+fail:
+       if (data->in_buf == &tmpbuf)
+               data->in_buf = NULL;
+       return NULL;
 }