aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd/hostapd_cli.c
diff options
context:
space:
mode:
authorGregory Detal <gregory.detal@uclouvain.be>2010-04-07 08:14:54 (GMT)
committerJouni Malinen <j@w1.fi>2010-04-07 08:14:54 (GMT)
commitbae92174748ea2279e9db5857cba56715038cc8b (patch)
tree09a85ab925675e5bb377a80ec13399fb698112c8 /hostapd/hostapd_cli.c
parentbb437f282b0db5b9581dd1469ccaf8a04a712fdb (diff)
downloadhostap-bae92174748ea2279e9db5857cba56715038cc8b.zip
hostap-bae92174748ea2279e9db5857cba56715038cc8b.tar.gz
hostap-bae92174748ea2279e9db5857cba56715038cc8b.tar.bz2
Add support for action scripts in hostapd_cli
Diffstat (limited to 'hostapd/hostapd_cli.c')
-rw-r--r--hostapd/hostapd_cli.c159
1 files changed, 139 insertions, 20 deletions
diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c
index 6fab4ad..994c76a 100644
--- a/hostapd/hostapd_cli.c
+++ b/hostapd/hostapd_cli.c
@@ -104,23 +104,29 @@ static int hostapd_cli_quit = 0;
static int hostapd_cli_attached = 0;
static const char *ctrl_iface_dir = "/var/run/hostapd";
static char *ctrl_ifname = NULL;
+static const char *pid_file = NULL;
+static const char *action_file = NULL;
static int ping_interval = 5;
static void usage(void)
{
fprintf(stderr, "%s\n", hostapd_cli_version);
- fprintf(stderr,
- "\n"
- "usage: hostapd_cli [-p<path>] [-i<ifname>] [-hv] "
- "[-G<ping interval>] \\\n"
- " [command..]\n"
+ fprintf(stderr,
+ "\n"
+ "usage: hostapd_cli [-p<path>] [-i<ifname>] [-hvB] "
+ "[-a<path>] \\\n"
+ " [-G<ping interval>] [command..]\n"
"\n"
"Options:\n"
" -h help (show this usage text)\n"
" -v shown version information\n"
" -p<path> path to find control sockets (default: "
"/var/run/hostapd)\n"
+ " -a<file> run in daemon mode executing the action file "
+ "based on events\n"
+ " from hostapd\n"
+ " -B run a daemon in the background\n"
" -i<ifname> Interface to listen on (default: first "
"interface found in the\n"
" socket path)\n\n"
@@ -215,6 +221,51 @@ static int hostapd_cli_cmd_mib(struct wpa_ctrl *ctrl, int argc, char *argv[])
}
+static int hostapd_cli_exec(const char *program, const char *arg1,
+ const char *arg2)
+{
+ char *cmd;
+ size_t len;
+ int res;
+ int ret = 0;
+
+ len = os_strlen(program) + os_strlen(arg1) + os_strlen(arg2) + 3;
+ cmd = os_malloc(len);
+ if (cmd == NULL)
+ return -1;
+ res = os_snprintf(cmd, len, "%s %s %s", program, arg1, arg2);
+ if (res < 0 || (size_t) res >= len) {
+ os_free(cmd);
+ return -1;
+ }
+ cmd[len - 1] = '\0';
+#ifndef _WIN32_WCE
+ if (system(cmd) < 0)
+ ret = -1;
+#endif /* _WIN32_WCE */
+ os_free(cmd);
+
+ return ret;
+}
+
+
+static void hostapd_cli_action_process(char *msg, size_t len)
+{
+ const char *pos;
+
+ pos = msg;
+ if (*pos == '<') {
+ pos = os_strchr(pos, '>');
+ if (pos)
+ pos++;
+ else
+ pos = msg;
+ }
+
+ hostapd_cli_exec(action_file, ctrl_ifname, pos);
+}
+
+
static int hostapd_cli_cmd_sta(struct wpa_ctrl *ctrl, int argc, char *argv[])
{
char buf[64];
@@ -558,7 +609,8 @@ static void wpa_request(struct wpa_ctrl *ctrl, int argc, char *argv[])
}
-static void hostapd_cli_recv_pending(struct wpa_ctrl *ctrl, int in_read)
+static void hostapd_cli_recv_pending(struct wpa_ctrl *ctrl, int in_read,
+ int action_monitor)
{
int first = 1;
if (ctrl_conn == NULL)
@@ -568,10 +620,14 @@ static void hostapd_cli_recv_pending(struct wpa_ctrl *ctrl, int in_read)
size_t len = sizeof(buf) - 1;
if (wpa_ctrl_recv(ctrl, buf, &len) == 0) {
buf[len] = '\0';
- if (in_read && first)
- printf("\n");
- first = 0;
- printf("%s\n", buf);
+ if (action_monitor)
+ hostapd_cli_action_process(buf, len);
+ else {
+ if (in_read && first)
+ printf("\n");
+ first = 0;
+ printf("%s\n", buf);
+ }
} else {
printf("Could not read pending message.\n");
break;
@@ -589,7 +645,7 @@ static void hostapd_cli_interactive(void)
printf("\nInteractive mode\n\n");
do {
- hostapd_cli_recv_pending(ctrl_conn, 0);
+ hostapd_cli_recv_pending(ctrl_conn, 0, 0);
printf("> ");
alarm(ping_interval);
res = fgets(cmd, sizeof(cmd), stdin);
@@ -626,9 +682,19 @@ static void hostapd_cli_interactive(void)
}
-static void hostapd_cli_terminate(int sig)
+static void hostapd_cli_cleanup(void)
{
hostapd_cli_close_connection();
+ if (pid_file)
+ os_daemonize_terminate(pid_file);
+
+ os_program_deinit();
+}
+
+
+static void hostapd_cli_terminate(int sig)
+{
+ hostapd_cli_cleanup();
exit(0);
}
@@ -652,25 +718,69 @@ static void hostapd_cli_alarm(int sig)
}
}
if (ctrl_conn)
- hostapd_cli_recv_pending(ctrl_conn, 1);
+ hostapd_cli_recv_pending(ctrl_conn, 1, 0);
alarm(ping_interval);
}
+static void hostapd_cli_action(struct wpa_ctrl *ctrl)
+{
+ fd_set rfds;
+ int fd, res;
+ struct timeval tv;
+ char buf[256];
+ size_t len;
+
+ fd = wpa_ctrl_get_fd(ctrl);
+
+ while (!hostapd_cli_quit) {
+ FD_ZERO(&rfds);
+ FD_SET(fd, &rfds);
+ tv.tv_sec = ping_interval;
+ tv.tv_usec = 0;
+ res = select(fd + 1, &rfds, NULL, NULL, &tv);
+ if (res < 0 && errno != EINTR) {
+ perror("select");
+ break;
+ }
+
+ if (FD_ISSET(fd, &rfds))
+ hostapd_cli_recv_pending(ctrl, 0, 1);
+ else {
+ len = sizeof(buf) - 1;
+ if (wpa_ctrl_request(ctrl, "PING", 4, buf, &len,
+ hostapd_cli_action_process) < 0 ||
+ len < 4 || os_memcmp(buf, "PONG", 4) != 0) {
+ printf("hostapd did not reply to PING "
+ "command - exiting\n");
+ break;
+ }
+ }
+ }
+}
+
+
int main(int argc, char *argv[])
{
int interactive;
int warning_displayed = 0;
int c;
+ int daemonize = 0;
if (os_program_init())
return -1;
for (;;) {
- c = getopt(argc, argv, "hG:i:p:v");
+ c = getopt(argc, argv, "a:BhG:i:p:v");
if (c < 0)
break;
switch (c) {
+ case 'a':
+ action_file = optarg;
+ break;
+ case 'B':
+ daemonize = 1;
+ break;
case 'G':
ping_interval = atoi(optarg);
break;
@@ -693,7 +803,7 @@ int main(int argc, char *argv[])
}
}
- interactive = argc == optind;
+ interactive = (argc == optind) && (action_file == NULL);
if (interactive) {
printf("%s\n\n%s\n\n", hostapd_cli_version,
@@ -742,18 +852,27 @@ int main(int argc, char *argv[])
signal(SIGTERM, hostapd_cli_terminate);
signal(SIGALRM, hostapd_cli_alarm);
- if (interactive) {
+ if (interactive || action_file) {
if (wpa_ctrl_attach(ctrl_conn) == 0) {
hostapd_cli_attached = 1;
} else {
printf("Warning: Failed to attach to hostapd.\n");
+ if (action_file)
+ return -1;
}
+ }
+
+ if (daemonize && os_daemonize(pid_file))
+ return -1;
+
+ if (interactive)
hostapd_cli_interactive();
- } else
+ else if (action_file)
+ hostapd_cli_action(ctrl_conn);
+ else
wpa_request(ctrl_conn, argc - optind, &argv[optind]);
- free(ctrl_ifname);
- hostapd_cli_close_connection();
- os_program_deinit();
+ os_free(ctrl_ifname);
+ hostapd_cli_cleanup();
return 0;
}