X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=bdb2f20e2fbce2314c389ff2d441fef0da68462a;hb=2bdbf32183fc6816cf34f4850e9fc5f070a34303;hp=4f3bcf36f9d2c6cd3c165b6d37dd2f9b77c2638b;hpb=d0d6a4cd70477970812bff0a37e70f66208d7c14;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 4f3bcf36f..bdb2f20e2 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -100,10 +100,10 @@ struct Network {
         char *name;
 
         struct ether_addr *match_mac;
-        char *match_path;
-        char *match_driver;
-        char *match_type;
-        char *match_name;
+        char **match_path;
+        char **match_driver;
+        char **match_type;
+        char **match_name;
 
         Condition *match_host;
         Condition *match_virt;
@@ -128,6 +128,7 @@ struct Network {
         unsigned dhcp_route_metric;
         AddressFamilyBoolean link_local;
         bool ipv4ll_route;
+        union in_addr_union ipv6_token;
 
         bool dhcp_server;
 
@@ -351,6 +352,10 @@ int config_parse_destination(const char *unit, const char *filename, unsigned li
 int config_parse_route_priority(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);
+
+int config_parse_route_scope(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);
 /* Address */
 int address_new_static(Network *network, unsigned section, Address **ret);
 int address_new_dynamic(Address **ret);
@@ -378,7 +383,7 @@ int config_parse_label(const char *unit, const char *filename, unsigned line,
                        int ltype, const char *rvalue, void *data, void *userdata);
 
 /* Forwarding database table. */
-int fdb_entry_configure(sd_rtnl *const rtnl, FdbEntry *const fdb_entry, const int ifindex);
+int fdb_entry_configure(Link *const link, FdbEntry *const fdb_entry);
 void fdb_entry_free(FdbEntry *fdb_entry);
 int fdb_entry_new_static(Network *const network, const unsigned section, FdbEntry **ret);
 
@@ -405,6 +410,11 @@ int config_parse_ipv4ll(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);
 
+/* IPv6 support */
+int config_parse_ipv6token(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);
+
 /* LLMNR support */
 
 const char* llmnr_support_to_string(LLMNRSupport i) _const_;