jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Convert to use struct dl_list

Browse source
This commit is contained in:
Jouni Malinen 2009-12-23 23:56:35 +02:00
parent 3e82a2ed62
commit 09e47a0768
1 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
wpa_supplicant/ctrl_iface_unix.c
View file

@ -1,6 +1,6 @@
/* /*
* WPA Supplicant / UNIX domain socket -based control interface * WPA Supplicant / UNIX domain socket -based control interface
* Copyright (c) 2004-2005, Jouni Malinen <j@w1.fi> * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 as
@ -18,10 +18,11 @@
#include <grp.h> #include <grp.h>
#include <stddef.h> #include <stddef.h>
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "config.h" #include "utils/list.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "config.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "ctrl_iface.h" #include "ctrl_iface.h"
@ -35,7 +36,7 @@
* ctrl_iface_unix.c and should not be touched directly from other files. * ctrl_iface_unix.c and should not be touched directly from other files.
*/ */
struct wpa_ctrl_dst { struct wpa_ctrl_dst {
struct wpa_ctrl_dst *next; struct dl_list list;
struct sockaddr_un addr; struct sockaddr_un addr;
socklen_t addrlen; socklen_t addrlen;
int debug_level; int debug_level;
@ -46,7 +47,7 @@ struct wpa_ctrl_dst {
struct ctrl_iface_priv { struct ctrl_iface_priv {
struct wpa_supplicant *wpa_s; struct wpa_supplicant *wpa_s;
int sock; int sock;
struct wpa_ctrl_dst *ctrl_dst; struct dl_list ctrl_dst;
}; };
@ -67,8 +68,7 @@ static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv,
os_memcpy(&dst->addr, from, sizeof(struct sockaddr_un)); os_memcpy(&dst->addr, from, sizeof(struct sockaddr_un));
dst->addrlen = fromlen; dst->addrlen = fromlen;
dst->debug_level = MSG_INFO; dst->debug_level = MSG_INFO;
dst->next = priv->ctrl_dst; dl_list_add(&priv->ctrl_dst, &dst->list);
priv->ctrl_dst = dst;
wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached", wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached",
(u8 *) from->sun_path, (u8 *) from->sun_path,
fromlen - offsetof(struct sockaddr_un, sun_path)); fromlen - offsetof(struct sockaddr_un, sun_path));
@ -80,18 +80,14 @@ static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv,
struct sockaddr_un *from, struct sockaddr_un *from,
socklen_t fromlen) socklen_t fromlen)
{ {
struct wpa_ctrl_dst *dst, *prev = NULL; struct wpa_ctrl_dst *dst;
dst = priv->ctrl_dst; dl_list_for_each(dst, &priv->ctrl_dst, struct wpa_ctrl_dst, list) {
while (dst) {
if (fromlen == dst->addrlen && if (fromlen == dst->addrlen &&
os_memcmp(from->sun_path, dst->addr.sun_path, os_memcmp(from->sun_path, dst->addr.sun_path,
fromlen - offsetof(struct sockaddr_un, sun_path)) fromlen - offsetof(struct sockaddr_un, sun_path))
== 0) { == 0) {
if (prev == NULL) dl_list_del(&dst->list);
priv->ctrl_dst = dst->next;
else
prev->next = dst->next;
os_free(dst); os_free(dst);
wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached", wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached",
(u8 *) from->sun_path, (u8 *) from->sun_path,
@ -99,8 +95,6 @@ static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv,
offsetof(struct sockaddr_un, sun_path)); offsetof(struct sockaddr_un, sun_path));
return 0; return 0;
} }
prev = dst;
dst = dst->next;
} }
return -1; return -1;
} }
@ -115,8 +109,7 @@ static int wpa_supplicant_ctrl_iface_level(struct ctrl_iface_priv *priv,
wpa_printf(MSG_DEBUG, "CTRL_IFACE LEVEL %s", level); wpa_printf(MSG_DEBUG, "CTRL_IFACE LEVEL %s", level);
dst = priv->ctrl_dst; dl_list_for_each(dst, &priv->ctrl_dst, struct wpa_ctrl_dst, list) {
while (dst) {
if (fromlen == dst->addrlen && if (fromlen == dst->addrlen &&
os_memcmp(from->sun_path, dst->addr.sun_path, os_memcmp(from->sun_path, dst->addr.sun_path,
fromlen - offsetof(struct sockaddr_un, sun_path)) fromlen - offsetof(struct sockaddr_un, sun_path))
@ -128,7 +121,6 @@ static int wpa_supplicant_ctrl_iface_level(struct ctrl_iface_priv *priv,
dst->debug_level = atoi(level); dst->debug_level = atoi(level);
return 0; return 0;
} }
dst = dst->next;
} }
return -1; return -1;
@ -274,6 +266,7 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)
priv = os_zalloc(sizeof(*priv)); priv = os_zalloc(sizeof(*priv));
if (priv == NULL) if (priv == NULL)
return NULL; return NULL;
dl_list_init(&priv->ctrl_dst);
priv->wpa_s = wpa_s; priv->wpa_s = wpa_s;
priv->sock = -1; priv->sock = -1;
@ -433,7 +426,7 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
char *fname; char *fname;
char *buf, *dir = NULL, *gid_str = NULL; char *buf, *dir = NULL, *gid_str = NULL;
eloop_unregister_read_sock(priv->sock); eloop_unregister_read_sock(priv->sock);
if (priv->ctrl_dst) { if (!dl_list_empty(&priv->ctrl_dst)) {
/* /*
* Wait a second before closing the control socket if * Wait a second before closing the control socket if
* there are any attached monitors in order to allow * there are any attached monitors in order to allow
@ -477,12 +470,9 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
} }
free_dst: free_dst:
dst = priv->ctrl_dst; dl_list_for_each_safe(dst, prev, &priv->ctrl_dst, struct wpa_ctrl_dst,
while (dst) { list)
prev = dst; os_free(dst);
dst = dst->next;
os_free(prev);
}
os_free(priv); os_free(priv);
} }
@ -506,8 +496,7 @@ static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
struct msghdr msg; struct msghdr msg;
struct iovec io[2]; struct iovec io[2];
dst = priv->ctrl_dst; if (priv->sock < 0 || dl_list_empty(&priv->ctrl_dst))
if (priv->sock < 0 || dst == NULL)
return; return;
res = os_snprintf(levelstr, sizeof(levelstr), "<%d>", level); res = os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);
@ -522,8 +511,8 @@ static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
msg.msg_iovlen = 2; msg.msg_iovlen = 2;
idx = 0; idx = 0;
while (dst) { dl_list_for_each_safe(dst, next, &priv->ctrl_dst, struct wpa_ctrl_dst,
next = dst->next; list) {
if (level >= dst->debug_level) { if (level >= dst->debug_level) {
wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send", wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send",
(u8 *) dst->addr.sun_path, dst->addrlen - (u8 *) dst->addr.sun_path, dst->addrlen -
@ -545,7 +534,6 @@ static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
dst->errors = 0; dst->errors = 0;
} }
idx++; idx++;
dst = next;
} }
} }