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

Rename MSG to MESG to avoid conflicts with Windows header files

Browse source
This commit is contained in:
Jouni Malinen 2008-12-11 00:54:49 +02:00
parent 3ee81d489a
commit 47ce4bfc38
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/eap_peer/eap_wsc.c
View file

@ -23,7 +23,7 @@
struct eap_wsc_data { struct eap_wsc_data {
enum { WAIT_START, MSG, FRAG_ACK, WAIT_FRAG_ACK, DONE, FAIL } state; enum { WAIT_START, MESG, FRAG_ACK, WAIT_FRAG_ACK, DONE, FAIL } state;
int registrar; int registrar;
struct wpabuf *in_buf; struct wpabuf *in_buf;
struct wpabuf *out_buf; struct wpabuf *out_buf;
@ -40,8 +40,8 @@ static const char * eap_wsc_state_txt(int state)
switch (state) { switch (state) {
case WAIT_START: case WAIT_START:
return "WAIT_START"; return "WAIT_START";
case MSG: case MESG:
return "MSG"; return "MESG";
case FRAG_ACK: case FRAG_ACK:
return "FRAG_ACK"; return "FRAG_ACK";
case WAIT_FRAG_ACK: case WAIT_FRAG_ACK:
@ -131,7 +131,7 @@ static void * eap_wsc_init(struct eap_sm *sm)
data = os_zalloc(sizeof(*data)); data = os_zalloc(sizeof(*data));
if (data == NULL) if (data == NULL)
return NULL; return NULL;
data->state = registrar ? MSG : WAIT_START; data->state = registrar ? MESG : WAIT_START;
data->registrar = registrar; data->registrar = registrar;
data->wps_ctx = wps; data->wps_ctx = wps;
@ -284,7 +284,7 @@ static struct wpabuf * eap_wsc_build_msg(struct eap_wsc_data *data,
eap_wsc_state(data, FAIL); eap_wsc_state(data, FAIL);
ret->methodState = METHOD_DONE; ret->methodState = METHOD_DONE;
} else } else
eap_wsc_state(data, MSG); eap_wsc_state(data, MESG);
} else { } else {
wpa_printf(MSG_DEBUG, "EAP-WSC: Sending out %lu bytes " wpa_printf(MSG_DEBUG, "EAP-WSC: Sending out %lu bytes "
"(%lu more to send)", (unsigned long) send_len, "(%lu more to send)", (unsigned long) send_len,
@ -413,7 +413,7 @@ static struct wpabuf * eap_wsc_process(struct eap_sm *sm, void *priv,
return NULL; return NULL;
} }
wpa_printf(MSG_DEBUG, "EAP-WSC: Fragment acknowledged"); wpa_printf(MSG_DEBUG, "EAP-WSC: Fragment acknowledged");
eap_wsc_state(data, MSG); eap_wsc_state(data, MESG);
return eap_wsc_build_msg(data, ret, id); return eap_wsc_build_msg(data, ret, id);
} }
@ -433,7 +433,7 @@ static struct wpabuf * eap_wsc_process(struct eap_sm *sm, void *priv,
return NULL; return NULL;
} }
wpa_printf(MSG_DEBUG, "EAP-WSC: Received start"); wpa_printf(MSG_DEBUG, "EAP-WSC: Received start");
eap_wsc_state(data, MSG); eap_wsc_state(data, MESG);
/* Start message has empty payload, skip processing */ /* Start message has empty payload, skip processing */
goto send_msg; goto send_msg;
} else if (op_code == WSC_Start) { } else if (op_code == WSC_Start) {
@ -469,7 +469,7 @@ static struct wpabuf * eap_wsc_process(struct eap_sm *sm, void *priv,
eap_wsc_state(data, FAIL); eap_wsc_state(data, FAIL);
break; break;
case WPS_CONTINUE: case WPS_CONTINUE:
eap_wsc_state(data, MSG); eap_wsc_state(data, MESG);
break; break;
case WPS_FAILURE: case WPS_FAILURE:
wpa_printf(MSG_DEBUG, "EAP-WSC: WPS processing failed"); wpa_printf(MSG_DEBUG, "EAP-WSC: WPS processing failed");
@ -498,7 +498,7 @@ send_msg:
data->out_used = 0; data->out_used = 0;
} }
eap_wsc_state(data, MSG); eap_wsc_state(data, MESG);
return eap_wsc_build_msg(data, ret, id); return eap_wsc_build_msg(data, ret, id);
} }