net-config: start split out matching and parsing logic

Move this to src/share/net-util.c, so it can be used elsewhere.

Makefile.am

@@ -750,7 +750,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/ima-util.c \
 	src/shared/ima-util.h \
 	src/shared/ptyfwd.c \
-	src/shared/ptyfwd.h
+	src/shared/ptyfwd.h \
+	src/shared/net-util.c \
+	src/shared/net-util.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -2329,7 +2331,6 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-builtin-usb_id.c \
 	src/udev/net/link-config.h \
 	src/udev/net/link-config.c \
-	src/udev/net/link-config-parse.c \
 	src/udev/net/ethtool-util.h \
 	src/udev/net/ethtool-util.c
 

src/shared/net-util.c

@@ -22,29 +22,69 @@
 #include <netinet/ether.h>
 #include <net/if.h>
 
-#include "link-config.h"
-
+#include "net-util.h"
+#include "log.h"
 #include "utf8.h"
 #include "util.h"
 #include "conf-parser.h"
 
-static const char* const mac_policy_table[] = {
-        [MACPOLICY_PERSISTENT] = "persistent",
-        [MACPOLICY_RANDOM] = "random"
-};
+bool net_match_config(const struct ether_addr *match_mac,
+                      const char *match_path,
+                      const char *match_driver,
+                      const char *match_type,
+                      const char *match_name,
+                      struct udev_device *device) {
+        const char *property;
 
-DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);
-DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy");
+        assert(device);
 
-static const char* const name_policy_table[] = {
-        [NAMEPOLICY_ONBOARD] = "onboard",
-        [NAMEPOLICY_SLOT] = "slot",
-        [NAMEPOLICY_PATH] = "path",
-        [NAMEPOLICY_MAC] = "mac"
-};
+        if (match_mac) {
+                property = udev_device_get_sysattr_value(device, "address");
+                if (!property || memcmp(match_mac, ether_aton(property), ETH_ALEN)) {
+                        log_debug("Interface MAC address (%s) did not match MACAddress=%s",
+                                  property, ether_ntoa(match_mac));
+                        return 0;
+                }
+        }
 
-DEFINE_STRING_TABLE_LOOKUP(name_policy, NamePolicy);
-DEFINE_CONFIG_PARSE_ENUMV(config_parse_name_policy, name_policy, NamePolicy, _NAMEPOLICY_INVALID, "Failed to parse interface name policy");
+        if (match_path) {
+                property = udev_device_get_property_value(device, "ID_PATH");
+                if (!streq_ptr(match_path, property)) {
+                        log_debug("Interface persistent path (%s) did not match Path=%s",
+                                  property, match_path);
+                        return 0;
+                }
+        }
+
+        if (match_driver) {
+                property = udev_device_get_driver(device);
+                if (!streq_ptr(match_driver, property)) {
+                        log_debug("Interface device driver (%s) did not match Driver=%s",
+                                  property, match_driver);
+                        return 0;
+                }
+        }
+
+        if (match_type) {
+                property = udev_device_get_devtype(device);
+                if (!streq_ptr(match_type, property)) {
+                        log_debug("Interface type (%s) did not match Type=%s",
+                                  property, match_type);
+                        return 0;
+                }
+        }
+
+        if (match_name) {
+                property = udev_device_get_sysname(device);
+                if (!streq_ptr(match_name, property)) {
+                        log_debug("Interface name (%s) did not match Name=%s",
+                                  property, match_name);
+                        return 0;
+                }
+        }
+
+        return 1;
+}
 
 int config_parse_ifname(const char *unit,
                         const char *filename,

src/shared/net-util.h

@@ -0,0 +1,41 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+ This file is part of systemd.
+
+ Copyright (C) 2013 Tom Gundersen <teg@jklm.no>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#pragma once
+
+#include <netinet/ether.h>
+
+#include "udev.h"
+
+bool net_match_config(const struct ether_addr *match_mac,
+                      const char *match_path,
+                      const char *match_driver,
+                      const char *match_type,
+                      const char *match_name,
+                      struct udev_device *device);
+
+int config_parse_hwaddr(const char *unit, const char *filename, unsigned line,
+                        const char *section, const char *lvalue, int ltype,
+                        const char *rvalue, void *data, void *userdata);
+
+int config_parse_ifname(const char *unit, const char *filename, unsigned line,
+                        const char *section, const char *lvalue, int ltype,
+                        const char *rvalue, void *data, void *userdata);

src/udev/net/link-config-gperf.gperf

@@ -1,6 +1,7 @@
 %{
 #include <stddef.h>
 #include "conf-parser.h"
+#include "net-util.h"
 #include "link-config.h"
 #include "ethtool-util.h"
 %}

src/udev/net/link-config.c

@@ -38,6 +38,7 @@
 #include "fileio.h"
 #include "hashmap.h"
 #include "rtnl-util.h"
+#include "net-util.h"
 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);
@@ -213,7 +214,6 @@ int link_config_load(link_config_ctx *ctx) {
 
         link_configs_free(ctx);
 
-
         if (!enable_name_policy()) {
                 ctx->enable_name_policy = false;
                 log_info("Network interface NamePolicy= disabled on kernel commandline, ignoring.");
@@ -241,59 +241,23 @@ bool link_config_should_reload(link_config_ctx *ctx) {
         return paths_check_timestamp(ctx->link_dirs, &ctx->link_dirs_ts_usec, false);
 }
 
-static bool match_config(link_config *match, struct udev_device *device) {
-        const char *property;
-
-        if (match->match_mac) {
-                property = udev_device_get_sysattr_value(device, "address");
-                if (!property || memcmp(match->match_mac, ether_aton(property), ETH_ALEN)) {
-                        log_debug("Device MAC address (%s) did not match MACAddress=%s",
-                                  property, ether_ntoa(match->match_mac));
-                        return 0;
-                }
-        }
-
-        if (match->match_path) {
-                property = udev_device_get_property_value(device, "ID_PATH");
-                if (!streq_ptr(match->match_path, property)) {
-                        log_debug("Device's persistent path (%s) did not match Path=%s",
-                                  property, match->match_path);
-                        return 0;
-                }
-        }
-
-        if (match->match_driver) {
-                property = udev_device_get_driver(device);
-                if (!streq_ptr(match->match_driver, property)) {
-                        log_debug("Device driver (%s) did not match Driver=%s",
-                                  property, match->match_driver);
-                        return 0;
-                }
-        }
-
-        if (match->match_type) {
-                property = udev_device_get_devtype(device);
-                if (!streq_ptr(match->match_type, property)) {
-                        log_debug("Device type (%s) did not match Type=%s",
-                                  property, match->match_type);
-                        return 0;
-                }
-        }
-
-        return 1;
-}
-
 int link_config_get(link_config_ctx *ctx, struct udev_device *device, link_config **ret) {
         link_config *link;
 
         LIST_FOREACH(links, link, ctx->links) {
-                if (match_config(link, device)) {
-                        log_debug("Config file %s applies to device %s", link->filename, udev_device_get_sysname(device));
+                if (net_match_config(link->match_mac, link->match_path,
+                                     link->match_driver, link->match_type,
+                                     NULL, device)) {
+                        log_debug("Config file %s applies to device %s",
+                                  link->filename,
+                                  udev_device_get_sysname(device));
                         *ret = link;
                         return 0;
                 }
         }
 
+        *ret = NULL;
+
         return -ENOENT;
 }
 
@@ -479,3 +443,21 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, struct udev_dev
 
         return 0;
 }
+
+static const char* const mac_policy_table[] = {
+        [MACPOLICY_PERSISTENT] = "persistent",
+        [MACPOLICY_RANDOM] = "random"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(mac_policy, MACPolicy);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_mac_policy, mac_policy, MACPolicy, "Failed to parse MAC address policy");
+
+static const char* const name_policy_table[] = {
+        [NAMEPOLICY_ONBOARD] = "onboard",
+        [NAMEPOLICY_SLOT] = "slot",
+        [NAMEPOLICY_PATH] = "path",
+        [NAMEPOLICY_MAC] = "mac"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(name_policy, NamePolicy);
+DEFINE_CONFIG_PARSE_ENUMV(config_parse_name_policy, name_policy, NamePolicy, _NAMEPOLICY_INVALID, "Failed to parse interface name policy");

src/udev/net/link-config.h

@@ -85,7 +85,5 @@ MACPolicy mac_policy_from_string(const char *p) _pure_;
 /* gperf lookup function */
 const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
 
-int config_parse_hwaddr(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_ifname(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);