mirror of
https://github.com/vanhoefm/fragattacks.git
synced 2025-02-21 03:23:04 -05:00
Fix Windows compilation issues with AP mode code
This commit is contained in:
parent
ade07077ec
commit
0823031750
@ -234,7 +234,9 @@ struct hostapd_bss_config {
|
|||||||
#endif /* CONFIG_IEEE80211R */
|
#endif /* CONFIG_IEEE80211R */
|
||||||
|
|
||||||
char *ctrl_interface; /* directory for UNIX domain sockets */
|
char *ctrl_interface; /* directory for UNIX domain sockets */
|
||||||
|
#ifndef CONFIG_NATIVE_WINDOWS
|
||||||
gid_t ctrl_interface_gid;
|
gid_t ctrl_interface_gid;
|
||||||
|
#endif /* CONFIG_NATIVE_WINDOWS */
|
||||||
int ctrl_interface_gid_set;
|
int ctrl_interface_gid_set;
|
||||||
|
|
||||||
char *ca_cert;
|
char *ca_cert;
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
|
|
||||||
#include "utils/includes.h"
|
#include "utils/includes.h"
|
||||||
|
|
||||||
#ifndef CONFIG_NATIVE_WINDOWS
|
|
||||||
|
|
||||||
#include "utils/common.h"
|
#include "utils/common.h"
|
||||||
#include "utils/eloop.h"
|
#include "utils/eloop.h"
|
||||||
#include "radius/radius.h"
|
#include "radius/radius.h"
|
||||||
@ -524,5 +522,3 @@ void hostapd_acl_deinit(struct hostapd_data *hapd)
|
|||||||
hostapd_acl_query_free(prev);
|
hostapd_acl_query_free(prev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NATIVE_WINDOWS */
|
|
||||||
|
@ -288,6 +288,7 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
|
|||||||
|
|
||||||
if (sta->timeout_next == STA_NULLFUNC &&
|
if (sta->timeout_next == STA_NULLFUNC &&
|
||||||
(sta->flags & WLAN_STA_ASSOC)) {
|
(sta->flags & WLAN_STA_ASSOC)) {
|
||||||
|
#ifndef CONFIG_NATIVE_WINDOWS
|
||||||
/* send data frame to poll STA and check whether this frame
|
/* send data frame to poll STA and check whether this frame
|
||||||
* is ACKed */
|
* is ACKed */
|
||||||
struct ieee80211_hdr hdr;
|
struct ieee80211_hdr hdr;
|
||||||
@ -295,7 +296,6 @@ void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)
|
|||||||
wpa_printf(MSG_DEBUG, " Polling STA with data frame");
|
wpa_printf(MSG_DEBUG, " Polling STA with data frame");
|
||||||
sta->flags |= WLAN_STA_PENDING_POLL;
|
sta->flags |= WLAN_STA_PENDING_POLL;
|
||||||
|
|
||||||
#ifndef CONFIG_NATIVE_WINDOWS
|
|
||||||
os_memset(&hdr, 0, sizeof(hdr));
|
os_memset(&hdr, 0, sizeof(hdr));
|
||||||
if (hapd->driver &&
|
if (hapd->driver &&
|
||||||
os_strcmp(hapd->driver->name, "hostap") == 0) {
|
os_strcmp(hapd->driver->name, "hostap") == 0) {
|
||||||
|
@ -14,8 +14,6 @@
|
|||||||
|
|
||||||
#include "utils/includes.h"
|
#include "utils/includes.h"
|
||||||
|
|
||||||
#ifndef CONFIG_NATIVE_WINDOWS
|
|
||||||
|
|
||||||
#include "utils/common.h"
|
#include "utils/common.h"
|
||||||
#include "utils/eloop.h"
|
#include "utils/eloop.h"
|
||||||
#include "utils/state_machine.h"
|
#include "utils/state_machine.h"
|
||||||
@ -2480,5 +2478,3 @@ int wpa_auth_sta_set_vlan(struct wpa_state_machine *sm, int vlan_id)
|
|||||||
sm->group = group;
|
sm->group = group;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_NATIVE_WINDOWS */
|
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
|
|
||||||
struct eap_wsc_data {
|
struct eap_wsc_data {
|
||||||
enum { START, MSG, FRAG_ACK, WAIT_FRAG_ACK, DONE, FAIL } state;
|
enum { 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 START:
|
case START:
|
||||||
return "START";
|
return "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:
|
||||||
@ -104,7 +104,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 ? START : MSG;
|
data->state = registrar ? START : MESG;
|
||||||
data->registrar = registrar;
|
data->registrar = registrar;
|
||||||
|
|
||||||
os_memset(&cfg, 0, sizeof(cfg));
|
os_memset(&cfg, 0, sizeof(cfg));
|
||||||
@ -217,7 +217,7 @@ static struct wpabuf * eap_wsc_build_msg(struct eap_wsc_data *data, u8 id)
|
|||||||
wpabuf_free(data->out_buf);
|
wpabuf_free(data->out_buf);
|
||||||
data->out_buf = NULL;
|
data->out_buf = NULL;
|
||||||
data->out_used = 0;
|
data->out_used = 0;
|
||||||
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,
|
||||||
@ -237,7 +237,7 @@ static struct wpabuf * eap_wsc_buildReq(struct eap_sm *sm, void *priv, u8 id)
|
|||||||
switch (data->state) {
|
switch (data->state) {
|
||||||
case START:
|
case START:
|
||||||
return eap_wsc_build_start(sm, data, id);
|
return eap_wsc_build_start(sm, data, id);
|
||||||
case MSG:
|
case MESG:
|
||||||
if (data->out_buf == NULL) {
|
if (data->out_buf == NULL) {
|
||||||
data->out_buf = wps_get_msg(data->wps,
|
data->out_buf = wps_get_msg(data->wps,
|
||||||
&data->out_op_code);
|
&data->out_op_code);
|
||||||
@ -390,7 +390,7 @@ static void eap_wsc_process(struct eap_sm *sm, void *priv,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -432,14 +432,14 @@ static void 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");
|
||||||
eap_wsc_state(data, FAIL);
|
eap_wsc_state(data, FAIL);
|
||||||
break;
|
break;
|
||||||
case WPS_PENDING:
|
case WPS_PENDING:
|
||||||
eap_wsc_state(data, MSG);
|
eap_wsc_state(data, MESG);
|
||||||
sm->method_pending = METHOD_PENDING_WAIT;
|
sm->method_pending = METHOD_PENDING_WAIT;
|
||||||
eloop_cancel_timeout(eap_wsc_ext_reg_timeout, sm, data);
|
eloop_cancel_timeout(eap_wsc_ext_reg_timeout, sm, data);
|
||||||
eloop_register_timeout(5, 0, eap_wsc_ext_reg_timeout,
|
eloop_register_timeout(5, 0, eap_wsc_ext_reg_timeout,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user