From 7b74c0acfba896a442818af2d9d925d3aa004e21 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Thu, 5 Sep 2013 14:52:18 -0700 Subject: [PATCH] Android: Clean entire socket directory Despite interface (and group) related sockets are not used for control, they are created and may be left. Signed-off-by: Dmitry Shmidt --- src/common/wpa_ctrl.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/common/wpa_ctrl.c b/src/common/wpa_ctrl.c index d9a750939..83788d7de 100644 --- a/src/common/wpa_ctrl.c +++ b/src/common/wpa_ctrl.c @@ -229,7 +229,6 @@ void wpa_ctrl_cleanup(void) struct dirent entry; struct dirent *result; size_t dirnamelen; - int prefixlen = os_strlen(CONFIG_CTRL_IFACE_CLIENT_PREFIX); size_t maxcopy; char pathname[PATH_MAX]; char *namep; @@ -246,11 +245,8 @@ void wpa_ctrl_cleanup(void) namep = pathname + dirnamelen; maxcopy = PATH_MAX - dirnamelen; while (readdir_r(dir, &entry, &result) == 0 && result != NULL) { - if (os_strncmp(entry.d_name, CONFIG_CTRL_IFACE_CLIENT_PREFIX, - prefixlen) == 0) { - if (os_strlcpy(namep, entry.d_name, maxcopy) < maxcopy) - unlink(pathname); - } + if (os_strlcpy(namep, entry.d_name, maxcopy) < maxcopy) + unlink(pathname); } closedir(dir); }