mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-09 00:40:19 +01:00
5077018ff4
n-dhcp4 only supports calling ACCEPT during the GRANTED state.
Not during a EXTENDED event. So usually, we would not want
to call accept in that case.
And we didn't. During EXTENDED event, we would usually skip ACD (because
it's either not enabled or we already passed ACD for the current address).
In that case, in _nm_dhcp_client_notify() we hit the line
if (client_event_type == NM_DHCP_CLIENT_EVENT_TYPE_BOUND && priv->l3cd_curr
&& nm_l3_config_data_get_num_addresses(priv->l3cd_curr, priv->config.addr_family) > 0)
priv->l3cfg_notify.wait_dhcp_commit = TRUE;
else
priv->l3cfg_notify.wait_dhcp_commit = FALSE;
and would not set `wait_dhpc_commit`. That means, we never called _dhcp_client_accept().
For nettools, that doesn't really matter because calling ACCEPT during EXTENDED
is invalid anyway. However, for dhclient that is fatal because we wouldn't reply the
D-Bus request from nm-dhcp-helper. The helper times out after 60 seconds and dhclient
would misbehave.
We need to fix that by also calling _dhcp_client_accept() in the case when we don't
need to wait (the EXTENDED case).
However, previously _dhcp_client_accept() was rather peculiar and didn't like to be
called in an unexpected state. Relax that. Now, when calling accept in an unexpected
state, just do nothing and signal success. That frees the caller from the complexity
to understand when they must/must not call accept.
https://bugzilla.redhat.com/show_bug.cgi?id=2109285
Fixes:
|
||
|---|---|---|
| .. | ||
| c-list | ||
| c-rbtree | ||
| c-siphash | ||
| c-stdaux | ||
| contrib | ||
| core | ||
| libnm-base | ||
| libnm-client-aux-extern | ||
| libnm-client-impl | ||
| libnm-client-public | ||
| libnm-client-test | ||
| libnm-core-aux-extern | ||
| libnm-core-aux-intern | ||
| libnm-core-impl | ||
| libnm-core-intern | ||
| libnm-core-public | ||
| libnm-crypto | ||
| libnm-glib-aux | ||
| libnm-log-core | ||
| libnm-log-null | ||
| libnm-platform | ||
| libnm-std-aux | ||
| libnm-systemd-core | ||
| libnm-systemd-shared | ||
| libnm-udev-aux | ||
| libnmc-base | ||
| libnmc-setting | ||
| libnmt-newt | ||
| linux-headers | ||
| n-acd | ||
| n-dhcp4 | ||
| nm-cloud-setup | ||
| nm-daemon-helper | ||
| nm-dispatcher | ||
| nm-initrd-generator | ||
| nm-online | ||
| nm-priv-helper | ||
| nmcli | ||
| nmtui | ||
| tests | ||
| meson.build | ||
| README.md | ||
src/
Most of the subdirectories are static helper libraries, which get linked into one of the final build artifacts (like libnm, nmcli or NetworkManager). Static libraries are internal API.
The only public API is libnm, which is a shared library provided client implementations.
Our own clients (like nmcli and nmtui) also use libnm, the shared library. But they also use additional static helper libraries.
The daemon statically links against a part of libnm, the part that provides connection profiles. That is libnm-core. libnm-core is thus statically linked with libnm and the daemon. It does not get linked by clients that already link with libnm (like nmtui).
Read the individual README.md files in the subdirectories for details:
| Directory | Description |
|---|---|
| core/ | the NetworkManager daemon |
| nmcli/ | nmcli application, a command line client for NetworkManager |
| nmtui/ | nmtui application, a text UI client for NetworkManager |
| nm-cloud-setup/ | service to automatically configure NetworkManager in cloud environment |
| nm-initrd-generator/ | generates NetworkManager configuration by parsing kernel command line options for dracut/initrd |
| nm-dispatcher/ | NetworkManager-dispatcher service to run user scripts |
| nm-online/ | application which checks whether NetworkManager is done, for implementing NetworkManager-wait-online.service |
| nm-priv-helper/ | internal service for privileged operations |
| nm-daemon-helper/ | internal helper binary spawned by NetworkManager |
| libnm-std-aux/ | internal helper library for standard C |
| libnm-glib-aux/ | internal helper library for glib |
| libnm-log-null/ | internal helper library with dummy (null) logging backend |
| libnm-log-core/ | internal helper library with logging backend (syslog) used by daemon |
| libnm-base/ | internal helper library with base definitions |
| libnm-platform/ | internal helper library for netlink and other platform/kernel API |
| libnm-udev-aux/ | internal helper library for libudev |
| libnm-core-public/ | public API of libnm (libnm-core part) |
| libnm-core-intern/ | internal API of libnm-core, used by libnm and daemon |
| libnm-core-impl/ | implementation of libnm-core |
| libnm-core-aux-intern/ | internal helper library on top of libnm-core (used by libnm-core itself) |
| libnm-core-aux-extern/ | internal helper library on top of libnm-core (not used by libnm-core) |
| libnm-client-public/ | public API of libnm (NMClient part) |
| libnm-client-impl/ | implementation of libnm (NMClient) |
| libnm-client-aux-extern/ | internal helper library on top of libnm (not used by libnm itself) |
| libnmc-base/ | internal helper library for libnm clients |
| libnmc-setting/ | internal helper library for setting connection profiles (used by nmcli) |
| libnmt-newt/ | internal helper library for libnewt for nmtui |
| linux-headers/ | extra Linux kernel UAPI headers |
| contrib/ | sources that are not used by NetworkManager itself |
| tests/ | unit tests that are not specific to one of the other directories |
| libnm-client-test/ | internal helper library with test utils for libnm |
| c-list/ | fork of c-util helper library for intrusive, doubly linked list |
| c-rbtree/ | fork of c-util helper library for intrusive Red-Black Tree |
| c-siphash/ | fork of c-util helper library for SIPHash24 |
| c-stdaux/ | fork of c-util general purpose helpers for standard C |
| n-acd/ | fork of nettools IPv4 ACD library |
| n-dhcp4/ | fork of nettools DHCPv4 library |
| libnm-systemd-core/ | fork of systemd code as network library |
| libnm-systemd-shared/ | fork of systemd code as general purpose library |