X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.h;h=04a56ea8c8bb73d08fa921d18cb74a8f849836dd;hb=a9bc6d2df16c1d9f8a99d2cc9be2babf62bd173f;hp=498f2cdf09933b443a7d335fa9de27a68915d967;hpb=0617ffabe86a6d366252477eafbe59a888b149d4;p=elogind.git

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 498f2cdf0..04a56ea8c 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -54,11 +54,15 @@ struct Network {
         LIST_HEAD(Address, addresses);
         LIST_HEAD(Route, routes);
 
+        Hashmap *addresses_by_section;
+        Hashmap *routes_by_section;
+
         LIST_FIELDS(Network, networks);
 };
 
 struct Address {
         Network *network;
+        uint64_t section;
 
         unsigned char family;
         unsigned char prefixlen;
@@ -76,14 +80,21 @@ struct Address {
 
 struct Route {
         Network *network;
+        uint64_t section;
 
         unsigned char family;
+        unsigned char dst_prefixlen;
 
         union {
                 struct in_addr in;
                 struct in6_addr in6;
         } in_addr;
 
+        union {
+                struct in_addr in;
+                struct in6_addr in6;
+        } dst_addr;
+
         LIST_FIELDS(Route, routes);
 };
 
@@ -156,7 +167,7 @@ int network_apply(Manager *manager, Network *network, Link *link);
 const struct ConfigPerfItem* network_gperf_lookup(const char *key, unsigned length);
 
 /* Route */
-int route_new(Network *network, Route **ret);
+int route_new(Network *network, unsigned section, Route **ret);
 void route_free(Route *route);
 int route_configure(Route *route, Link *link, sd_rtnl_message_handler_t callback);
 
@@ -164,11 +175,15 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Route*, route_free);
 #define _cleanup_route_free_ _cleanup_(route_freep)
 
 int config_parse_gateway(const char *unit, const char *filename, unsigned line,
-                         const char *section, const char *lvalue, int ltype,
-                         const char *rvalue, void *data, void *userdata);
+                         const char *section, unsigned section_line, const char *lvalue,
+                         int ltype, const char *rvalue, void *data, void *userdata);
+
+int config_parse_destination(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(Network *network, Address **ret);
+int address_new(Network *network, unsigned section, Address **ret);
 void address_free(Address *address);
 int address_configure(Address *address, Link *link, sd_rtnl_message_handler_t callback);
 
@@ -176,8 +191,12 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Address*, address_free);
 #define _cleanup_address_free_ _cleanup_(address_freep)
 
 int config_parse_address(const char *unit, const char *filename, unsigned line,
-                         const char *section, const char *lvalue, int ltype,
-                         const char *rvalue, void *data, void *userdata);
+                         const char *section, unsigned section_line, const char *lvalue,
+                         int ltype, const char *rvalue, void *data, void *userdata);
+
+int config_parse_label(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);
 
 /* Link */