Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 23:09:34 +01:00
Code Releases Activity

netdev: Implement interface filtering

Browse Source
This commit is contained in:
Denis Kenzior 2016-06-23 17:34:29 -05:00
parent 0eee94a264
commit e76daf224c
3 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -107,7 +107,7 @@ static void nl80211_appeared(void *user_data)
if (!wiphy_init(nl80211)) if (!wiphy_init(nl80211))
l_error("Unable to init wiphy functionality"); l_error("Unable to init wiphy functionality");
if (!netdev_init(nl80211)) if (!netdev_init(nl80211, interfaces, nointerfaces))
l_error("Unable to init netdev functionality"); l_error("Unable to init netdev functionality");
if (!scan_init(nl80211)) if (!scan_init(nl80211))

49
src/netdev.c
View File

@ -32,6 +32,7 @@
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <errno.h> #include <errno.h>
#include <fnmatch.h>
#include <ell/ell.h> #include <ell/ell.h>
@ -82,6 +83,8 @@ struct netdev_watch {
static struct l_netlink *rtnl = NULL; static struct l_netlink *rtnl = NULL;
static struct l_genl_family *nl80211; static struct l_genl_family *nl80211;
static struct l_queue *netdev_list; static struct l_queue *netdev_list;
static char **whitelist_filter;
static char **blacklist_filter;
static void do_debug(const char *str, void *user_data) static void do_debug(const char *str, void *user_data)
{ {
@ -1175,6 +1178,38 @@ static void netdev_getlink_cb(int error, uint16_t type, const void *data,
netdev_newlink_notify(ifi, bytes); netdev_newlink_notify(ifi, bytes);
} }
static bool netdev_is_managed(const char *ifname)
{
char *pattern;
unsigned int i;
if (!whitelist_filter)
goto check_blacklist;
for (i = 0; (pattern = whitelist_filter[i]); i++) {
if (fnmatch(pattern, ifname, 0) != 0)
continue;
goto check_blacklist;
}
l_debug("whitelist filtered ifname: %s", ifname);
return false;
check_blacklist:
if (!blacklist_filter)
return true;
for (i = 0; (pattern = blacklist_filter[i]); i++) {
if (fnmatch(pattern, ifname, 0) == 0) {
l_debug("blacklist filtered ifname: %s", ifname);
return false;
}
}
return true;
}
static void netdev_get_interface_callback(struct l_genl_msg *msg, static void netdev_get_interface_callback(struct l_genl_msg *msg,
void *user_data) void *user_data)
{ {
@ -1258,6 +1293,11 @@ static void netdev_get_interface_callback(struct l_genl_msg *msg,
return; return;
} }
if (!netdev_is_managed(ifname)) {
l_debug("interface %s filtered out", ifname);
return;
}
netdev = l_new(struct netdev, 1); netdev = l_new(struct netdev, 1);
netdev->index = *ifindex; netdev->index = *ifindex;
netdev->type = *iftype; netdev->type = *iftype;
@ -1410,7 +1450,8 @@ bool netdev_watch_remove(struct netdev *netdev, uint32_t id)
return true; return true;
} }
bool netdev_init(struct l_genl_family *in) bool netdev_init(struct l_genl_family *in,
const char *whitelist, const char *blacklist)
{ {
struct l_genl_msg *msg; struct l_genl_msg *msg;
@ -1457,6 +1498,12 @@ bool netdev_init(struct l_genl_family *in)
__eapol_set_deauthenticate_func(netdev_handshake_failed); __eapol_set_deauthenticate_func(netdev_handshake_failed);
__eapol_set_rekey_offload_func(netdev_set_rekey_offload); __eapol_set_rekey_offload_func(netdev_set_rekey_offload);
if (whitelist)
whitelist_filter = l_strsplit(whitelist, ',');
if (blacklist)
blacklist_filter = l_strsplit(blacklist, ',');
return true; return true;
} }

3
src/netdev.h
View File

@ -74,5 +74,6 @@ uint32_t netdev_watch_add(struct netdev *netdev, netdev_watch_func_t func,
void *user_data); void *user_data);
bool netdev_watch_remove(struct netdev *netdev, uint32_t id); bool netdev_watch_remove(struct netdev *netdev, uint32_t id);
bool netdev_init(struct l_genl_family *in); bool netdev_init(struct l_genl_family *in,
const char *whitelist, const char *blacklist);
bool netdev_exit(void); bool netdev_exit(void);