X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fnet%2Flink-config.h;fp=src%2Fudev%2Fnet%2Flink-config.h;h=f5dee5a274e782a4e6a85ec54676793ae9ba5f3f;hp=d0a81f8bc26a71a0381d559eb49cb3e34d177578;hb=5fde13d748749f0e06e2e6cdd15f0980a79ea82c;hpb=916484f54d084e11a11458716b2e0bbdf4822d40

diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index d0a81f8bc..f5dee5a27 100644
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -21,31 +21,48 @@
 
 #pragma once
 
+#include "ethtool-util.h"
+
 #include "libudev.h"
 #include "util.h"
 #include "list.h"
 
-
 typedef struct link_config_ctx link_config_ctx;
 typedef struct link_config link_config;
 
+typedef enum MACPolicy {
+        MACPOLICY_PERSISTENT,
+        MACPOLICY_RANDOM,
+        _MACPOLICY_MAX,
+        _MACPOLICY_INVALID = -1
+} MACPolicy;
+
+typedef enum NamePolicy {
+        NAMEPOLICY_ONBOARD,
+        NAMEPOLICY_SLOT,
+        NAMEPOLICY_PATH,
+        NAMEPOLICY_MAC,
+        _NAMEPOLICY_MAX,
+        _NAMEPOLICY_INVALID = -1
+} NamePolicy;
+
 struct link_config {
         char *filename;
 
-        char *match_mac;
+        struct ether_addr *match_mac;
         char *match_path;
         char *match_driver;
         char *match_type;
 
         char *description;
-        char *mac;
-        char *mac_policy;
-        char **name_policy;
+        struct ether_addr *mac;
+        MACPolicy mac_policy;
+        NamePolicy *name_policy;
         char *name;
         unsigned int mtu;
         unsigned int speed;
-        char *duplex;
-        char *wol;
+        Duplex duplex;
+        WakeOnLan wol;
 
         LIST_FIELDS(link_config, links);
 };
@@ -59,5 +76,16 @@ bool link_config_should_reload(link_config_ctx *ctx);
 int link_config_get(link_config_ctx *ctx, struct udev_device *device, struct link_config **ret);
 int link_config_apply(link_config_ctx *ctx, struct link_config *config, struct udev_device *device);
 
+const char *name_policy_to_string(NamePolicy p) _const_;
+NamePolicy name_policy_from_string(const char *p) _pure_;
+
+const char *mac_policy_to_string(MACPolicy p) _const_;
+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);