aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-12-25 12:20:35 (GMT)
committerJouni Malinen <j@w1.fi>2009-12-25 12:20:35 (GMT)
commita4f2110934465c60236a6e3a44a1303022998f3e (patch)
tree2d10f32c264133a5d6d4cedaacce1e9ba0878f49 /hostapd
parent0aef3ec8322f6e16a138871e7db6b5afeda4805b (diff)
downloadhostap-a4f2110934465c60236a6e3a44a1303022998f3e.zip
hostap-a4f2110934465c60236a6e3a44a1303022998f3e.tar.gz
hostap-a4f2110934465c60236a6e3a44a1303022998f3e.tar.bz2
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.
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/ap_drv_ops.c1
-rw-r--r--hostapd/ap_drv_ops.h20
-rw-r--r--hostapd/dump_state.c2
-rw-r--r--hostapd/dump_state.h20
-rw-r--r--hostapd/eap_register.c1
-rw-r--r--hostapd/eap_register.h20
-rw-r--r--hostapd/hostapd.c11
-rw-r--r--hostapd/main.c13
8 files changed, 77 insertions, 11 deletions
diff --git a/hostapd/ap_drv_ops.c b/hostapd/ap_drv_ops.c
index 2324dc4..7ad32c6 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 0000000..d8da7ad
--- /dev/null
+++ b/hostapd/ap_drv_ops.h
@@ -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 */
diff --git a/hostapd/dump_state.c b/hostapd/dump_state.c
index 0ef6f1c..7eeb292 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 0000000..e14f08a
--- /dev/null
+++ b/hostapd/dump_state.h
@@ -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 */
diff --git a/hostapd/eap_register.c b/hostapd/eap_register.c
index 01f3aab..ae9bf9d 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 0000000..82e7171
--- /dev/null
+++ b/hostapd/eap_register.h
@@ -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 */
diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index e7778ba..fd8eb6d 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 35f4bff..0b9a2d5 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
*/