Merge pull request #20226 from yuwata/network-introduce-source-and-status

network: introduce NetworkConfigSource and NetworkConfigState

diff --cc src/network/networkd-link.c
Simple merge

diff --cc src/network/networkd-link.h
index 9424a1083034271c73d59852a36d00c85228e6ac,fb7793f98dac64323b87e2f5e86b8b9fff764f00..d02c4fbd1e324a0e7a7a2de23a07cb07c81bba54
--- 1/src/network/networkd-link.h
--- 2/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@@ -156,23 -141,14 +142,14 @@@ typedef struct Link 
  
          sd_dhcp6_client *dhcp6_client;
          sd_dhcp6_lease *dhcp6_lease;
-         Set *dhcp6_addresses, *dhcp6_addresses_old;
-         Set *dhcp6_routes, *dhcp6_routes_old;
          Set *dhcp6_pd_prefixes;
-         Set *dhcp6_pd_addresses, *dhcp6_pd_addresses_old;
-         Set *dhcp6_pd_routes, *dhcp6_pd_routes_old;
-         unsigned dhcp6_address_messages;
-         unsigned dhcp6_route_messages;
-         unsigned dhcp6_pd_address_messages;
-         unsigned dhcp6_pd_route_messages;
-         bool dhcp6_address_configured:1;
-         bool dhcp6_route_configured:1;
-         bool dhcp6_pd_address_configured:1;
-         bool dhcp6_pd_route_configured:1;
-         bool dhcp6_pd_prefixes_assigned:1;
+         unsigned dhcp6_messages;
+         unsigned dhcp6_pd_messages;
+         bool dhcp6_configured:1;
+         bool dhcp6_pd_configured:1;
  
          /* This is about LLDP reception */
 -        sd_lldp *lldp;
 +        sd_lldp_rx *lldp_rx;
          char *lldp_file;
  
          /* This is about LLDP transmission */

diff --cc src/network/networkd-manager.c
Simple merge

diff --cc src/network/networkd-manager.h
Simple merge

diff --cc src/network/networkd-network.c
Simple merge

diff --cc src/network/test-network.c
Simple merge