jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
hostap/src/ap
History
Jörg Krause 81606ab73b vlan: Fix musl libc conflict with Linux kernel headers 
Due to both <netinet/in.h> (in "utils/includes.h") and <linux/in6.h> (in
<linux/if_bridge.h>) being included, the in6_addr is being redefined:
once from the C library headers and once from the Linux kernel headers.
This causes some build failures with for example the musl C library:

In file included from /usr/include/linux/if_bridge.h:18,
                 from ../src/ap/vlan_init.c:17:
/usr/include/linux/in6.h:32: error: redefinition of 'struct in6_addr'
/usr/include/linux/in6.h:49: error: redefinition of 'struct sockaddr_in6'
/usr/include/linux/in6.h:59: error: redefinition of 'struct ipv6_mreq'

Mixing C library and Linux kernel headers is a bit problematic [1] and
should be avoided if possible [2]. In order to fix this, define just the
macros needed from <linux/if_bridge.h> as done in Busybox for the brctl
applet [3].

[1] https://sourceware.org/bugzilla/show_bug.cgi?id=15850
[2] http://www.openwall.com/lists/musl/2015/10/06/1
[3] https://git.busybox.net/busybox/commit/?id=5fa6d1a632505789409a2ba6cf8e112529f9db18

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
2016-03-26 11:02:16 +02:00
..
accounting.c RADIUS: Add Acct-Delay-Time into accounting messages 2016-02-29 17:43:13 +02:00
accounting.h RADIUS: Use more likely unique accounting Acct-{,Multi-}Session-Id 2016-02-06 17:10:19 +02:00
acs.c ACS: Remove unreachable case from a debug print 2016-01-07 16:50:53 +02:00
acs.h Move declaration of hostapd_acs_completed() into correct header file 2013-12-31 19:34:43 +02:00
ap_config.c Replace hostapd_mac_comp_empty() with is_zero_ether_addr() 2016-02-28 20:11:58 +02:00
ap_config.h hostapd: Allow use of driver-generated interface addresses 2016-03-06 20:00:40 +02:00
ap_drv_ops.c Simplify hostapd_build_ap_extra_ies() with helper functions 2016-02-22 19:53:04 +02:00
ap_drv_ops.h AP: Add support for full station state 2016-02-20 18:25:13 +02:00
ap_list.c Move ap_list_timer() to use common AP periodic cleanup mechanism 2015-07-20 13:42:35 +03:00
ap_list.h Move ap_list_timer() to use common AP periodic cleanup mechanism 2015-07-20 13:42:35 +03:00
ap_mlme.c AP: Fix Deauth/Disassoc TX status timeout handling 2016-01-15 19:32:49 +02:00
ap_mlme.h Remove the GPL notification from files contributed by Jouni Malinen 2012-02-11 19:39:36 +02:00
authsrv.c Server configuration for OCSP stapling with ocsp_multi (RFC 6961) 2015-12-22 19:42:07 +02:00
authsrv.h Remove the GPL notification from files contributed by Jouni Malinen 2012-02-11 19:39:36 +02:00
beacon.c hostapd: Add MBO IE to Beacon, Probe Response, Association Response 2016-02-22 19:53:04 +02:00
beacon.h Add station tracking based on other management frame subtypes 2015-09-05 19:38:06 +03:00
bss_load.c AP: Add support for BSS load element (STA Count, Channel Utilization) 2014-10-21 23:25:48 +03:00
bss_load.h AP: Add support for BSS load element (STA Count, Channel Utilization) 2014-10-21 23:25:48 +03:00
ctrl_iface_ap.c PMKSA: Flush AP/mesh PMKSA cache by PMKSA_FLUSH command 2016-03-20 17:37:53 +02:00
ctrl_iface_ap.h PMKSA: Flush AP/mesh PMKSA cache by PMKSA_FLUSH command 2016-03-20 17:37:53 +02:00
dfs.c hostapd: Handle running out of DFS channels 2016-03-08 12:16:37 +02:00
dfs.h DFS offload: Add main DFS handler for offloaded case 2015-03-05 17:21:30 +02:00
dhcp_snoop.c dhcp_snoop: Make IPv4 addresses human readable in debug log 2015-01-30 18:55:22 +02:00
dhcp_snoop.h AP: Add support for Proxy ARP, DHCP snooping mechanism 2014-10-28 01:08:29 +02:00
drv_callbacks.c Find correct driver for interface additions/removals 2016-03-22 17:41:37 +02:00
eap_user_db.c Improve error messages related to EAP DB 2015-03-28 13:16:26 +02:00
gas_serv.c GAS: Calculate response buffer length of ANQP elements 2016-02-06 01:19:32 +02:00
gas_serv.h Interworking: Add support for configuring arbitrary ANQP-elements 2015-10-07 17:07:21 +03:00
hostapd.c Find correct driver for interface additions/removals 2016-03-22 17:41:37 +02:00
hostapd.h mesh: Add support for PMKSA caching 2016-03-20 17:56:38 +02:00
hs20.c HS 2.0R2 AP: Add support for deauthentication request 2014-02-26 01:24:24 +02:00
hs20.h HS 2.0R2 AP: Add support for deauthentication request 2014-02-26 01:24:24 +02:00
hw_features.c Make fallback from HT40 to HT20 work 2016-02-05 17:52:47 +02:00
hw_features.h hostapd: Fix some compilation errors 2015-03-29 20:51:14 +03:00
iapp.c IAPP: Avoid warnings on unused write 2014-10-11 18:03:38 +03:00
iapp.h Remove the GPL notification from files contributed by Jouni Malinen 2012-02-11 19:39:36 +02:00
ieee802_1x.c AP: Save EAPOL received before Association Response ACK 2016-03-06 17:08:12 +02:00
ieee802_1x.h HS 2.0: Postpone WNM-Notification sending by 100 ms 2015-12-31 21:46:08 +02:00
ieee802_11.c mesh: Add support for PMKSA caching 2016-03-20 17:56:38 +02:00
ieee802_11.h mesh: Add support for PMKSA caching 2016-03-20 17:56:38 +02:00
ieee802_11_auth.c RADIUS: Allow RADIUS server to provide PSK instead of passphrase 2016-02-28 19:06:49 +02:00
ieee802_11_auth.h VLAN: Separate station grouping and uplink configuration 2016-02-17 11:46:11 +02:00
ieee802_11_ht.c Fix CSA related IEs order 2015-10-03 21:01:47 +03:00
ieee802_11_shared.c AP: Store STA supported operating classes information 2016-02-24 12:20:31 +02:00
ieee802_11_vht.c VHT: Add an interoperability workaround for 80+80 and 160 MHz channels 2016-02-02 00:09:19 +02:00
Makefile tests: Add ap-mgmt-fuzzer 2015-04-22 11:44:19 +03:00
mbo_ap.c MBO: Parse non-preferred channel list on the AP 2016-02-22 21:17:38 +02:00
mbo_ap.h MBO: Parse non-preferred channel list on the AP 2016-02-22 21:17:38 +02:00
ndisc_snoop.c ndisc_snoop: Avoid misaligned read of IPv6 address 2015-07-07 16:25:06 +03:00
ndisc_snoop.h proxyarp: Use C library header files and CONFIG_IPV6 2014-11-25 16:58:21 +02:00
p2p_hostapd.c Use P2P_IE_VENDOR_TYPE more consistently 2014-03-05 23:36:54 +02:00
p2p_hostapd.h Remove the GPL notification from files contributed by Atheros 2012-02-11 19:39:36 +02:00
peerkey_auth.c PeerKey: Clean up EAPOL-Key Key Data processing on AP 2014-11-23 21:03:40 +02:00
pmksa_cache_auth.c wpa_supplicant: Fix CONFIG_IBSS_RSN=y build without CONFIG_AP=y 2016-03-21 21:12:20 +02:00
pmksa_cache_auth.h PMKSA: Flush AP/mesh PMKSA cache by PMKSA_FLUSH command 2016-03-20 17:37:53 +02:00
preauth_auth.c Remove the GPL notification from files contributed by Jouni Malinen 2012-02-11 19:39:36 +02:00
preauth_auth.h Remove the GPL notification from files contributed by Jouni Malinen 2012-02-11 19:39:36 +02:00
sta_info.c AP: Store STA supported operating classes information 2016-02-24 12:20:31 +02:00
sta_info.h mesh: Add support for PMKSA caching 2016-03-20 17:56:38 +02:00
tkip_countermeasures.c AP: Use monotonic time for MMIC failure/TKIP countermeasures 2013-12-24 07:13:34 +02:00
tkip_countermeasures.h hostapd: Fix a regression in TKIP countermeasures processing 2012-11-18 13:06:03 +02:00
utils.c FST: Do not prune STAs belonging to the same FST 2015-07-16 18:26:15 +03:00
vlan.c VLAN: Fix vlan_compare() for tagged VLANs 2016-02-22 19:53:05 +02:00
vlan.h radius: Add tagged VLAN parsing 2016-02-17 11:46:13 +02:00
vlan_full.c vlan: Fix musl libc conflict with Linux kernel headers 2016-03-26 11:02:16 +02:00
vlan_ifconfig.c vlan: Move if_nametoindex() use out of vlan_init.c 2016-03-25 18:00:44 +02:00
vlan_init.c vlan: Move if_nametoindex() use out of vlan_init.c 2016-03-25 18:00:44 +02:00
vlan_init.h VLAN: Separate station grouping and uplink configuration 2016-02-17 11:46:11 +02:00
vlan_ioctl.c vlan: Clean up netlink vs. ioctl API implementation 2016-03-25 17:24:20 +02:00
vlan_util.c vlan: Remove unnecessary header includes from netlink implementation 2016-03-25 17:27:16 +02:00
vlan_util.h vlan: Move if_nametoindex() use out of vlan_init.c 2016-03-25 18:00:44 +02:00
wmm.c AP WMM: Fix integer underflow in WMM Action frame parser 2015-05-03 18:26:50 +03:00
wmm.h Remove obsolete license notifications 2013-12-24 22:59:52 +02:00
wnm_ap.c WNM: Fix a memory leak on AP error path 2016-02-22 19:53:05 +02:00
wnm_ap.h hostapd: Add MBO IE to BSS Transition Management Request frame 2016-02-22 19:53:04 +02:00
wpa_auth.c mesh: Simplify wpa_auth_pmksa_set_to_sm() 2016-03-22 20:38:44 +02:00
wpa_auth.h mesh: Add support for PMKSA caching 2016-03-20 17:56:38 +02:00
wpa_auth_ft.c FT: Fix sm->assoc_resp_ftie storing on the AP side 2015-12-10 00:14:35 +02:00
wpa_auth_glue.c FT: Check destination MAC address on RRB receive 2016-02-28 19:23:17 +02:00
wpa_auth_glue.h Remove the GPL notification from files contributed by Jouni Malinen 2012-02-11 19:39:36 +02:00
wpa_auth_i.h Fix Suite B 192-bit AKM to use proper PMK length 2015-10-14 18:43:26 +03:00
wpa_auth_ie.c radius: Add tagged VLAN parsing 2016-02-17 11:46:13 +02:00
wpa_auth_ie.h HS 2.0R2 AP: Add OSEN implementation 2014-02-26 01:24:24 +02:00
wps_hostapd.c WPS: Use only os_get_random() for PIN generation 2016-02-19 18:44:40 +02:00
wps_hostapd.h WPS NFC: Add AP mode connection handover report 2014-01-27 21:10:55 +02:00
x_snoop.c AP: Enable multicast snooping on bridge if ProxyARP IPv6 is in use 2015-04-13 14:00:32 +03:00
x_snoop.h AP: Add multicast-to-unicast conversion send for "x_snoop" 2014-11-19 16:25:13 +02:00