7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support to Probe response offload

Browse Source
This commit is contained in:
vemax78 2014-02-09 18:42:15 +01:00
parent 025880583c
commit 152f869354
5 changed files with 144 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/binding/ieee80211/ieee80211.c
View File

@ -134,7 +134,6 @@ int ieee80211_create_beacon(char* buffer, int length, struct ieee80211_beacon_pa
struct ieee80211_header_mgmt* header; struct ieee80211_header_mgmt* header;
ASSERT(buffer != NULL); ASSERT(buffer != NULL);
ASSERT(length == IEEE80211_MTU);
/* */ /* */
header = (struct ieee80211_header_mgmt*)buffer; header = (struct ieee80211_header_mgmt*)buffer;
@ -207,7 +206,34 @@ int ieee80211_create_beacon(char* buffer, int length, struct ieee80211_beacon_pa
pos += result; pos += result;
params->tailbeaconlength += result; params->tailbeaconlength += result;
return (params->headbeaconlength + params->tailbeaconlength); /* Probe Response offload */
if (params->flags & IEEE80221_CREATE_BEACON_FLAGS_PROBE_RESPONSE_OFFLOAD) {
struct ieee80211_probe_response_params proberesponseparams;
/* */
memset(&proberesponseparams, 0, sizeof(struct ieee80211_probe_response_params));
memcpy(proberesponseparams.bssid, params->bssid, ETH_ALEN);
proberesponseparams.beaconperiod = params->beaconperiod;
proberesponseparams.capability = params->capability;
proberesponseparams.ssid = params->ssid;
memcpy(proberesponseparams.supportedrates, params->supportedrates, params->supportedratescount);
proberesponseparams.supportedratescount = params->supportedratescount;
proberesponseparams.mode = params->mode;
proberesponseparams.erpinfo = params->erpinfo;
proberesponseparams.channel = params->channel;
/* */
params->proberesponseoffload = pos;
params->proberesponseoffloadlength = ieee80211_create_probe_response(pos, (int)(pos - buffer), &proberesponseparams);
if (params->proberesponseoffloadlength < 0) {
return -1;
}
/* */
pos += params->proberesponseoffloadlength;
}
return (int)(pos - buffer);
} }
/* */ /* */
@ -218,7 +244,6 @@ int ieee80211_create_probe_response(char* buffer, int length, struct ieee80211_p
struct ieee80211_header_mgmt* header; struct ieee80211_header_mgmt* header;
ASSERT(buffer != NULL); ASSERT(buffer != NULL);
ASSERT(length == IEEE80211_MTU);
/* */ /* */
header = (struct ieee80211_header_mgmt*)buffer; header = (struct ieee80211_header_mgmt*)buffer;
@ -295,7 +320,6 @@ int ieee80211_create_authentication_response(char* buffer, int length, struct ie
struct ieee80211_header_mgmt* header; struct ieee80211_header_mgmt* header;
ASSERT(buffer != NULL); ASSERT(buffer != NULL);
ASSERT(length == IEEE80211_MTU);
/* */ /* */
header = (struct ieee80211_header_mgmt*)buffer; header = (struct ieee80211_header_mgmt*)buffer;
@ -327,7 +351,6 @@ int ieee80211_create_associationresponse_response(char* buffer, int length, stru
struct ieee80211_header_mgmt* header; struct ieee80211_header_mgmt* header;
ASSERT(buffer != NULL); ASSERT(buffer != NULL);
ASSERT(length == IEEE80211_MTU);
/* */ /* */
header = (struct ieee80211_header_mgmt*)buffer; header = (struct ieee80211_header_mgmt*)buffer;
@ -373,7 +396,6 @@ int ieee80211_create_deauthentication(char* buffer, int length, struct ieee80211
struct ieee80211_header_mgmt* header; struct ieee80211_header_mgmt* header;
ASSERT(buffer != NULL); ASSERT(buffer != NULL);
ASSERT(length == IEEE80211_MTU);
/* */ /* */
header = (struct ieee80211_header_mgmt*)buffer; header = (struct ieee80211_header_mgmt*)buffer;

7
src/binding/ieee80211/ieee80211.h
View File

@ -459,7 +459,11 @@ struct ieee80211_ie_items {
uint8_t ieee80211_get_erpinfo(uint32_t mode, int olbc, unsigned long stationnonerpcount, unsigned long stationnoshortpreamblecount, int shortpreamble); uint8_t ieee80211_get_erpinfo(uint32_t mode, int olbc, unsigned long stationnonerpcount, unsigned long stationnoshortpreamblecount, int shortpreamble);
/* Management Beacon */ /* Management Beacon */
#define IEEE80221_CREATE_BEACON_FLAGS_PROBE_RESPONSE_OFFLOAD 0x00000001
struct ieee80211_beacon_params { struct ieee80211_beacon_params {
unsigned long flags;
char* headbeacon; char* headbeacon;
int headbeaconlength; int headbeaconlength;
char* tailbeacon; char* tailbeacon;
@ -480,6 +484,9 @@ struct ieee80211_beacon_params {
uint32_t mode; uint32_t mode;
uint8_t erpinfo; uint8_t erpinfo;
char* proberesponseoffload;
int proberesponseoffloadlength;
}; };
int ieee80211_create_beacon(char* buffer, int length, struct ieee80211_beacon_params* params); int ieee80211_create_beacon(char* buffer, int length, struct ieee80211_beacon_params* params);

87
src/binding/ieee80211/wifi_drivers.h
View File

@ -6,64 +6,65 @@
#include "ieee80211.h" #include "ieee80211.h"
/* */ /* */
#define WIFI_DRIVER_NAME_SIZE 16 #define WIFI_DRIVER_NAME_SIZE 16
#define WIFI_SSID_MAX_LENGTH 32 #define WIFI_SSID_MAX_LENGTH 32
/* */ /* */
#define WIFI_BAND_UNKNOWN 0 #define WIFI_BAND_UNKNOWN 0
#define WIFI_BAND_2GHZ 1 #define WIFI_BAND_2GHZ 1
#define WIFI_BAND_5GHZ 2 #define WIFI_BAND_5GHZ 2
/* */ /* */
#define WIFI_CAPABILITY_RADIOSUPPORTED 0x00000001 #define WIFI_CAPABILITY_RADIOSUPPORTED 0x00000001
#define WIFI_CAPABILITY_RADIOTYPE 0x00000002 #define WIFI_CAPABILITY_RADIOTYPE 0x00000002
#define WIFI_CAPABILITY_BANDS 0x00000004 #define WIFI_CAPABILITY_BANDS 0x00000004
#define WIFI_CAPABILITY_CIPHERS 0x00000008 #define WIFI_CAPABILITY_CIPHERS 0x00000008
#define WIFI_CAPABILITY_ANTENNA_MASK 0x00000010 #define WIFI_CAPABILITY_ANTENNA_MASK 0x00000010
#define WIFI_CAPABILITY_MAX_SCAN_SSIDS 0x00000020 #define WIFI_CAPABILITY_MAX_SCAN_SSIDS 0x00000020
#define WIFI_CAPABILITY_MAX_SCHED_SCAN_SSIDS 0x00000040 #define WIFI_CAPABILITY_MAX_SCHED_SCAN_SSIDS 0x00000040
#define WIFI_CAPABILITY_MAX_MATCH_SETS 0x00000080 #define WIFI_CAPABILITY_MAX_MATCH_SETS 0x00000080
#define WIFI_CAPABILITY_MAX_ACL_MACADDRESS 0x00000100 #define WIFI_CAPABILITY_MAX_ACL_MACADDRESS 0x00000100
/* */ /* */
#define WIFI_CAPABILITY_FLAGS_OFFCHANNEL_TX_OK 0x00000001 #define WIFI_CAPABILITY_FLAGS_OFFCHANNEL_TX_OK 0x00000001
#define WIFI_CAPABILITY_FLAGS_ROAM_SUPPORT 0x00000002 #define WIFI_CAPABILITY_FLAGS_ROAM_SUPPORT 0x00000002
#define WIFI_CAPABILITY_FLAGS_SUPPORT_AP_UAPSD 0x00000004 #define WIFI_CAPABILITY_FLAGS_SUPPORT_AP_UAPSD 0x00000004
#define WIFI_CAPABILITY_FLAGS_DEVICE_AP_SME 0x00000008 #define WIFI_CAPABILITY_FLAGS_DEVICE_AP_SME 0x00000008
#define WIFI_CAPABILITY_FLAGS_PROBE_RESPONSE_OFFLOAD 0x00000010
/* */ /* */
#define WIFI_CAPABILITY_AP_SUPPORTED 0x00000001 #define WIFI_CAPABILITY_AP_SUPPORTED 0x00000001
#define WIFI_CAPABILITY_AP_VLAN_SUPPORTED 0x00000002 #define WIFI_CAPABILITY_AP_VLAN_SUPPORTED 0x00000002
#define WIFI_CAPABILITY_ADHOC_SUPPORTED 0x00000004 #define WIFI_CAPABILITY_ADHOC_SUPPORTED 0x00000004
#define WIFI_CAPABILITY_MONITOR_SUPPORTED 0x00000008 #define WIFI_CAPABILITY_MONITOR_SUPPORTED 0x00000008
#define WIFI_CAPABILITY_WDS_SUPPORTED 0x00000010 #define WIFI_CAPABILITY_WDS_SUPPORTED 0x00000010
#define FREQ_CAPABILITY_DISABLED 0x00000001 #define FREQ_CAPABILITY_DISABLED 0x00000001
#define FREQ_CAPABILITY_PASSIVE_SCAN 0x00000002 #define FREQ_CAPABILITY_PASSIVE_SCAN 0x00000002
#define FREQ_CAPABILITY_NO_IBBS 0x00000004 #define FREQ_CAPABILITY_NO_IBBS 0x00000004
#define FREQ_CAPABILITY_RADAR 0x00000008 #define FREQ_CAPABILITY_RADAR 0x00000008
#define FREQ_CAPABILITY_DFS_STATE 0x00000010 #define FREQ_CAPABILITY_DFS_STATE 0x00000010
#define FREQ_CAPABILITY_DFS_TIME 0x00000020 #define FREQ_CAPABILITY_DFS_TIME 0x00000020
#define RATE_CAPABILITY_SHORTPREAMBLE 0x00000001 #define RATE_CAPABILITY_SHORTPREAMBLE 0x00000001
#define CIPHER_CAPABILITY_UNKNOWN 0 #define CIPHER_CAPABILITY_UNKNOWN 0
#define CIPHER_CAPABILITY_WEP40 1 #define CIPHER_CAPABILITY_WEP40 1
#define CIPHER_CAPABILITY_WEP104 2 #define CIPHER_CAPABILITY_WEP104 2
#define CIPHER_CAPABILITY_TKIP 3 #define CIPHER_CAPABILITY_TKIP 3
#define CIPHER_CAPABILITY_CCMP 4 #define CIPHER_CAPABILITY_CCMP 4
#define CIPHER_CAPABILITY_CMAC 5 #define CIPHER_CAPABILITY_CMAC 5
#define CIPHER_CAPABILITY_GCMP 6 #define CIPHER_CAPABILITY_GCMP 6
#define CIPHER_CAPABILITY_WPI_SMS4 7 #define CIPHER_CAPABILITY_WPI_SMS4 7
#define IEEE80211_DFS_USABLE 0 #define IEEE80211_DFS_USABLE 0
#define IEEE80211_DFS_UNAVAILABLE 1 #define IEEE80211_DFS_UNAVAILABLE 1
#define IEEE80211_DFS_AVAILABLE 2 #define IEEE80211_DFS_AVAILABLE 2
#define WLAN_INTERFACE_AP 1 #define WLAN_INTERFACE_AP 1
/* IEEE802.11 Aid management */ /* IEEE802.11 Aid management */
#define WIFI_AID_BITFIELD_SIZE 63 #define WIFI_AID_BITFIELD_SIZE 63
/* */ /* */
typedef void* wifi_global_handle; typedef void* wifi_global_handle;

186
src/binding/ieee80211/wifi_nl80211.c
View File

@ -14,6 +14,9 @@
#include "wifi_drivers.h" #include "wifi_drivers.h"
#include "wifi_nl80211.h" #include "wifi_nl80211.h"
/* */
static char g_bufferIEEE80211[4096];
/* */ /* */
static void nl80211_wlan_stopap(wifi_wlan_handle handle); static void nl80211_wlan_stopap(wifi_wlan_handle handle);
@ -377,61 +380,10 @@ static uint16_t nl80211_wlan_check_capability(struct nl80211_wlan_handle* wlanha
return capability; return capability;
} }
/* */
static int nl80211_wlan_setbss(struct nl80211_wlan_handle* wlanhandle, int cts, int preamble, int slot, int htopmode, int apisolate) {
int result;
struct nl_msg* msg;
/* */
msg = nlmsg_alloc();
if (!msg) {
return -1;
}
/* */
genlmsg_put(msg, 0, 0, wlanhandle->devicehandle->globalhandle->nl80211_id, 0, 0, NL80211_CMD_SET_BSS, 0);
nla_put_u32(msg, NL80211_ATTR_IFINDEX, wlanhandle->virtindex);
if (cts >= 0) {
nla_put_u8(msg, NL80211_ATTR_BSS_CTS_PROT, cts);
}
if (preamble >= 0) {
nla_put_u8(msg, NL80211_ATTR_BSS_SHORT_PREAMBLE, preamble);
}
if (slot >= 0) {
nla_put_u8(msg, NL80211_ATTR_BSS_SHORT_SLOT_TIME, slot);
}
if (htopmode >= 0) {
nla_put_u16(msg, NL80211_ATTR_BSS_HT_OPMODE, htopmode);
}
if (apisolate >= 0) {
nla_put_u8(msg, NL80211_ATTR_AP_ISOLATE, apisolate);
}
if (wlanhandle->devicehandle->basicratescount > 0) {
nla_put(msg, NL80211_ATTR_BSS_BASIC_RATES, wlanhandle->devicehandle->basicratescount, wlanhandle->devicehandle->basicrates);
}
/* */
result = nl80211_send_and_recv_msg(wlanhandle->devicehandle->globalhandle, msg, NULL, NULL);
if (result) {
capwap_logging_error("Unable set BSS, error code: %d", result);
}
nlmsg_free(msg);
return result;
}
/* */ /* */
static int nl80211_wlan_setbeacon(struct nl80211_wlan_handle* wlanhandle) { static int nl80211_wlan_setbeacon(struct nl80211_wlan_handle* wlanhandle) {
int result; int result;
struct nl_msg* msg; struct nl_msg* msg;
char buffer[IEEE80211_MTU];
struct ieee80211_beacon_params ieee80211_params; struct ieee80211_beacon_params ieee80211_params;
/* Create beacon packet */ /* Create beacon packet */
@ -447,7 +399,13 @@ static int nl80211_wlan_setbeacon(struct nl80211_wlan_handle* wlanhandle) {
ieee80211_params.erpinfo = ieee80211_get_erpinfo(wlanhandle->devicehandle->currentfrequency.mode, wlanhandle->devicehandle->olbc, wlanhandle->devicehandle->stationsnonerpcount, wlanhandle->devicehandle->stationsnoshortpreamblecount, wlanhandle->devicehandle->shortpreamble); ieee80211_params.erpinfo = ieee80211_get_erpinfo(wlanhandle->devicehandle->currentfrequency.mode, wlanhandle->devicehandle->olbc, wlanhandle->devicehandle->stationsnonerpcount, wlanhandle->devicehandle->stationsnoshortpreamblecount, wlanhandle->devicehandle->shortpreamble);
ieee80211_params.channel = wlanhandle->devicehandle->currentfrequency.channel; ieee80211_params.channel = wlanhandle->devicehandle->currentfrequency.channel;
result = ieee80211_create_beacon(buffer, IEEE80211_MTU, &ieee80211_params); /* Enable probe response offload only in CAPWAP Local Mac */
if ((wlanhandle->macmode == CAPWAP_ADD_WLAN_MACMODE_LOCAL) && (wlanhandle->devicehandle->capability->capability & WIFI_CAPABILITY_FLAGS_PROBE_RESPONSE_OFFLOAD)) {
ieee80211_params.flags |= IEEE80221_CREATE_BEACON_FLAGS_PROBE_RESPONSE_OFFLOAD;
}
/* */
result = ieee80211_create_beacon(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &ieee80211_params);
if (result < 0) { if (result < 0) {
return -1; return -1;
} }
@ -470,6 +428,10 @@ static int nl80211_wlan_setbeacon(struct nl80211_wlan_handle* wlanhandle) {
nla_put_u32(msg, NL80211_ATTR_AUTH_TYPE, wlanhandle->authenticationtype); nla_put_u32(msg, NL80211_ATTR_AUTH_TYPE, wlanhandle->authenticationtype);
nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT); nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT);
if ((wlanhandle->devicehandle->capability->capability & WIFI_CAPABILITY_FLAGS_PROBE_RESPONSE_OFFLOAD) && (ieee80211_params.proberesponseoffloadlength > 0)) {
nla_put(msg, NL80211_ATTR_PROBE_RESP, ieee80211_params.proberesponseoffloadlength, ieee80211_params.proberesponseoffload);
}
/* Start AP */ /* Start AP */
result = nl80211_send_and_recv_msg(wlanhandle->devicehandle->globalhandle, msg, NULL, NULL); result = nl80211_send_and_recv_msg(wlanhandle->devicehandle->globalhandle, msg, NULL, NULL);
if (result) { if (result) {
@ -480,16 +442,38 @@ static int nl80211_wlan_setbeacon(struct nl80211_wlan_handle* wlanhandle) {
/* Configure AP */ /* Configure AP */
if (!result) { if (!result) {
int cts = ((ieee80211_params.erpinfo & IEEE80211_ERP_INFO_USE_PROTECTION) ? 1 : 0); msg = nlmsg_alloc();
int preamble = ((!wlanhandle->devicehandle->stationsnoshortpreamblecount && wlanhandle->devicehandle->shortpreamble) ? 1 : 0); if (!msg) {
int slot = ((wlanhandle->devicehandle->currentfrequency.mode & IEEE80211_RADIO_TYPE_80211G) ? (wlanhandle->devicehandle->stationsnoshortslottimecount ? 0 : 1) : -1); return -1;
int htopmode = -1; /* TODO: 802.11n */ }
int apisolate = -1; /* TODO: AP Isolation */
result = nl80211_wlan_setbss(wlanhandle, cts, preamble, slot, htopmode, apisolate); /* */
genlmsg_put(msg, 0, 0, wlanhandle->devicehandle->globalhandle->nl80211_id, 0, 0, NL80211_CMD_SET_BSS, 0);
nla_put_u32(msg, NL80211_ATTR_IFINDEX, wlanhandle->virtindex);
/* */
nla_put_u8(msg, NL80211_ATTR_BSS_CTS_PROT, ((ieee80211_params.erpinfo & IEEE80211_ERP_INFO_USE_PROTECTION) ? 1 : 0));
nla_put_u8(msg, NL80211_ATTR_BSS_SHORT_PREAMBLE, ((!wlanhandle->devicehandle->stationsnoshortpreamblecount && wlanhandle->devicehandle->shortpreamble) ? 1 : 0));
//nla_put_u16(msg, NL80211_ATTR_BSS_HT_OPMODE, ???);
//nla_put_u8(msg, NL80211_ATTR_AP_ISOLATE, ???);
if (wlanhandle->devicehandle->currentfrequency.mode & IEEE80211_RADIO_TYPE_80211G) {
nla_put_u8(msg, NL80211_ATTR_BSS_SHORT_SLOT_TIME, (!wlanhandle->devicehandle->stationsnoshortslottimecount ? 1 : 0));
}
if (wlanhandle->devicehandle->basicratescount > 0) {
nla_put(msg, NL80211_ATTR_BSS_BASIC_RATES, wlanhandle->devicehandle->basicratescount, wlanhandle->devicehandle->basicrates);
}
/* */
result = nl80211_send_and_recv_msg(wlanhandle->devicehandle->globalhandle, msg, NULL, NULL);
if (!result) { if (!result) {
wlanhandle->flags |= NL80211_WLAN_SET_BEACON; wlanhandle->flags |= NL80211_WLAN_SET_BEACON;
} else {
capwap_logging_error("Unable set BSS, error code: %d", result);
} }
nlmsg_free(msg);
} }
return result; return result;
@ -507,7 +491,10 @@ static void nl80211_device_updatebeacons(struct nl80211_device_handle* devicehan
while (wlansearch) { while (wlansearch) {
wlanhandle = (struct nl80211_wlan_handle*)wlansearch->item; wlanhandle = (struct nl80211_wlan_handle*)wlansearch->item;
if (wlanhandle->flags & NL80211_WLAN_SET_BEACON) { if (wlanhandle->flags & NL80211_WLAN_SET_BEACON) {
nl80211_wlan_setbeacon(wlanhandle); if (nl80211_wlan_setbeacon(wlanhandle)) {
capwap_logging_warning("Unable to update beacon on interface %d", wlanhandle->virtindex);
nl80211_wlan_stopap((wifi_wlan_handle)wlanhandle);
}
} }
/* */ /* */
@ -615,7 +602,6 @@ static struct nl80211_station* nl80211_station_create(struct nl80211_wlan_handle
/* */ /* */
static void nl80211_wlan_send_deauthentication(struct nl80211_wlan_handle* wlanhandle, const uint8_t* stationaddress, uint16_t reasoncode) { static void nl80211_wlan_send_deauthentication(struct nl80211_wlan_handle* wlanhandle, const uint8_t* stationaddress, uint16_t reasoncode) {
int responselength; int responselength;
char buffer[IEEE80211_MTU];
struct ieee80211_deauthentication_params ieee80211_params; struct ieee80211_deauthentication_params ieee80211_params;
struct wlan_send_frame_params wlan_params; struct wlan_send_frame_params wlan_params;
@ -625,14 +611,14 @@ static void nl80211_wlan_send_deauthentication(struct nl80211_wlan_handle* wlanh
memcpy(ieee80211_params.station, stationaddress, ETH_ALEN); memcpy(ieee80211_params.station, stationaddress, ETH_ALEN);
ieee80211_params.reasoncode = reasoncode; ieee80211_params.reasoncode = reasoncode;
responselength = ieee80211_create_deauthentication(buffer, IEEE80211_MTU, &ieee80211_params); responselength = ieee80211_create_deauthentication(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &ieee80211_params);
if (responselength < 0) { if (responselength < 0) {
return; return;
} }
/* Send deauthentication */ /* Send deauthentication */
memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params)); memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params));
wlan_params.packet = buffer; wlan_params.packet = g_bufferIEEE80211;
wlan_params.length = responselength; wlan_params.length = responselength;
wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency; wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency;
@ -647,7 +633,6 @@ static void nl80211_wlan_send_deauthentication(struct nl80211_wlan_handle* wlanh
static void nl80211_do_mgmt_probe_request_event(struct nl80211_wlan_handle* wlanhandle, const struct ieee80211_header_mgmt* mgmt, int mgmtlength) { static void nl80211_do_mgmt_probe_request_event(struct nl80211_wlan_handle* wlanhandle, const struct ieee80211_header_mgmt* mgmt, int mgmtlength) {
int ielength; int ielength;
int ssidcheck; int ssidcheck;
char buffer[IEEE80211_MTU];
int responselength; int responselength;
struct ieee80211_ie_items ieitems; struct ieee80211_ie_items ieitems;
struct wlan_send_frame_params wlan_params; struct wlan_send_frame_params wlan_params;
@ -688,14 +673,14 @@ static void nl80211_do_mgmt_probe_request_event(struct nl80211_wlan_handle* wlan
ieee80211_params.erpinfo = ieee80211_get_erpinfo(wlanhandle->devicehandle->currentfrequency.mode, wlanhandle->devicehandle->olbc, wlanhandle->devicehandle->stationsnonerpcount, wlanhandle->devicehandle->stationsnoshortpreamblecount, wlanhandle->devicehandle->shortpreamble); ieee80211_params.erpinfo = ieee80211_get_erpinfo(wlanhandle->devicehandle->currentfrequency.mode, wlanhandle->devicehandle->olbc, wlanhandle->devicehandle->stationsnonerpcount, wlanhandle->devicehandle->stationsnoshortpreamblecount, wlanhandle->devicehandle->shortpreamble);
ieee80211_params.channel = wlanhandle->devicehandle->currentfrequency.channel; ieee80211_params.channel = wlanhandle->devicehandle->currentfrequency.channel;
responselength = ieee80211_create_probe_response(buffer, IEEE80211_MTU, &ieee80211_params); responselength = ieee80211_create_probe_response(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &ieee80211_params);
if (responselength < 0) { if (responselength < 0) {
return; return;
} }
/* Send probe response */ /* Send probe response */
memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params)); memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params));
wlan_params.packet = buffer; wlan_params.packet = g_bufferIEEE80211;
wlan_params.length = responselength; wlan_params.length = responselength;
wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency; wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency;
wlan_params.no_wait_ack = ((ssidcheck == WIFI_WILDCARD_SSID) && wifi_is_broadcast_addr(mgmt->da) ? 1 : 0); wlan_params.no_wait_ack = ((ssidcheck == WIFI_WILDCARD_SSID) && wifi_is_broadcast_addr(mgmt->da) ? 1 : 0);
@ -714,7 +699,6 @@ static void nl80211_do_mgmt_authentication_event(struct nl80211_wlan_handle* wla
uint16_t algorithm; uint16_t algorithm;
uint16_t transactionseqnumber; uint16_t transactionseqnumber;
uint16_t responsestatuscode; uint16_t responsestatuscode;
char buffer[IEEE80211_MTU];
struct ieee80211_authentication_params ieee80211_params; struct ieee80211_authentication_params ieee80211_params;
struct wlan_send_frame_params wlan_params; struct wlan_send_frame_params wlan_params;
struct nl80211_station* station; struct nl80211_station* station;
@ -771,14 +755,14 @@ static void nl80211_do_mgmt_authentication_event(struct nl80211_wlan_handle* wla
ieee80211_params.transactionseqnumber = transactionseqnumber + 1; ieee80211_params.transactionseqnumber = transactionseqnumber + 1;
ieee80211_params.statuscode = responsestatuscode; ieee80211_params.statuscode = responsestatuscode;
responselength = ieee80211_create_authentication_response(buffer, IEEE80211_MTU, &ieee80211_params); responselength = ieee80211_create_authentication_response(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &ieee80211_params);
if (responselength < 0) { if (responselength < 0) {
return; return;
} }
/* Send authentication response */ /* Send authentication response */
memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params)); memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params));
wlan_params.packet = buffer; wlan_params.packet = g_bufferIEEE80211;
wlan_params.length = responselength; wlan_params.length = responselength;
wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency; wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency;
@ -870,7 +854,6 @@ static int nl80211_set_station_information(struct nl80211_wlan_handle* wlanhandl
static void nl80211_do_mgmt_association_request_event(struct nl80211_wlan_handle* wlanhandle, const struct ieee80211_header_mgmt* mgmt, int mgmtlength) { static void nl80211_do_mgmt_association_request_event(struct nl80211_wlan_handle* wlanhandle, const struct ieee80211_header_mgmt* mgmt, int mgmtlength) {
int ielength; int ielength;
int responselength; int responselength;
char buffer[IEEE80211_MTU];
struct ieee80211_ie_items ieitems; struct ieee80211_ie_items ieitems;
struct ieee80211_associationresponse_params ieee80211_params; struct ieee80211_associationresponse_params ieee80211_params;
struct wlan_send_frame_params wlan_params; struct wlan_send_frame_params wlan_params;
@ -909,14 +892,14 @@ static void nl80211_do_mgmt_association_request_event(struct nl80211_wlan_handle
memcpy(ieee80211_params.supportedrates, wlanhandle->devicehandle->supportedrates, wlanhandle->devicehandle->supportedratescount); memcpy(ieee80211_params.supportedrates, wlanhandle->devicehandle->supportedrates, wlanhandle->devicehandle->supportedratescount);
ieee80211_params.supportedratescount = wlanhandle->devicehandle->supportedratescount; ieee80211_params.supportedratescount = wlanhandle->devicehandle->supportedratescount;
responselength = ieee80211_create_associationresponse_response(buffer, IEEE80211_MTU, &ieee80211_params); responselength = ieee80211_create_associationresponse_response(g_bufferIEEE80211, sizeof(g_bufferIEEE80211), &ieee80211_params);
if (responselength < 0) { if (responselength < 0) {
return; return;
} }
/* Send authentication response */ /* Send authentication response */
memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params)); memset(&wlan_params, 0, sizeof(struct wlan_send_frame_params));
wlan_params.packet = buffer; wlan_params.packet = g_bufferIEEE80211;
wlan_params.length = responselength; wlan_params.length = responselength;
wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency; wlan_params.frequency = wlanhandle->devicehandle->currentfrequency.frequency;
@ -1285,66 +1268,12 @@ static int nl80211_global_valid_handler(struct nl_msg* msg, void* data) {
/* */ /* */
static void nl80211_global_newlink_event(wifi_global_handle handle, struct ifinfomsg* infomsg, uint8_t* data, int length) { static void nl80211_global_newlink_event(wifi_global_handle handle, struct ifinfomsg* infomsg, uint8_t* data, int length) {
char ifname[IFNAMSIZ + 1];
char buffer[100];
char* pos = buffer;
char* end = buffer + sizeof(buffer);
int attrlen = length;
struct rtattr* attr = (struct rtattr*)data;
struct nl80211_wlan_handle* wlanhandle; struct nl80211_wlan_handle* wlanhandle;
struct nl80211_global_handle* globalhandle = (struct nl80211_global_handle*)handle; struct nl80211_global_handle* globalhandle = (struct nl80211_global_handle*)handle;
ASSERT(handle != NULL); ASSERT(handle != NULL);
ASSERT(infomsg != NULL); ASSERT(infomsg != NULL);
/* */
memset(ifname, 0, sizeof(ifname));
memset(buffer, 0, sizeof(buffer));
while (RTA_OK(attr, attrlen)) {
switch (attr->rta_type) {
case IFLA_IFNAME: {
if (RTA_PAYLOAD(attr) < IFNAMSIZ) {
memcpy(ifname, RTA_DATA(attr), RTA_PAYLOAD(attr));
}
break;
}
case IFLA_MASTER: {
pos += snprintf(pos, end - pos, " master=%u", nla_get_u32((struct nlattr*)attr));
break;
}
case IFLA_WIRELESS: {
int length = (int)RTA_PAYLOAD(attr);
uint16_t* data = (uint16_t*)RTA_DATA(attr);
pos += snprintf(pos, end - pos, " wext");
if ((length > 0) && (data != NULL)) {
pos += snprintf(pos, end - pos, " (%d:%d [%d])", (unsigned int)data[0], (unsigned int)data[1], length);
}
break;
}
case IFLA_OPERSTATE: {
pos += snprintf(pos, end - pos, " operstate=%u", nla_get_u32((struct nlattr*)attr));
break;
}
case IFLA_LINKMODE: {
pos += snprintf(pos, end - pos, " linkmode=%u", nla_get_u32((struct nlattr*)attr));
break;
}
}
attr = RTA_NEXT(attr, attrlen);
}
capwap_logging_debug("Link status change: ifi_index=%d ifname=%s%s ifi_flags=0x%x (%s%s%s%s)", infomsg->ifi_index, ifname, buffer, infomsg->ifi_flags, (infomsg->ifi_flags & IFF_UP) ? "[UP]" : "", (infomsg->ifi_flags & IFF_RUNNING) ? "[RUNNING]" : "", (infomsg->ifi_flags & IFF_LOWER_UP) ? "[LOWER_UP]" : "", (infomsg->ifi_flags & IFF_DORMANT) ? "[DORMANT]" : "");
/* Search device */ /* Search device */
wlanhandle = nl80211_global_search_wlan(globalhandle, infomsg->ifi_index); wlanhandle = nl80211_global_search_wlan(globalhandle, infomsg->ifi_index);
if (wlanhandle) { if (wlanhandle) {
@ -1583,6 +1512,11 @@ static int cb_get_phydevice_capability(struct nl_msg* msg, void* data) {
capability->capability |= WIFI_CAPABILITY_FLAGS_DEVICE_AP_SME; capability->capability |= WIFI_CAPABILITY_FLAGS_DEVICE_AP_SME;
} }
if (tb_msg[NL80211_ATTR_PROBE_RESP_OFFLOAD]) {
capability->capability |= WIFI_CAPABILITY_FLAGS_PROBE_RESPONSE_OFFLOAD;
/* TODO check offload protocol support */
}
/* Cipher supported */ /* Cipher supported */
if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) { if (tb_msg[NL80211_ATTR_CIPHER_SUITES]) {
int count; int count;
@ -2349,6 +2283,8 @@ static int nl80211_wlan_startap(wifi_wlan_handle handle, struct wlan_startap_par
wlanhandle->ssid_hidden = params->ssid_hidden; wlanhandle->ssid_hidden = params->ssid_hidden;
wlanhandle->capability = params->capability; wlanhandle->capability = params->capability;
wlanhandle->authenticationtype = ((params->authmode == CAPWAP_ADD_WLAN_AUTHTYPE_WEP) ? NL80211_AUTHTYPE_SHARED_KEY : NL80211_AUTHTYPE_OPEN_SYSTEM); wlanhandle->authenticationtype = ((params->authmode == CAPWAP_ADD_WLAN_AUTHTYPE_WEP) ? NL80211_AUTHTYPE_SHARED_KEY : NL80211_AUTHTYPE_OPEN_SYSTEM);
wlanhandle->macmode = params->macmode;
wlanhandle->tunnelmode = params->tunnelmode;
/* Set beacon */ /* Set beacon */
if (nl80211_wlan_setbeacon(wlanhandle)) { if (nl80211_wlan_setbeacon(wlanhandle)) {

7
src/binding/ieee80211/wifi_nl80211.h
View File

@ -101,6 +101,10 @@ struct nl80211_wlan_handle {
uint8_t ssid_hidden; uint8_t ssid_hidden;
uint16_t capability; uint16_t capability;
/* Tunnel */
uint8_t macmode;
uint8_t tunnelmode;
/* Authentication */ /* Authentication */
uint8_t authenticationtype; uint8_t authenticationtype;
@ -110,9 +114,6 @@ struct nl80211_wlan_handle {
struct capwap_hash* stations; struct capwap_hash* stations;
uint32_t aidbitfield[WIFI_AID_BITFIELD_SIZE]; uint32_t aidbitfield[WIFI_AID_BITFIELD_SIZE];
/* Scan */
unsigned long scancomplete;
}; };
/* Physical device info */ /* Physical device info */