system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-21 02:04:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dispatch dns-change dispatcher event

Browse source 
Introducing new dispatcher event -- `dns-change` which will be emitted when
DNS configuration changed(even in `dns=none` mode). This is to solve two
use cases:
 * Invoke dispatch script for DNS changes triggered by the global DNS
   API.

 * Do not invoke [OpenShift resolv-prepender][1] for non-DNS changes.

Bug reference: https://issues.redhat.com/browse/RHEL-1671

[1]: https://github.com/openshift/machine-config-operator/blob/master/templates/common/on-prem/files/resolv-prepender.yaml

Signed-off-by: Gris Ge <fge@redhat.com>
This commit is contained in:
Gris Ge 2023-09-26 17:14:58 +08:00
parent a847ba8075
commit a1db61ebc9
6 changed files with 69 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
man/NetworkManager-dispatcher.xml
View file

@ -68,8 +68,9 @@
device an operation just happened on, and second the action. For device actions,
the interface is the name of the kernel interface suitable for IP configuration.
Thus it is either VPN_IP_IFACE, DEVICE_IP_IFACE, or DEVICE_IFACE, as applicable.
For the <varname>hostname</varname> action the device name is always <literal>"none"</literal>
and for <varname>connectivity-change</varname> it is empty.
For the <varname>hostname</varname> action the device name is always <literal>"none"</literal>.
For <varname>connectivity-change</varname> it is empty.
For <varname>dns-change</varname> it is empty.
</para>
<para>The actions are:</para>
<variablelist class="dispatcher-options">
@ -170,6 +171,16 @@
The connection was reapplied on the device.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>dns-change</varname></term>
<listitem><para>
The DNS configuration has changed. This action is raised even if
NetworkManager is configured to not manage resolv.conf (for example,
via dns=none). In such case, the dispatch script can discover the
DNS configuration provided by currently active connections by
looking at file /run/NetworkManager/resolv.conf
</para></listitem>
</varlistentry>
</variablelist>
<para>
The environment contains more information about the interface and the connection.

51
src/core/nm-dispatcher.c
View file

@ -50,6 +50,8 @@
} \
G_STMT_END
static gboolean nm_dispatcher_need_device(NMDispatcherAction action);
/*****************************************************************************/
struct NMDispatcherCallId {
@ -469,7 +471,8 @@ static const char *action_table[] = {[NM_DISPATCHER_ACTION_HOSTNAME] = NMD_
[NM_DISPATCHER_ACTION_DHCP_CHANGE_6] = NMD_ACTION_DHCP6_CHANGE,
[NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] =
NMD_ACTION_CONNECTIVITY_CHANGE,
[NM_DISPATCHER_ACTION_REAPPLY] = NMD_ACTION_REAPPLY};
[NM_DISPATCHER_ACTION_REAPPLY] = NMD_ACTION_REAPPLY,
[NM_DISPATCHER_ACTION_DNS_CHANGE] = NMD_ACTION_DNS_CHANGE};
static const char *
action_to_string(NMDispatcherAction action)
@ -530,9 +533,7 @@ _dispatcher_call(NMDispatcherAction action,
if (G_UNLIKELY(!request_id))
request_id = ++gl.request_id_counter;
/* All actions except 'hostname' and 'connectivity-change' require a device */
if (action == NM_DISPATCHER_ACTION_HOSTNAME
|| action == NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE) {
if (!nm_dispatcher_need_device(action)) {
_LOG2D(request_id,
log_ifname,
log_con_uuid,
@ -592,9 +593,8 @@ _dispatcher_call(NMDispatcherAction action,
g_variant_builder_init(&vpn_ip4_props, G_VARIANT_TYPE_VARDICT);
g_variant_builder_init(&vpn_ip6_props, G_VARIANT_TYPE_VARDICT);
/* hostname and connectivity-change actions don't send device data */
if (action != NM_DISPATCHER_ACTION_HOSTNAME
&& action != NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE) {
/* hostname, DNS and connectivity-change actions don't send device data */
if (nm_dispatcher_need_device(action)) {
fill_device_props(device,
&device_props,
&device_proxy_props,
@ -925,6 +925,30 @@ nm_dispatcher_call_connectivity(NMConnectivityState connectivity_state,
out_call_id);
}
/**
* nm_dispatcher_call_dns_change():
*
* This method does not block the caller.
*
* Returns: %TRUE if the action was dispatched, %FALSE on failure
*/
gboolean
nm_dispatcher_call_dns_change(void)
{
return _dispatcher_call(NM_DISPATCHER_ACTION_DNS_CHANGE,
FALSE,
NULL,
NULL,
NULL,
FALSE,
NM_CONNECTIVITY_UNKNOWN,
NULL,
NULL,
NULL,
NULL,
NULL);
}
void
nm_dispatcher_call_cancel(NMDispatcherCallId *call_id)
{
@ -937,3 +961,16 @@ nm_dispatcher_call_cancel(NMDispatcherCallId *call_id)
_LOG3D(call_id, "cancelling dispatcher callback action");
call_id->callback = NULL;
}
/* All actions except 'hostname', 'connectivity-change' and 'dns-change' require
* a device */
static gboolean
nm_dispatcher_need_device(NMDispatcherAction action)
{
if (action == NM_DISPATCHER_ACTION_HOSTNAME
|| action == NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE
|| action == NM_DISPATCHER_ACTION_DNS_CHANGE) {
return FALSE;
}
return TRUE;
}

3
src/core/nm-dispatcher.h
View file

@ -23,6 +23,7 @@ typedef enum {
NM_DISPATCHER_ACTION_DHCP_CHANGE_6,
NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE,
NM_DISPATCHER_ACTION_REAPPLY,
NM_DISPATCHER_ACTION_DNS_CHANGE,
} NMDispatcherAction;
#define NM_DISPATCHER_ACTION_DHCP_CHANGE_X(IS_IPv4) \
@ -69,6 +70,8 @@ gboolean nm_dispatcher_call_connectivity(NMConnectivityState state,
gpointer user_data,
NMDispatcherCallId **out_call_id);
gboolean nm_dispatcher_call_dns_change(void);
void nm_dispatcher_call_cancel(NMDispatcherCallId *call_id);
#endif /* __NM_DISPATCHER_H__ */

2
src/core/nm-policy.c
View file

@ -2642,6 +2642,8 @@ dns_config_changed(NMDnsManager *dns_manager, gpointer user_data)
update_system_hostname(self, "DNS configuration changed");
}
nm_dispatcher_call_dns_change();
}
static void

1
src/libnm-core-aux-extern/nm-dispatcher-api.h
View file

@ -34,6 +34,7 @@
#define NMD_ACTION_DHCP6_CHANGE "dhcp6-change"
#define NMD_ACTION_CONNECTIVITY_CHANGE "connectivity-change"
#define NMD_ACTION_REAPPLY "reapply"
#define NMD_ACTION_DNS_CHANGE "dns-change"
typedef enum {
DISPATCH_RESULT_UNKNOWN = 0,

8
src/nm-dispatcher/nm-dispatcher-utils.c
View file

@ -453,8 +453,12 @@ nm_dispatcher_utils_construct_envp(const char *action,
items = g_ptr_array_new_with_free_func(g_free);
/* Hostname and connectivity changes don't require a device nor contain a connection */
if (NM_IN_STRSET(action, NMD_ACTION_HOSTNAME, NMD_ACTION_CONNECTIVITY_CHANGE))
/* Hostname, dns and connectivity changes don't require a device nor contain
* a connection */
if (NM_IN_STRSET(action,
NMD_ACTION_HOSTNAME,
NMD_ACTION_CONNECTIVITY_CHANGE,
NMD_ACTION_DNS_CHANGE))
goto done;
/* Connection properties */