networkd: distinguish between static and dynamic addresses/routes

[elogind.git] / src / network / networkd-network.c

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index ae8d4d160d9259585f4c8f6b74a9079079048e7f..56e5637a6601cdabcb9c19ae57cef9e3a552199d 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -30,6 +30,9 @@ static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_fclose_ FILE *file = NULL;
         int r;
 
+        assert(manager);
+        assert(filename);
+
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
@@ -44,8 +47,8 @@ static int network_load_one(Manager *manager, const char *filename) {
 
         network->manager = manager;
 
-        LIST_HEAD_INIT(network->addresses);
-        LIST_HEAD_INIT(network->routes);
+        LIST_HEAD_INIT(network->static_addresses);
+        LIST_HEAD_INIT(network->static_routes);
 
         network->addresses_by_section = hashmap_new(uint64_hash_func, uint64_compare_func);
         if (!network->addresses_by_section)
@@ -117,10 +120,10 @@ void network_free(Network *network) {
 
         free(network->description);
 
-        while ((route = network->routes))
+        while ((route = network->static_routes))
                 route_free(route);
 
-        while ((address = network->addresses))
+        while ((address = network->static_addresses))
                 address_free(address);
 
         hashmap_free(network->addresses_by_section);