Move driver deinitialization away from hostapd.c

[libeap.git] / hostapd / ctrl_iface.c

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 3cd498c..ccb2266 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -20,18 +20,20 @@
 #include <sys/stat.h>
 #include <stddef.h>
 
-#include "hostapd.h"
+#include "common.h"
 #include "eloop.h"
-#include "config.h"
-#include "ieee802_1x.h"
-#include "wpa.h"
+#include "drivers/driver.h"
 #include "radius/radius_client.h"
-#include "ieee802_11.h"
+#include "ap/hostapd.h"
+#include "ap/config.h"
+#include "ap/ieee802_1x.h"
+#include "ap/wpa.h"
+#include "ap/ieee802_11.h"
+#include "ap/sta_info.h"
+#include "ap/accounting.h"
+#include "ap/wps_hostapd.h"
+#include "ap/ctrl_iface_ap.h"
 #include "ctrl_iface.h"
-#include "sta_info.h"
-#include "accounting.h"
-#include "wps_hostapd.h"
-#include "drivers/driver.h"
 
 
 struct wpa_ctrl_dst {
@@ -126,84 +128,6 @@ static int hostapd_ctrl_iface_level(struct hostapd_data *hapd,
 }
 
 
-static int hostapd_ctrl_iface_sta_mib(struct hostapd_data *hapd,
-                                     struct sta_info *sta,
-                                     char *buf, size_t buflen)
-{
-       int len, res, ret;
-
-       if (sta == NULL) {
-               ret = os_snprintf(buf, buflen, "FAIL\n");
-               if (ret < 0 || (size_t) ret >= buflen)
-                       return 0;
-               return ret;
-       }
-
-       len = 0;
-       ret = os_snprintf(buf + len, buflen - len, MACSTR "\n",
-                         MAC2STR(sta->addr));
-       if (ret < 0 || (size_t) ret >= buflen - len)
-               return len;
-       len += ret;
-
-       res = ieee802_11_get_mib_sta(hapd, sta, buf + len, buflen - len);
-       if (res >= 0)
-               len += res;
-       res = wpa_get_mib_sta(sta->wpa_sm, buf + len, buflen - len);
-       if (res >= 0)
-               len += res;
-       res = ieee802_1x_get_mib_sta(hapd, sta, buf + len, buflen - len);
-       if (res >= 0)
-               len += res;
-
-       return len;
-}
-
-
-static int hostapd_ctrl_iface_sta_first(struct hostapd_data *hapd,
-                                       char *buf, size_t buflen)
-{
-       return hostapd_ctrl_iface_sta_mib(hapd, hapd->sta_list, buf, buflen);
-}
-
-
-static int hostapd_ctrl_iface_sta(struct hostapd_data *hapd,
-                                 const char *txtaddr,
-                                 char *buf, size_t buflen)
-{
-       u8 addr[ETH_ALEN];
-       int ret;
-
-       if (hwaddr_aton(txtaddr, addr)) {
-               ret = os_snprintf(buf, buflen, "FAIL\n");
-               if (ret < 0 || (size_t) ret >= buflen)
-                       return 0;
-               return ret;
-       }
-       return hostapd_ctrl_iface_sta_mib(hapd, ap_get_sta(hapd, addr),
-                                         buf, buflen);
-}
-
-
-static int hostapd_ctrl_iface_sta_next(struct hostapd_data *hapd,
-                                      const char *txtaddr,
-                                      char *buf, size_t buflen)
-{
-       u8 addr[ETH_ALEN];
-       struct sta_info *sta;
-       int ret;
-
-       if (hwaddr_aton(txtaddr, addr) ||
-           (sta = ap_get_sta(hapd, addr)) == NULL) {
-               ret = os_snprintf(buf, buflen, "FAIL\n");
-               if (ret < 0 || (size_t) ret >= buflen)
-                       return 0;
-               return ret;
-       }               
-       return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
-}
-
-
 static int hostapd_ctrl_iface_new_sta(struct hostapd_data *hapd,
                                      const char *txtaddr)
 {
@@ -231,7 +155,7 @@ static int hostapd_ctrl_iface_new_sta(struct hostapd_data *hapd,
 
 
 #ifdef CONFIG_IEEE80211W
-#ifdef NEED_MLME
+#ifdef NEED_AP_MLME
 static int hostapd_ctrl_iface_sa_query(struct hostapd_data *hapd,
                                       const char *txtaddr)
 {
@@ -248,7 +172,7 @@ static int hostapd_ctrl_iface_sa_query(struct hostapd_data *hapd,
 
        return 0;
 }
-#endif /* NEED_MLME */
+#endif /* NEED_AP_MLME */
 #endif /* CONFIG_IEEE80211W */
 
 
@@ -351,6 +275,7 @@ static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                        else
                                reply_len += res;
                }
+#ifndef CONFIG_NO_RADIUS
                if (reply_len >= 0) {
                        res = radius_client_get_mib(hapd->radius,
                                                    reply + reply_len,
@@ -360,6 +285,7 @@ static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                        else
                                reply_len += res;
                }
+#endif /* CONFIG_NO_RADIUS */
        } else if (os_strcmp(buf, "STA-FIRST") == 0) {
                reply_len = hostapd_ctrl_iface_sta_first(hapd, reply,
                                                         reply_size);
@@ -383,11 +309,11 @@ static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                if (hostapd_ctrl_iface_new_sta(hapd, buf + 8))
                        reply_len = -1;
 #ifdef CONFIG_IEEE80211W
-#ifdef NEED_MLME
+#ifdef NEED_AP_MLME
        } else if (os_strncmp(buf, "SA_QUERY ", 9) == 0) {
                if (hostapd_ctrl_iface_sa_query(hapd, buf + 9))
                        reply_len = -1;
-#endif /* NEED_MLME */
+#endif /* NEED_AP_MLME */
 #endif /* CONFIG_IEEE80211W */
 #ifdef CONFIG_WPS
        } else if (os_strncmp(buf, "WPS_PIN ", 8) == 0) {
@@ -541,6 +467,7 @@ int hostapd_ctrl_iface_init(struct hostapd_data *hapd)
        hapd->ctrl_sock = s;
        eloop_register_read_sock(s, hostapd_ctrl_iface_receive, hapd,
                                 NULL);
+       hapd->msg_ctx = hapd;
        wpa_msg_register_cb(hostapd_ctrl_iface_msg_cb);
 
        return 0;