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.
This commit is contained in:
Jouni Malinen 2009-12-25 14:20:35 +02:00
parent 0aef3ec832
commit a4f2110934
9 changed files with 82 additions and 18 deletions

View file

@ -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)

20
hostapd/ap_drv_ops.h Normal file
View file

@ -0,0 +1,20 @@
/*
* hostapd - Driver operations
* Copyright (c) 2009, Jouni Malinen <j@w1.fi>
*
* 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 */

View file

@ -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)

20
hostapd/dump_state.h Normal file
View file

@ -0,0 +1,20 @@
/*
* hostapd / State dump
* Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
*
* 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 */

View file

@ -16,6 +16,7 @@
#include "common.h"
#include "eap_server/eap_methods.h"
#include "eap_register.h"
/**

20
hostapd/eap_register.h Normal file
View file

@ -0,0 +1,20 @@
/*
* EAP method registration
* Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
*
* 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 */

View file

@ -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)
{

View file

@ -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
*/

View file

@ -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 */