jeltz
/
hostap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Copy config_methods and device_type configuration for AP mode

This commit is contained in:
Jouni Malinen 2009-12-21 16:10:21 +02:00 committed by Jouni Malinen
parent c0e4dd9eeb
commit 094393b144
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hostapd/config.h
View File

@ -12,8 +12,8 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#ifndef CONFIG_H #ifndef HOSTAPD_CONFIG_H
#define CONFIG_H #define HOSTAPD_CONFIG_H
#include "common/defs.h" #include "common/defs.h"
#include "ip_addr.h" #include "ip_addr.h"
@ -386,4 +386,4 @@ const struct hostapd_eap_user *
hostapd_get_eap_user(const struct hostapd_bss_config *conf, const u8 *identity, hostapd_get_eap_user(const struct hostapd_bss_config *conf, const u8 *identity,
size_t identity_len, int phase2); size_t identity_len, int phase2);
#endif /* CONFIG_H */ #endif /* HOSTAPD_CONFIG_H */

6
wpa_supplicant/ap.c
View File

@ -28,6 +28,7 @@
#include "eap_common/eap_wsc_common.h" #include "eap_common/eap_wsc_common.h"
#include "wps/wps.h" #include "wps/wps.h"
#include "config_ssid.h" #include "config_ssid.h"
#include "config.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "driver_i.h" #include "driver_i.h"
#include "ap.h" #include "ap.h"
@ -391,7 +392,10 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
bss->eap_server = 1; bss->eap_server = 1;
bss->wps_state = 2; bss->wps_state = 2;
bss->ap_setup_locked = 1; bss->ap_setup_locked = 1;
bss->config_methods = os_strdup("display push_button keypad"); if (wpa_s->conf->config_methods)
bss->config_methods = os_strdup(wpa_s->conf->config_methods);
if (wpa_s->conf->device_type)
bss->device_type = os_strdup(wpa_s->conf->device_type);
#endif /* CONFIG_WPS */ #endif /* CONFIG_WPS */
return 0; return 0;