From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 4 May 2019 06:05:11 +0000 (+0200)
Subject: network: make Link objects take references of Network objects
X-Git-Tag: v243-rc1~475^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9c908a60dab4c043be11e65962247ee2c7ac59a;p=thirdparty%2Fsystemd.git

network: make Link objects take references of Network objects
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 533193ac932..a224f2fe228 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -690,6 +690,8 @@ static Link *link_free(Link *link) {
 
         set_free_with_destructor(link->slaves, link_unref);
 
+        network_unref(link->network);
+
         return mfree(link);
 }
 
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 0ac9f7bea30..c0ef2c6edf0 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -358,7 +358,7 @@ int network_load_one(Manager *manager, const char *filename) {
                 /* To enable/disable RFC7844 Anonymity Profiles */
                 .dhcp_anonymize = false,
                 .dhcp_route_metric = DHCP_ROUTE_METRIC,
-                /* NOTE: this var might be overwrite by network_apply_anonymize_if_set */
+                /* NOTE: this var might be overwritten by network_apply_anonymize_if_set */
                 .dhcp_client_identifier = DHCP_CLIENT_ID_DUID,
                 .dhcp_route_table = RT_TABLE_MAIN,
                 .dhcp_route_table_set = false,
@@ -660,7 +660,7 @@ int network_apply(Network *network, Link *link) {
         assert(network);
         assert(link);
 
-        link->network = network;
+        link->network = network_ref(network);
 
         if (network->n_dns > 0 ||
             !strv_isempty(network->ntp) ||