X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=fb0976491c31032b2aba0947a8e952ab5db4c4b0;hb=12e0f830f592ec4c6bb49ac7ae1e0e84f74105e3;hp=726cd836996fcc7c1072a6543f20fe4e9b65fa0d;hpb=672682a6b9d6fb6a3722c3fea1a93b4831747b54;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 726cd8369..fb0976491 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <arpa/inet.h>
-#include <linux/rtnetlink.h>
 
 #include "sd-event.h"
 #include "sd-rtnl.h"
@@ -33,6 +32,7 @@
 #include "rtnl-util.h"
 #include "hashmap.h"
 #include "list.h"
+#include "condition-util.h"
 
 typedef struct NetDev NetDev;
 typedef struct Network Network;
@@ -71,6 +71,11 @@ struct NetDev {
 
         char *filename;
 
+        Condition *match_host;
+        Condition *match_virt;
+        Condition *match_kernel;
+        Condition *match_arch;
+
         char *description;
         char *name;
         NetDevKind kind;
@@ -93,6 +98,10 @@ struct Network {
         char *match_driver;
         char *match_type;
         char *match_name;
+        Condition *match_host;
+        Condition *match_virt;
+        Condition *match_kernel;
+        Condition *match_arch;
 
         char *description;
         NetDev *bridge;
@@ -239,6 +248,9 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_;
 
 int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 
+/* gperf */
+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length);
+
 /* Network */
 
 int network_load(Manager *manager);
@@ -264,8 +276,7 @@ int config_parse_vlan(const char *unit, const char *filename, unsigned line,
                       int ltype, const char *rvalue, void *data, void *userdata);
 
 /* gperf */
-
-const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
 
 /* Route */
 int route_new_static(Network *network, unsigned section, Route **ret);
@@ -314,6 +325,7 @@ int config_parse_label(const char *unit, const char *filename, unsigned line,
 
 int link_new(Manager *manager, struct udev_device *device, Link **ret);
 void link_free(Link *link);
+int link_get(Manager *m, int ifindex, Link **ret);
 int link_add(Manager *manager, struct udev_device *device, Link **ret);
 int link_configure(Link *link);