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

Merge

Browse Source
This commit is contained in:
vemax78
2015-01-24 13:14:05 +01:00
parent 32a25aa34e 86998ce2da
commit 8042cd2e04
11 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wtp/binding/ieee80211/wifi_drivers.c
View File

@ -1559,7 +1559,7 @@ uint16_t wifi_wlan_check_capability(struct wifi_wlan* wlan, uint16_t capability)
result &= ~IEEE80211_CAPABILITY_SHORTSLOTTIME;
}
return capability;
return result;
}
/* */

2
src/wtp/binding/ieee80211/wifi_nl80211.c
View File

@ -1663,7 +1663,7 @@ static wifi_global_handle nl80211_global_init(void) {
/* Add membership regulatory events */
result = nl80211_get_multicast_id(globalhandle, "nl80211", "regulatory");
if (result >= 0) {
result = nl_socket_add_membership(globalhandle->nl_event, result);
nl_socket_add_membership(globalhandle->nl_event, result);
}
/* Get nl80211 netlink family */

2
src/wtp/wtp_dfa.c
View File

@ -379,10 +379,8 @@ int wtp_dfa_running(void) {
/* Check is handshake complete */
if ((oldaction == CAPWAP_DTLS_ACTION_HANDSHAKE) && (g_wtp.dtls.action == CAPWAP_DTLS_ACTION_DATA)) {
if (g_wtp.state == CAPWAP_DTLS_CONNECT_STATE) {
check = CAPWAP_NONE_PACKET;
wtp_send_join();
} else {
check = CAPWAP_WRONG_PACKET;
wtp_teardown_connection();
}
}

2
src/wtp/wtp_dfa_discovery.c
View File

@ -68,7 +68,7 @@ void wtp_dfa_state_discovery_timeout(struct capwap_timeout* timeout, unsigned lo
}
/* AC with IPv6 */
if ((g_wtp.net.localaddr.ss.ss_family == AF_INET6)) {
if (g_wtp.net.localaddr.ss.ss_family == AF_INET6) {
for (w = 0; w < response->controlipv6->count; w++) {
struct capwap_controlipv6_element* controlipv6 = (struct capwap_controlipv6_element*)capwap_array_get_item_pointer(response->controlipv6, w);