summaryrefslogtreecommitdiff
path: root/src/dhcp/nm-dhcp-manager.h
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-07-31 15:41:02 +0200
committerThomas Haller <thaller@redhat.com>2019-08-13 09:42:15 +0200
commitb53e261427c925034ada6b90278b7e9077e2ea43 (patch)
tree46821e90eadd0d7d98a9e27804aff400b97f13df /src/dhcp/nm-dhcp-manager.h
parent8d8cc0da3d29b3a064a5cbd883365817a56f8e9d (diff)
downloadNetworkManager-b53e261427c925034ada6b90278b7e9077e2ea43.tar.gz
dhcp: make "systemd" DHCP plugin configurable
We have the "internal" DHCP plugin. That's our preferred plugin, and eventually we may drop all other plugins. Currently, the "internal" plugin is based on code from systemd-networkd and implemented in "src/dhcp/nm-dhcp-systemd.c". As this code is forked we eventually want to switch to nettools' n-dhcp4 library (for IPv4). For that reason we already have "src/dhcp/nm-dhcp-nettools.c". Note that "nettools" can be configured as a DHCP plugin, but this configuration is only experimental and for testing. There is never supposed to be a "nettools" plugin, but eventually the "internal" plugin will switch implementation. We don't want to replace systemd-based implementation right away. Not until we are sure that nettools works well. For that reason we keep them both in parallel for a while. This commit makes "systemd" DHCP plugin explicitly configurable in NetworkManager.conf. Like "nettools" this is an undocumented option, only for testing. If you choose "internal" (the default), you get one of the implementations (currently the "systemd" one). But by selecting "systemd" or "nettools" explicitly, you can select the exact plugin.
Diffstat (limited to 'src/dhcp/nm-dhcp-manager.h')
-rw-r--r--src/dhcp/nm-dhcp-manager.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dhcp/nm-dhcp-manager.h b/src/dhcp/nm-dhcp-manager.h
index ff0d6f5472..1e0a972b1f 100644
--- a/src/dhcp/nm-dhcp-manager.h
+++ b/src/dhcp/nm-dhcp-manager.h
@@ -86,7 +86,7 @@ NMDhcpClient * nm_dhcp_manager_start_ip6 (NMDhcpManager *manager,
/* For testing only */
extern const char* nm_dhcp_helper_path;
-extern const NMDhcpClientFactory *const _nm_dhcp_manager_factories[5];
+extern const NMDhcpClientFactory *const _nm_dhcp_manager_factories[6];
void nmtst_dhcp_manager_unget (gpointer singleton_instance);