hostapd: Fix internal crypto build without TLS

[wpasupplicant] / wpa_supplicant / wpa_priv.c

diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c
index 231b962..4d4224c 100644 (file)
--- a/wpa_supplicant/wpa_priv.c
+++ b/wpa_supplicant/wpa_priv.c
@@ -1,6 +1,6 @@
 /*
  * WPA Supplicant / privileged helper program
- * Copyright (c) 2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2007-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
@@ -575,10 +575,21 @@ static void wpa_priv_cmd_set_mode(struct wpa_priv_interface *iface,
 }
 
 
+static void wpa_priv_cmd_set_country(struct wpa_priv_interface *iface,
+                                    char *buf)
+{
+       if (iface->drv_priv == NULL || iface->driver->set_country == NULL ||
+           *buf == '\0')
+               return;
+
+       iface->driver->set_country(iface->drv_priv, buf);
+}
+
+
 static void wpa_priv_receive(int sock, void *eloop_ctx, void *sock_ctx)
 {
        struct wpa_priv_interface *iface = eloop_ctx;
-       char buf[2000];
+       char buf[2000], *pos;
        void *cmd_buf;
        size_t cmd_len;
        int res, cmd;
@@ -649,6 +660,13 @@ static void wpa_priv_receive(int sock, void *eloop_ctx, void *sock_ctx)
        case PRIVSEP_CMD_SET_MODE:
                wpa_priv_cmd_set_mode(iface, cmd_buf, cmd_len);
                break;
+       case PRIVSEP_CMD_SET_COUNTRY:
+               pos = cmd_buf;
+               if (pos + cmd_len >= buf + sizeof(buf))
+                       break;
+               pos[cmd_len] = '\0';
+               wpa_priv_cmd_set_country(iface, pos);
+               break;
        }
 }
 
@@ -674,7 +692,7 @@ static void wpa_priv_interface_deinit(struct wpa_priv_interface *iface)
 }
 
 
-extern struct wpa_driver_ops *wpa_supplicant_drivers[];
+extern struct wpa_driver_ops *wpa_drivers[];
 
 static struct wpa_priv_interface *
 wpa_priv_interface_init(const char *dir, const char *params)
@@ -703,10 +721,10 @@ wpa_priv_interface_init(const char *dir, const char *params)
        os_memcpy(iface->driver_name, params, len);
        iface->driver_name[len] = '\0';
 
-       for (i = 0; wpa_supplicant_drivers[i]; i++) {
+       for (i = 0; wpa_drivers[i]; i++) {
                if (os_strcmp(iface->driver_name,
-                             wpa_supplicant_drivers[i]->name) == 0) {
-                       iface->driver = wpa_supplicant_drivers[i];
+                             wpa_drivers[i]->name) == 0) {
+                       iface->driver = wpa_drivers[i];
                        break;
                }
        }
@@ -1030,6 +1048,36 @@ void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
                perror("sendmsg(wpas_socket)");
 }
 
+
+#ifdef CONFIG_CLIENT_MLME
+void wpa_supplicant_sta_rx(void *ctx, const u8 *buf, size_t len,
+                          struct ieee80211_rx_status *rx_status)
+{
+       struct wpa_priv_interface *iface = ctx;
+       struct msghdr msg;
+       struct iovec io[3];
+       int event = PRIVSEP_EVENT_STA_RX;
+
+       wpa_printf(MSG_DEBUG, "STA RX from driver");
+       io[0].iov_base = &event;
+       io[0].iov_len = sizeof(event);
+       io[1].iov_base = (u8 *) rx_status;
+       io[1].iov_len = sizeof(*rx_status);
+       io[2].iov_base = (u8 *) buf;
+       io[2].iov_len = len;
+
+       os_memset(&msg, 0, sizeof(msg));
+       msg.msg_iov = io;
+       msg.msg_iovlen = 3;
+       msg.msg_name = &iface->drv_addr;
+       msg.msg_namelen = sizeof(iface->drv_addr);
+
+       if (sendmsg(iface->fd, &msg, 0) < 0)
+               perror("sendmsg(wpas_socket)");
+}
+#endif /* CONFIG_CLIENT_MLME */
+
+
 static void wpa_priv_terminate(int sig, void *eloop_ctx, void *signal_ctx)
 {
        wpa_printf(MSG_DEBUG, "wpa_priv termination requested");
@@ -1060,7 +1108,8 @@ static void wpa_priv_fd_workaround(void)
 static void usage(void)
 {
        printf("wpa_priv v" VERSION_STR "\n"
-              "Copyright (c) 2007, Jouni Malinen <j@w1.fi> and contributors\n"
+              "Copyright (c) 2007-2009, Jouni Malinen <j@w1.fi> and "
+              "contributors\n"
               "\n"
               "usage:\n"
               "  wpa_priv [-Bdd] [-P<pid file>] <driver:ifname> "