Make RADIUS server MIB available through control interface

"MIB radius_server" control interface can now be used to fetch the
RADIUS server MIB data from hostapd.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index 125e97f..bd251f7 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -20,6 +20,7 @@
 #include "common/ieee802_11_defs.h"
 #include "drivers/driver.h"
 #include "radius/radius_client.h"
+#include "radius/radius_server.h"
 #include "ap/hostapd.h"
 #include "ap/ap_config.h"
 #include "ap/ieee802_1x.h"
@@ -1083,6 +1084,19 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_data *hapd, char *pos)
 }
 
 
+static int hostapd_ctrl_iface_mib(struct hostapd_data *hapd, char *reply,
+                                 int reply_size, const char *param)
+{
+#ifdef RADIUS_SERVER
+       if (os_strcmp(param, "radius_server") == 0) {
+               return radius_server_get_mib(hapd->radius_srv, reply,
+                                            reply_size);
+       }
+#endif /* RADIUS_SERVER */
+       return -1;
+}
+
+
 static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                                       void *sock_ctx)
 {
@@ -1155,6 +1169,9 @@ static void hostapd_ctrl_iface_receive(int sock, void *eloop_ctx,
                                reply_len += res;
                }
 #endif /* CONFIG_NO_RADIUS */
+       } else if (os_strncmp(buf, "MIB ", 4) == 0) {
+               reply_len = hostapd_ctrl_iface_mib(hapd, reply, reply_size,
+                                                  buf + 4);
        } else if (os_strcmp(buf, "STA-FIRST") == 0) {
                reply_len = hostapd_ctrl_iface_sta_first(hapd, reply,
                                                         reply_size);

diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index b2d3e5b..7a0ef0a 100644 (file)
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -224,6 +224,11 @@ static int hostapd_cli_cmd_status(struct wpa_ctrl *ctrl, int argc, char *argv[])
 
 static int hostapd_cli_cmd_mib(struct wpa_ctrl *ctrl, int argc, char *argv[])
 {
+       if (argc > 0) {
+               char buf[100];
+               os_snprintf(buf, sizeof(buf), "MIB %s", argv[0]);
+               return wpa_ctrl_command(ctrl, buf);
+       }
        return wpa_ctrl_command(ctrl, "MIB");
 }