Updated to hostap_2_6

[mech_eap.git] / libeap / wpa_supplicant / wpa_priv.c

diff --git a/libeap/wpa_supplicant/wpa_priv.c b/libeap/wpa_supplicant/wpa_priv.c
index 850ec40..511df4f 100644 (file)
--- a/libeap/wpa_supplicant/wpa_priv.c
+++ b/libeap/wpa_supplicant/wpa_priv.c
@@ -29,6 +29,8 @@ struct wpa_priv_interface {
        char *sock_name;
        int fd;
 
+       void *ctx;
+
        const struct wpa_driver_ops *driver;
        void *drv_priv;
        void *drv_global_priv;
@@ -40,6 +42,10 @@ struct wpa_priv_interface {
        struct sockaddr_un l2_addr;
 };
 
+struct wpa_priv_global {
+       struct wpa_priv_interface *interfaces;
+};
+
 
 static void wpa_priv_cmd_register(struct wpa_priv_interface *iface,
                                  struct sockaddr_un *from)
@@ -65,7 +71,8 @@ static void wpa_priv_cmd_register(struct wpa_priv_interface *iface,
 
        if (iface->driver->init2) {
                if (iface->driver->global_init) {
-                       iface->drv_global_priv = iface->driver->global_init();
+                       iface->drv_global_priv =
+                               iface->driver->global_init(iface->ctx);
                        if (!iface->drv_global_priv) {
                                wpa_printf(MSG_INFO,
                                           "Failed to initialize driver global context");
@@ -638,7 +645,7 @@ static void wpa_priv_interface_deinit(struct wpa_priv_interface *iface)
 
 
 static struct wpa_priv_interface *
-wpa_priv_interface_init(const char *dir, const char *params)
+wpa_priv_interface_init(void *ctx, const char *dir, const char *params)
 {
        struct wpa_priv_interface *iface;
        char *pos;
@@ -654,6 +661,7 @@ wpa_priv_interface_init(const char *dir, const char *params)
        if (iface == NULL)
                return NULL;
        iface->fd = -1;
+       iface->ctx = ctx;
 
        len = pos - params;
        iface->driver_name = dup_binstr(params, len);
@@ -1002,6 +1010,37 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
 }
 
 
+void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
+                                union wpa_event_data *data)
+{
+       struct wpa_priv_global *global = ctx;
+       struct wpa_priv_interface *iface;
+
+       if (event != EVENT_INTERFACE_STATUS)
+               return;
+
+       for (iface = global->interfaces; iface; iface = iface->next) {
+               if (os_strcmp(iface->ifname, data->interface_status.ifname) ==
+                   0)
+                       break;
+       }
+       if (iface && iface->driver->get_ifindex) {
+               unsigned int ifindex;
+
+               ifindex = iface->driver->get_ifindex(iface->drv_priv);
+               if (ifindex != data->interface_status.ifindex) {
+                       wpa_printf(MSG_DEBUG,
+                                  "%s: interface status ifindex %d mismatch (%d)",
+                                  iface->ifname, ifindex,
+                                  data->interface_status.ifindex);
+                       return;
+               }
+       }
+       if (iface)
+               wpa_supplicant_event(iface, event, data);
+}
+
+
 void wpa_supplicant_rx_eapol(void *ctx, const u8 *src_addr,
                             const u8 *buf, size_t len)
 {
@@ -1060,7 +1099,7 @@ static void wpa_priv_fd_workaround(void)
 static void usage(void)
 {
        printf("wpa_priv v" VERSION_STR "\n"
-              "Copyright (c) 2007-2009, Jouni Malinen <j@w1.fi> and "
+              "Copyright (c) 2007-2016, Jouni Malinen <j@w1.fi> and "
               "contributors\n"
               "\n"
               "usage:\n"
@@ -1077,13 +1116,17 @@ int main(int argc, char *argv[])
        char *pid_file = NULL;
        int daemonize = 0;
        char *ctrl_dir = "/var/run/wpa_priv";
-       struct wpa_priv_interface *interfaces = NULL, *iface;
+       struct wpa_priv_global global;
+       struct wpa_priv_interface *iface;
 
        if (os_program_init())
                return -1;
 
        wpa_priv_fd_workaround();
 
+       os_memset(&global, 0, sizeof(global));
+       global.interfaces = NULL;
+
        for (;;) {
                c = getopt(argc, argv, "Bc:dP:");
                if (c < 0)
@@ -1121,14 +1164,14 @@ int main(int argc, char *argv[])
 
        for (i = optind; i < argc; i++) {
                wpa_printf(MSG_DEBUG, "Adding driver:interface %s", argv[i]);
-               iface = wpa_priv_interface_init(ctrl_dir, argv[i]);
+               iface = wpa_priv_interface_init(&global, ctrl_dir, argv[i]);
                if (iface == NULL)
                        goto out;
-               iface->next = interfaces;
-               interfaces = iface;
+               iface->next = global.interfaces;
+               global.interfaces = iface;
        }
 
-       if (daemonize && os_daemonize(pid_file))
+       if (daemonize && os_daemonize(pid_file) && eloop_sock_requeue())
                goto out;
 
        eloop_register_signal_terminate(wpa_priv_terminate, NULL);
@@ -1137,7 +1180,7 @@ int main(int argc, char *argv[])
        ret = 0;
 
 out:
-       iface = interfaces;
+       iface = global.interfaces;
        while (iface) {
                struct wpa_priv_interface *prev = iface;
                iface = iface->next;