1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00

net-util: match - allow globbing

For now support globbing for interface name and path.
This commit is contained in:
Tom Gundersen 2014-02-20 22:55:42 +01:00
parent 95fe27d930
commit f28964e353

View File

@ -22,6 +22,7 @@
#include <netinet/ether.h>
#include <linux/if.h>
#include <arpa/inet.h>
#include <fnmatch.h>
#include "net-util.h"
#include "log.h"
@ -56,7 +57,7 @@ bool net_match_config(const struct ether_addr *match_mac,
if (match_mac && (!dev_mac || memcmp(match_mac, ether_aton(dev_mac), ETH_ALEN)))
return 0;
if (match_path && !streq_ptr(match_path, dev_path))
if (match_path && (!dev_path || fnmatch(match_path, dev_path, 0)))
return 0;
if (match_driver && !streq_ptr(match_driver, dev_driver))
@ -65,7 +66,7 @@ bool net_match_config(const struct ether_addr *match_mac,
if (match_type && !streq_ptr(match_type, dev_type))
return 0;
if (match_name && !streq_ptr(match_name, dev_name))
if (match_name && (!dev_path || fnmatch(match_name, dev_name, 0)))
return 0;
return 1;