summaryrefslogtreecommitdiff
path: root/src/core/nm-iface-helper.c
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-08-06 15:17:05 +0200
committerThomas Haller <thaller@redhat.com>2021-09-30 09:56:19 +0200
commitd64b4a30d21fa98f6a7d11c28ac21a8f9d8ee299 (patch)
treeddb782113363dea1fa8e0a38e2570c269b98ff24 /src/core/nm-iface-helper.c
parentf20431bf89fd00c88659275f69419601cf98cb6b (diff)
downloadNetworkManager-next.tar.gz
core: rework IP configuration in NetworkManager using layer 3 configurationnext
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>
Diffstat (limited to 'src/core/nm-iface-helper.c')
-rw-r--r--src/core/nm-iface-helper.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c
index 83ae1b5466..7dd33d1a5b 100644
--- a/src/core/nm-iface-helper.c
+++ b/src/core/nm-iface-helper.c
@@ -89,6 +89,9 @@ static struct {
NULL, \
"iface-helper: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__) _NM_UTILS_MACRO_REST(__VA_ARGS__))
+//XXX
+#if 0
+
/*****************************************************************************/
static void
@@ -100,7 +103,8 @@ _dhcp_client_notify_cb(NMDhcpClient * client,
NMIP4Config * existing;
gs_unref_ptrarray GPtrArray *ip4_dev_route_blacklist = NULL;
gs_free_error GError *error = NULL;
- NMIP4Config * ip4_config;
+
+ /* FIXME(l3cfg): fix handling metric_any/table_any for routes. */
if (!notify_data || notify_data->notify_type != NM_DHCP_CLIENT_NOTIFY_TYPE_STATE_CHANGED)
g_return_if_reached();
@@ -508,10 +512,13 @@ ip6_address_changed(NMPlatform * platform,
data,
nm_g_slice_free_fcn(DadFailedHandleData));
}
+#endif
int
main(int argc, char *argv[])
{
+//XXX
+#if 0
char * bad_domains = NULL;
gs_free_error GError *error = NULL;
gboolean wrote_pidfile = FALSE;
@@ -662,8 +669,6 @@ main(int argc, char *argv[])
hwaddr,
bcast_hwaddr,
global_opt.uuid,
- RT_TABLE_MAIN,
- global_opt.priority_v4,
NM_DHCP_CLIENT_FLAGS_NONE,
!!global_opt.dhcp4_hostname,
global_opt.dhcp4_hostname,
@@ -761,6 +766,7 @@ main(int argc, char *argv[])
nm_clear_g_source(&sd_id);
nm_clear_pointer(&gl.main_loop, g_main_loop_unref);
+#endif
return 0;
}
@@ -853,5 +859,6 @@ nm_device_get_type(void)
GType
nm_active_connection_get_type(void)
{
+ (void) gl; //XXX
g_return_val_if_reached(0);
}