From a4f2110934465c60236a6e3a44a1303022998f3e Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 25 Dec 2009 14:20:35 +0200 Subject: [PATCH] Clean up some of the hostapd.h function prototype definitions Not all prototypes in hostapd.h really belong there. This is an initial step in cleaning that up. --- hostapd/ap_drv_ops.c | 1 + hostapd/ap_drv_ops.h | 20 ++++++++++++++++++++ hostapd/dump_state.c | 2 +- hostapd/dump_state.h | 20 ++++++++++++++++++++ hostapd/eap_register.c | 1 + hostapd/eap_register.h | 20 ++++++++++++++++++++ hostapd/hostapd.c | 11 +---------- hostapd/main.c | 13 +++++++++++++ src/ap/hostapd.h | 12 +++++------- 9 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 hostapd/ap_drv_ops.h create mode 100644 hostapd/dump_state.h create mode 100644 hostapd/eap_register.h diff --git a/hostapd/ap_drv_ops.c b/hostapd/ap_drv_ops.c index 2324dc4af..7ad32c605 100644 --- a/hostapd/ap_drv_ops.c +++ b/hostapd/ap_drv_ops.c @@ -19,6 +19,7 @@ #include "ap/ieee802_11.h" #include "ap/sta_info.h" #include "driver_i.h" +#include "ap_drv_ops.h" static int hostapd_sta_flags_to_drv(int flags) diff --git a/hostapd/ap_drv_ops.h b/hostapd/ap_drv_ops.h new file mode 100644 index 000000000..d8da7adb5 --- /dev/null +++ b/hostapd/ap_drv_ops.h @@ -0,0 +1,20 @@ +/* + * hostapd - Driver operations + * Copyright (c) 2009, Jouni Malinen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + +#ifndef AP_DRV_OPS +#define AP_DRV_OPS + +void hostapd_set_driver_ops(struct hostapd_driver_ops *ops); + +#endif /* AP_DRV_OPS */ diff --git a/hostapd/dump_state.c b/hostapd/dump_state.c index 0ef6f1cba..7eeb2924f 100644 --- a/hostapd/dump_state.c +++ b/hostapd/dump_state.c @@ -12,7 +12,6 @@ * See README and COPYING for more details. */ - #include "includes.h" #include "common.h" @@ -24,6 +23,7 @@ #include "ap/hostapd.h" #include "ap/config.h" #include "ap/sta_info.h" +#include "dump_state.h" static void fprint_char(FILE *f, char c) diff --git a/hostapd/dump_state.h b/hostapd/dump_state.h new file mode 100644 index 000000000..e14f08a4f --- /dev/null +++ b/hostapd/dump_state.h @@ -0,0 +1,20 @@ +/* + * hostapd / State dump + * Copyright (c) 2002-2009, Jouni Malinen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + +#ifndef DUMP_STATE_H +#define DUMP_STATE_H + +int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx); + +#endif /* DUMP_STATE_H */ diff --git a/hostapd/eap_register.c b/hostapd/eap_register.c index 01f3aab7c..ae9bf9d38 100644 --- a/hostapd/eap_register.c +++ b/hostapd/eap_register.c @@ -16,6 +16,7 @@ #include "common.h" #include "eap_server/eap_methods.h" +#include "eap_register.h" /** diff --git a/hostapd/eap_register.h b/hostapd/eap_register.h new file mode 100644 index 000000000..82e7171d6 --- /dev/null +++ b/hostapd/eap_register.h @@ -0,0 +1,20 @@ +/* + * EAP method registration + * Copyright (c) 2004-2009, Jouni Malinen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + +#ifndef EAP_REGISTER_H +#define EAP_REGISTER_H + +int eap_server_register_methods(void); + +#endif /* EAP_REGISTER_H */ diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c index e7778ba4e..fd8eb6df0 100644 --- a/hostapd/hostapd.c +++ b/hostapd/hostapd.c @@ -34,6 +34,7 @@ #include "driver_i.h" #include "ctrl_iface.h" #include "wpa_auth_glue.h" +#include "ap_drv_ops.h" static int hostapd_flush_old_stations(struct hostapd_data *hapd); @@ -110,16 +111,6 @@ int hostapd_reload_config(struct hostapd_iface *iface) } -int handle_reload_iface(struct hostapd_iface *iface, void *ctx) -{ - if (hostapd_reload_config(iface) < 0) { - wpa_printf(MSG_WARNING, "Failed to read new configuration " - "file - continuing with old."); - } - return 0; -} - - static void hostapd_broadcast_key_clear_iface(struct hostapd_data *hapd, char *ifname) { diff --git a/hostapd/main.c b/hostapd/main.c index 35f4bff4e..0b9a2d589 100644 --- a/hostapd/main.c +++ b/hostapd/main.c @@ -27,6 +27,8 @@ #include "ap/hostapd.h" #include "ap/config.h" #include "config_file.h" +#include "eap_register.h" +#include "dump_state.h" extern int wpa_debug_level; @@ -308,6 +310,17 @@ static void handle_term(int sig, void *signal_ctx) #ifndef CONFIG_NATIVE_WINDOWS + +static int handle_reload_iface(struct hostapd_iface *iface, void *ctx) +{ + if (hostapd_reload_config(iface) < 0) { + wpa_printf(MSG_WARNING, "Failed to read new configuration " + "file - continuing with old."); + } + return 0; +} + + /** * handle_reload - SIGHUP handler to reload configuration */ diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h index c183cc1b2..fe3455945 100644 --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -227,6 +227,7 @@ struct hostapd_iface { void (*scan_cb)(struct hostapd_iface *iface); }; +/* hostapd.c */ int hostapd_reload_config(struct hostapd_iface *iface); struct hostapd_data * hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface, @@ -235,22 +236,19 @@ hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface, int hostapd_setup_interface(struct hostapd_iface *iface); int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err); void hostapd_interface_deinit(struct hostapd_iface *iface); -int handle_reload_iface(struct hostapd_iface *iface, void *ctx); -int handle_dump_state_iface(struct hostapd_iface *iface, void *ctx); +void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta, + int reassoc); +/* main.c */ int hostapd_for_each_interface(struct hapd_interfaces *interfaces, int (*cb)(struct hostapd_iface *iface, void *ctx), void *ctx); +/* utils.c */ int hostapd_register_probereq_cb(struct hostapd_data *hapd, void (*cb)(void *ctx, const u8 *sa, const u8 *ie, size_t ie_len), void *ctx); void hostapd_prune_associations(struct hostapd_data *hapd, const u8 *addr); -int eap_server_register_methods(void); -void hostapd_set_driver_ops(struct hostapd_driver_ops *ops); -void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta, - int reassoc); - #endif /* HOSTAPD_H */