core: rework IP configuration in NetworkManager using layer 3 configuration

Completely rework IP configuration in the daemon. Use NML3Cfg as layer 3
manager for the IP configuration of an interface. Use NML3ConfigData as
pieces of configuration that the various components collect and
configure. NMDevice is managing most of the IP configuration at a higher
level, that is, it starts DHCP and other IP methods. Rework the state
handling there.

This is a huge rework of how NetworkManager daemon handles IP
configuration. Some fallout is to be expected.

It appears the patch deletes many lines of code. That is not accurate, because
you also have to count the files `src/core/nm-l3*`, which were unused previously.

Co-authored-by: Beniamino Galvani <bgalvani@redhat.com>

1 files changed, 3 insertions, 72 deletions

diff --git a/Makefile.am b/Makefile.am
index 23bee4f89c..98b1507c7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2074,9 +2074,6 @@ src_core_ldflags = $(CODE_COVERAGE_LDFLAGS)
 sbin_PROGRAMS += \
 	src/core/NetworkManager
 
-libexec_PROGRAMS += \
-	src/core/nm-iface-helper
-
 noinst_LTLIBRARIES += \
 	src/core/libNetworkManagerBase.la \
 	src/core/libNetworkManager.la \
@@ -2323,8 +2320,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
 	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c \
 	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c \
 	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c \
-	src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c \
-	src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c \
 	src/libnm-systemd-core/src/libsystemd-network/sd-lldp-rx.c \
 	src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h \
 	src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c \
@@ -2342,8 +2337,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
 	src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h \
 	src/libnm-systemd-core/src/systemd/sd-event.h \
 	src/libnm-systemd-core/src/systemd/sd-id128.h \
-	src/libnm-systemd-core/src/systemd/sd-ipv4acd.h \
-	src/libnm-systemd-core/src/systemd/sd-ipv4ll.h \
 	src/libnm-systemd-core/src/systemd/sd-lldp-rx.h \
 	src/libnm-systemd-core/src/systemd/sd-lldp.h \
 	src/libnm-systemd-core/src/systemd/sd-ndisc.h \
@@ -2394,10 +2387,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
 	src/core/nm-l3cfg.h \
 	src/core/nm-ip-config.c \
 	src/core/nm-ip-config.h \
-	src/core/nm-ip4-config.c \
-	src/core/nm-ip4-config.h \
-	src/core/nm-ip6-config.c \
-	src/core/nm-ip6-config.h \
 	\
 	src/core/dhcp/nm-dhcp-client.c \
 	src/core/dhcp/nm-dhcp-client.h \
@@ -2436,8 +2425,6 @@ src_core_libNetworkManager_la_SOURCES = \
 	src/core/nm-checkpoint-manager.c \
 	src/core/nm-checkpoint-manager.h \
 	\
-	src/core/devices/nm-acd-manager.c \
-	src/core/devices/nm-acd-manager.h \
 	src/core/devices/nm-lldp-listener.c \
 	src/core/devices/nm-lldp-listener.h \
 	src/core/devices/nm-device-utils.c \
@@ -2513,6 +2500,8 @@ src_core_libNetworkManager_la_SOURCES = \
 	src/core/dnsmasq/nm-dnsmasq-utils.c \
 	src/core/dnsmasq/nm-dnsmasq-utils.h \
 	\
+	src/core/ppp/nm-ppp-mgr.c \
+	src/core/ppp/nm-ppp-mgr.h \
 	src/core/ppp/nm-ppp-manager-call.c \
 	src/core/ppp/nm-ppp-manager-call.h \
 	src/core/ppp/nm-ppp-manager.h \
@@ -2586,8 +2575,6 @@ src_core_libNetworkManager_la_SOURCES = \
 	src/core/nm-firewall-utils.h \
 	src/core/nm-firewalld-manager.c \
 	src/core/nm-firewalld-manager.h \
-	src/core/nm-proxy-config.c \
-	src/core/nm-proxy-config.h \
 	src/core/nm-auth-manager.c \
 	src/core/nm-auth-manager.h \
 	src/core/nm-auth-utils.c \
@@ -2721,44 +2708,6 @@ $(src_core_NetworkManager_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
 ###############################################################################
 
-src_core_nm_iface_helper_CPPFLAGS = $(src_core_cppflags)
-
-src_core_nm_iface_helper_SOURCES = \
-	src/core/nm-iface-helper.c
-
-src_core_nm_iface_helper_LDADD = \
-	src/core/libNetworkManagerBase.la \
-	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
-	src/libnm-core-impl/libnm-core-impl.la \
-	$(libnm_crypto_lib) \
-	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	src/libnm-platform/libnm-platform.la \
-	src/libnm-base/libnm-base.la \
-	src/libnm-log-core/libnm-log-core.la \
-	src/libnm-udev-aux/libnm-udev-aux.la \
-	src/libnm-glib-aux/libnm-glib-aux.la \
-	src/libnm-std-aux/libnm-std-aux.la \
-	src/libnm-systemd-core/libnm-systemd-core.la \
-	src/libnm-systemd-shared/libnm-systemd-shared.la \
-	src/n-acd/libn-acd.la \
-	src/n-dhcp4/libn-dhcp4.la \
-	src/c-rbtree/libc-rbtree.la \
-	src/c-siphash/libc-siphash.la \
-	$(SYSTEMD_JOURNAL_LIBS) \
-	$(GLIB_LIBS) \
-	$(LIBUDEV_LIBS) \
-	$(LIBNDP_LIBS) \
-	$(DL_LIBS) \
-	$(NULL)
-
-src_core_nm_iface_helper_LDFLAGS = \
-	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
-	$(SANITIZER_EXEC_LDFLAGS)
-
-$(src_core_nm_iface_helper_OBJECTS): $(src_libnm_core_public_mkenums_h)
-
-###############################################################################
-
 noinst_LTLIBRARIES += src/nm-initrd-generator/libnmi-core.la
 
 src_nm_initrd_generator_libnmi_core_la_CPPFLAGS = \
@@ -4275,20 +4224,14 @@ src_core_devices_tests_ldflags = \
 
 check_programs += \
 	src/core/devices/tests/test-lldp \
-	src/core/devices/tests/test-acd
+	$(NULL)
 
 src_core_devices_tests_test_lldp_CPPFLAGS = $(src_core_cppflags_test)
 src_core_devices_tests_test_lldp_LDFLAGS = $(src_core_devices_tests_ldflags)
 src_core_devices_tests_test_lldp_LDADD = \
 	src/core/libNetworkManagerTest.la
 
-src_core_devices_tests_test_acd_CPPFLAGS = $(src_core_cppflags_test)
-src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags)
-src_core_devices_tests_test_acd_LDADD = \
-	src/core/libNetworkManagerTest.la
-
 $(src_core_devices_tests_test_lldp_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_devices_tests_test_acd_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
 EXTRA_DIST += \
 	src/core/devices/tests/meson.build
@@ -4391,22 +4334,12 @@ check_programs += \
 	src/core/tests/test-core \
 	src/core/tests/test-core-with-expect \
 	src/core/tests/test-dcb \
-	src/core/tests/test-ip4-config \
-	src/core/tests/test-ip6-config \
 	src/core/tests/test-l3cfg \
 	src/core/tests/test-systemd \
 	src/core/tests/test-utils \
 	src/core/tests/test-wired-defname \
 	$(NULL)
 
-src_core_tests_test_ip4_config_CPPFLAGS = $(src_core_cppflags_test)
-src_core_tests_test_ip4_config_LDFLAGS = $(src_core_tests_ldflags)
-src_core_tests_test_ip4_config_LDADD = $(src_core_tests_ldadd)
-
-src_core_tests_test_ip6_config_CPPFLAGS = $(src_core_cppflags_test)
-src_core_tests_test_ip6_config_LDFLAGS = $(src_core_tests_ldflags)
-src_core_tests_test_ip6_config_LDADD = $(src_core_tests_ldadd)
-
 src_core_tests_test_dcb_CPPFLAGS = $(src_core_cppflags_test)
 src_core_tests_test_dcb_LDFLAGS = $(src_core_tests_ldflags)
 src_core_tests_test_dcb_LDADD = $(src_core_tests_ldadd)
@@ -4434,8 +4367,6 @@ src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd)
 $(src_core_tests_test_core_OBJECTS): $(src_libnm_core_public_mkenums_h)
 $(src_core_tests_test_core_with_expect_OBJECTS): $(src_libnm_core_public_mkenums_h)
 $(src_core_tests_test_dcb_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_tests_test_ip4_config_OBJECTS): $(src_libnm_core_public_mkenums_h)
-$(src_core_tests_test_ip6_config_OBJECTS): $(src_libnm_core_public_mkenums_h)
 $(src_core_tests_test_l3cfg_OBJECTS): $(src_libnm_core_public_mkenums_h)
 $(src_core_tests_test_utils_OBJECTS): $(src_libnm_core_public_mkenums_h)
 $(src_core_tests_test_wired_defname_OBJECTS): $(src_libnm_core_public_mkenums_h)