summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* initrd: support the rd.net.dhcp.retry argumentbg/initrd-timeoutBeniamino Galvani2021-02-172-4/+14
| | | | | Since we always set autoconnect-retries=1, use the value of rd.net.dhcp.retry as a multiplier for the DHCP timeout.
* initrd: accept 'infinity' as argument to rd.net.timeout.dhcpBeniamino Galvani2021-02-172-2/+7
|
* initrd: set autoconnect-retries=1 and increase default DHCP timeoutBeniamino Galvani2021-02-172-1/+64
| | | | | | | | | | | | | | | | | By default a connection is retried 4 times before it is blocked from autoconnecting. This means that if a user specifies an explicit DHCP timeout in the initrd command line, NM will wait up to 4 times more. Instead, set the "connection.autoconnect-retries" property of connections always to 1, so that NM only waits for the time specified. Before this commit a default DHCP connection would take at most (45 x 4) seconds. Since the multiplier is now only 1, also increase the DHCP timeout to have a total time of (90 x 1) seconds, which is the half than before. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/559
* initrd: cleanup parsing DNS in reader_parse_ip()Thomas Haller2021-02-171-22/+15
|
* build: rename build option "--with-polkit-agent-helper-1{-path,}"Thomas Haller2021-02-163-5/+11
| | | | Suggested-by: Michael Biebl <biebl@debian.org>
* wireguard: merge branch 'th/wireguard-dns-endpoint-sticky-addr'Thomas Haller2021-02-162-18/+32
|\ | | | | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/754
| * wireguard: prefer last resolved IP from resolving endpoint from DNSThomas Haller2021-02-161-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We periodically re-resolve the DNS name for entpoints. Since WireGuard has no concept of being connected, we want to eventually pick up if the DNS name resolves to a different IP address. However, on resolution failure, we will never clear the endpoint we already have. Thus, resolving names can only give a better endpoint, not remove an IP address entirely. DNS names might do Round-Robin load distribution and the name of the endpoint might resolve to multiple IP addresses. Improve to stick to the IP address that we already have -- provided that the IP address is still among the new resolution result. Otherwise, we continue to pick the first IP address that was resolved.
| * platform: ensure NM_SOCK_ADDR_UNION_INIT_UNSPEC() fully initializes unionThomas Haller2021-02-161-2/+6
|/ | | | | | In C, initialization of a union does not define that excess memory is initialized. Ensure that, by initializing the largest member of the NMSockAddrUnion union.
* policy: update vendor-URL for NetworkManager in polkit policyThomas Haller2021-02-161-1/+1
| | | | | | | | | The previous URL http://www.gnome.org/projects/NetworkManager/ now redirects to https://wiki.gnome.org/Apps, which isn't very useful. Instead, link to our NetworkManager page. The page is still sparsely populated, but we should improve that.
* contrib/rpm: update URL for NetworkManager in RPM packageThomas Haller2021-02-161-1/+1
| | | | | | | | | The previous URL http://www.gnome.org/projects/NetworkManager/ now redirects to https://wiki.gnome.org/Apps, which isn't very useful. Instead, link to our NetworkManager page. The page is still sparsely populated, but we should improve that.
* platform: downgrade severity of message for failure to create NMPNetnsThomas Haller2021-02-151-1/+1
| | | | | | | | | | | | | | | | Under restricted permissions (like inside a podman container) opening "/proc/self/ns/net" fails with Permission denied. Consequently we cannot create our bottom NMPNetns instance. That is mostly fine, however we would log an error message with severity <error>. Note that test "src/core/platform/tests/test-platform-general" asserts that no <warn> and <error> messages get logged. Hence, the test will fail. That is undesirable. Downgrade the message to <debug> so that the test passes. Also, it's not clear that this error message is useful here. Being unable to open a netns fd is fine and not necessarily an error condition.
* platform: reorder code in _netns_stack_get_impl()Thomas Haller2021-02-151-8/+9
| | | | | | We should always register the GArray stack with pthread for cleanup the thread local storage. Do that first, before creating the NMPNetns instance at the bottom of the stack.
* platform/tests: skip tests if "unshare(CLONE_NEWNET|CLONE_NEWNS)" failsThomas Haller2021-02-151-1/+14
| | | | | | | | Inside a podman container (without `--priviledged`) we don't have permissions for "unshare(CLONE_NEWNET|CLONE_NEWNS)". It's not useful to fail tests in environments where they cannot run. Skip them.
* tests: add "/bin:/sbin" to "$PATH" for unit testsThomas Haller2021-02-151-0/+17
| | | | | | | | We call `tc` from iproute2, which commonly is at "/sbin/tc". That might not be in the "$PATH" of a regular user, and consequently we fail to run the test. Work around that by always adding "/bin" and "/sbin" to the $PATH.
* shared: refactor nm_assert() for NMRefStringThomas Haller2021-02-151-8/+16
| | | | | | - also check consistency of the string. - disable more expensive check unless running with NM_MORE_ASSERTS>10.
* libnm: add assertion in _dbus_handle_properties_changed()Thomas Haller2021-02-151-0/+1
|
* libnm: merge branch 'th/nmclient-fix'Thomas Haller2021-02-152-6/+18
|\ | | | | | | | | https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982613 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/662
| * libnm: fix tracking object state in NMClient cacheThomas Haller2021-02-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NMClient has a NMLDBusObject instance for each D-Bus object that it sees. This object can be in different states, like that we already saw it on D-Bus or that it is only referred to by another property. Due to a bug, we would wrongly not update the state and trigger an assertion. Reproduce with python-dbusmock (commit e89e28bf1bc0254a1eb71b71cf68ef7a97d11e5b) by running `pytest -v -s tests/test_networkmanager.py -k test_one_wifi_with_accesspoints`. With LIBNM_CLIENT_DEBUG we get: >>> libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: properties-changed: properties changed for interface org.freedesktop.NetworkManager.Device { {'ActiveConnection': <objectpath '/org/freedesktop/NetworkManager/ActiveConnection/0'>} } libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: properties-changed: set property org.freedesktop.NetworkManager.Device.ActiveConnection libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x01 linked libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x01 consumed >>> libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: set D-Bus object state watched-only libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x02 linked libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager]: changed-type 0x02 linked libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x02 consumed >>> libnm-dbus[96085]: <error> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: property ActiveConnection references /org/freedesktop/NetworkManager/ActiveConnection/0 but object is not present on D-Bus libnm-dbus[96085]: <trace> [6464.06459] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager]: changed-type 0x02 consumed libnm-dbus[96085]: <trace> [6464.06460] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: properties-changed: properties changed for interface org.freedesktop.NetworkManager.Device { {'State': <uint32 100>} } libnm-dbus[96085]: <trace> [6464.06460] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: properties-changed: set property org.freedesktop.NetworkManager.Device.State libnm-dbus[96085]: <trace> [6464.06460] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x01 linked libnm-dbus[96085]: <trace> [6464.06460] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x01 consumed libnm-dbus[96085]: <trace> [6464.06460] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x02 linked libnm-dbus[96085]: <trace> [6464.06460] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager]: changed-type 0x02 linked libnm-dbus[96085]: <trace> [6464.06461] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x02 consumed libnm-dbus[96085]: <trace> [6464.06461] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager]: changed-type 0x02 consumed libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: properties-changed: properties changed for interface org.freedesktop.NetworkManager.Device { {'StateReason': <(uint32 100, uint32 0)>} } libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: properties-changed: set property org.freedesktop.NetworkManager.Device.StateReason libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x01 linked libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x01 consumed libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x02 linked libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager]: changed-type 0x02 linked libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/Devices/mock_WiFi2]: changed-type 0x02 consumed libnm-dbus[96085]: <trace> [6464.06462] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager]: changed-type 0x02 consumed >>> libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: properties changed for interface org.freedesktop.NetworkManager.Connection.Active { {'Devices': <[objectpath '/org/freedesktop/NetworkManager/Devices/mock_WiFi2']>, 'Default6': <false>, 'Default': <true>, 'Type': <'802-11-wireless'>, 'Vpn': <false>, 'Connection': <objectpath '/org/freedesktop/NetworkManager/Settings/Mock_AP3'>, 'Master': <objectpath '/'>, 'SpecificObject': <objectpath '/org/freedesktop/NetworkManager/AccessPoint/Mock_AP3'>, 'Uuid': <'72757a57-8cb6-4052-a18f-4e2be4ba27d9'>, 'State': <uint32 2>, 'Id': <'AP_3'>} } >>> here we lack "set D-Bus object state on-dbus" libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Devices libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Default6 libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Default libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Type libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Vpn libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Connection libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Master libnm-dbus[96085]: <trace> [6464.06465] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.SpecificObject libnm-dbus[96085]: <trace> [6464.06466] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Uuid libnm-dbus[96085]: <trace> [6464.06466] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.State libnm-dbus[96085]: <trace> [6464.06466] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: interfaces-added: set property org.freedesktop.NetworkManager.Connection.Active.Id libnm-dbus[96085]: <trace> [6464.06466] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: changed-type 0x01 linked libnm-dbus[96085]: <trace> [6464.06466] nmclient[c9bf1eaa1f4b6c99]: [/org/freedesktop/NetworkManager/ActiveConnection/0]: changed-type 0x01 consumed Bail out! libnm:ERROR:libnm/nm-client.c:2863:_dbus_handle_obj_changed_dbus: assertion failed: (dbobj->obj_state >= NML_DBUS_OBJ_STATE_ON_DBUS) Backtrace: #3 0x00007f0bd11173bf in g_assertion_message_expr (domain=domain@entry=0x7f0bd1576018 "libnm", file=file@entry=0x7f0bd1576006 "libnm/nm-client.c", line=line@entry=2863, func=func@entry=0x7f0bd157f1b0 <__func__.170> "_dbus_handle_obj_changed_dbus", expr=expr@entry=0x7f0bd157cba0 "dbobj->obj_state >= NML_DBUS_OBJ_STATE_ON_DBUS") at ../glib/gtestutils.c:2963 #4 0x00007f0bd14959dd in _dbus_handle_obj_changed_dbus (self=self@entry=0x5612d4f5a130, log_context=<optimized out>) at libnm/nm-client.c:2863 #5 0x00007f0bd1495c29 in _dbus_handle_changes (self=self@entry=0x5612d4f5a130, log_context=<optimized out>, allow_init_start_check_complete=allow_init_start_check_complete@entry=1) at libnm/nm-client.c:2909 #6 0x00007f0bd1497e56 in _dbus_managed_objects_changed_cb (connection=<optimized out>, sender_name=<optimized out>, arg_object_path=<optimized out>, interface_name=<optimized out>, signal_name=<optimized out>, parameters=0x7f0bb800d720, user_data=0x5612d4f5a130) at libnm/nm-client.c:3172 #7 0x00007f0bd132a8df in emit_signal_instance_in_idle_cb (data=data@entry=0x7f0bb8003700) at ../gio/gdbusconnection.c:3789 #8 0x00007f0bd10f1b5b in g_idle_dispatch (source=source@entry=0x7f0bb8012260, callback=0x7f0bd132a860 <emit_signal_instance_in_idle_cb>, user_data=0x7f0bb8003700) at ../glib/gmain.c:5836 #9 0x00007f0bd10f2a9f in g_main_dispatch (context=0x5612d4f4b630) at ../glib/gmain.c:3325 #10 g_main_context_dispatch (context=0x5612d4f4b630) at ../glib/gmain.c:4043 #11 0x00007f0bd1144a98 in g_main_context_iterate.constprop.0 (context=0x5612d4f4b630, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at ../glib/gmain.c:4119 #12 0x00007f0bd10f2163 in g_main_loop_run (loop=0x5612d4f4b720) at ../glib/gmain.c:4317 #13 0x00005612d44b6543 in main (argc=7, argv=0x7fff4414f1d8) at clients/cli/nmcli.c:1036 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=982613 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/662 Fixes: ce0e898fb476 ('libnm: refactor caching of D-Bus objects in NMClient')
| * libnm: avoid assertion failure in _dbus_handle_properties_changed() for ↵Thomas Haller2021-02-151-2/+6
| | | | | | | | logging no properties
| * libnm: log PID in LIBNM_CLIENT_DEBUG debug loggingThomas Haller2021-02-151-2/+7
|/
* iwd: Fix the leaks in get_agent_request_network_pathAndrew Zaborowski2021-02-121-7/+5
| | | | | | | Don't request new copies of strings from g_variant_get() to avoid leaking memory as pointed out by Thomas Haller. Fixes: dc0e31fb7014 ('iwd: Add the wifi.iwd.autoconnect setting')
* contrib/rpm: revert building "--with test" for RHEL 9Thomas Haller2021-02-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "--with test" does two things: (1) it enables "-Werror" compiler option. We always enable all compiler warnings we care about, but this option makes all warnings fatal. Compiler warnings depend on compiler version and build options. It's hard to build without any compiler warnings, in particular for *future* compiler versions which we don't know yet. It is desirable that a SRPM from yesterday can also be build tomorrow. (2) it fails build if any unit tests fail. We always run all unit tests, but "--with test" makes it fatal. Again, we have many unit tests that interact with the system (that is, make system calls, like creating IP addresses or write files). It is surprisingly hard to get them pass 100% on all the systems we care. For example, on copr a test setup randomly fails during ifr.ifr_flags = IFF_TAP | IFF_NO_PI; nm_utils_ifname_cpy(ifr.ifr_name, TEST_IFNAME); r = ioctl(fd, TUNSETIFF, &ifr); It's not clear why, nor is it at all clear that there is a bug in NetworkManager. Making tests fatal basically means that a build on copr infrastructure fails with a probability from a few percent. Enough to be seriously annoying. Note that on copr we actually build "--with test", because we want to catch these issues. Likewise for our CI builds we explicitly specify "--with test". In general, we build with various build configurations (compiler warnings) and run unit tests on a source package many times. Starting on the developer machine (`make check`), gitlab-ci, copr builds, NetworkManager-ci. If you build an SRPM with such sources, a failure of the unit tests is much more likely a glitch than an actual issue. This is about changing the default if you build a Fedora/RHEL package. That is with the Fedora/RHEL packages that are build in koji/brew. Well, at least usually. In practice, we don't build frequently on non x64_86 archs, so what I said there is less true. But the package build is not there to replace CI/testing. The package build is there to get a (mostly) working binary. Note that RHEL packages anyway go through rpmdiff too, and rpmdiff parses the build log and complain if `make check` fails. This reverts commit e68e5c0a4c36ab6fe7cf4793f77ca741179690ce.
* Revert "service: don't give CAP_DAC_OVERRIDE capability to NetworkManager"Thomas Haller2021-02-121-1/+3
| | | | | | | | | | | | | | Well, that was short. Seems we need CAP_DAC_OVERRIDE at least for the OVS plugin. The OVS socket is srwxr-x---. 1 openvswitch openvswitch 0 Xxx xx xx:xx /run/openvswitch/db.sock and without CAP_DAC_OVERRIDE, NetworkManager cannot talk to OVS. We should fix that differently by adding a nm-sudo D-Bus service that can hand a file descriptor to NetworkManager. This reverts commit 2e334f54b27f91f40c3aa8bdba3254e2284d30bd.
* build: make path to polkit-agent-helper-1 binary configurableThomas Haller2021-02-126-19/+37
| | | | | | | | | | | | Add new configure option to set the path to "polkit-agent-helper-1". The path cannot be obtained from pkg-config and `pkg-config --variable=prefix polkit-agent-1` is not good enough. On Fedora, the path is "/usr/lib/polkit-1/polkit-agent-helper-1". On Debian Buster, the path is "/usr/lib/policykit-1/polkit-agent-helper-1" On Debian Sid, the path is "/usr/libexec/polkit-agent-helper-1" (but currently it is also symlinked from "/usr/lib/policykit-1/polkit-agent-helper-1".
* service: don't give CAP_DAC_OVERRIDE capability to NetworkManagerThomas Haller2021-02-121-1/+1
| | | | | | https://bugzilla.redhat.com/show_bug.cgi?id=1921826 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/742
* release: bump version to 1.31.0 (development)1.31.0-devThomas Haller2021-02-112-3/+3
|
* release: bump version to 1.29.90 (1.30-rc1)1.30-rc1Thomas Haller2021-02-112-2/+2
|
* iwd: Fix agent DBus method parameter typesAndrew Zaborowski2021-02-111-4/+4
| | | | | The object path DBus type wasn't being used correctly in the parameters signatures, fix them.
* settings: Fix REASON_CLEAR_DEFAULT_WIRED comment typosAndrew Zaborowski2021-02-111-2/+2
|
* lldp/tests: try workaround failure with ioctl(TUNSETIFF)Thomas Haller2021-02-111-1/+8
| | | | | | | | | On copr build, it seems possible that the ioctl fails with ERROR: src/core/devices/tests/test-lldp - Bail out! NetworkManager:ERROR:src/core/devices/tests/test-lldp.c:823:_test_recv_fixture_setup: assertion failed (errno == 0): (1 == 0) (1 is EPERM). Unclear why this happens. But as it only affects the test setup, retry a few times.
* dhcp: merge branch 'th/dhcp-nettools-lease-parse'Thomas Haller2021-02-1115-805/+1033
|\ | | | | | | https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/750
| * dhcp: downgrade logging messages for DHCP to <debug>Thomas Haller2021-02-111-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Granted, for debugging this information is useful. However, to actually debug an issue thoroughly, level=TRACE is anyway required. There is simply no way how we can log useful debug information and not flood logging messages for regular use. For example, logging the DHCP lease options can easily print 30 lines. And this, every time you get a lease update (e.g. every 30 minutes) and for every interface that does DHCP. It's simply too verbose. Downgrade the logging level. Yes, now our default <info> level is even less useful to understand what is going on. But the majority of time, users don't care so not spamming the log is more important. However, we still log the DHCP event (and the IP address) with <info> level.
| * dhcp: binary search in nm_dhcp_option_find()Thomas Haller2021-02-111-10/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's use binary search. Test patch: diff --git a/src/core/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c index 9b54e2cd0228..007993341672 100644 --- a/src/core/dhcp/tests/test-dhcp-utils.c +++ b/src/core/dhcp/tests/test-dhcp-utils.c @@ -788,6 +788,24 @@ NMTST_DEFINE(); int main(int argc, char **argv) { + int i; + guint idx; + guint c; + + idx = 0; + c = 0; + for (i = 0; i < 1000000; i++) { + const guint option = _nm_dhcp_option_dhcp4_options[idx % G_N_ELEMENTS(_nm_dhcp_option_dhcp4_options)].option_num; + + idx += 2010055757; + + if (nm_dhcp_option_find(AF_INET, option)->name) + c++; + } + g_print(">%u\n", c); + + return 0; + nmtst_init_assert_logging(&argc, &argv, "WARN", "DEFAULT"); g_test_add_func("/dhcp/generic-options", test_generic_options); Build: CFLAGS='-O2' ./autogen.sh --with-more-asserts=0 make -j 10 src/core/dhcp/tests/test-dhcp-utils && \ src/core/dhcp/tests/test-dhcp-utils && \ perf stat -r 200 -B src/core/dhcp/tests/test-dhcp-utils Before: Performance counter stats for 'src/core/dhcp/tests/test-dhcp-utils' (200 runs): 82.83 msec task-clock:u # 0.994 CPUs utilized ( +- 0.21% ) 0 context-switches:u # 0.000 K/sec 0 cpu-migrations:u # 0.000 K/sec 579 page-faults:u # 0.007 M/sec ( +- 0.03% ) 264,676,245 cycles:u # 3.195 GHz ( +- 0.06% ) 544,792,266 instructions:u # 2.06 insn per cycle ( +- 0.00% ) 151,624,848 branches:u # 1830.472 M/sec ( +- 0.00% ) 1,083,780 branch-misses:u # 0.71% of all branches ( +- 0.01% ) 0.083328 +- 0.000178 seconds time elapsed ( +- 0.21% ) After: Performance counter stats for 'src/core/dhcp/tests/test-dhcp-utils' (200 runs): 39.21 msec task-clock:u # 0.987 CPUs utilized ( +- 0.57% ) 0 context-switches:u # 0.000 K/sec 0 cpu-migrations:u # 0.000 K/sec 579 page-faults:u # 0.015 M/sec ( +- 0.03% ) 115,396,123 cycles:u # 2.943 GHz ( +- 0.23% ) 137,664,630 instructions:u # 1.19 insn per cycle ( +- 0.00% ) 25,866,025 branches:u # 659.597 M/sec ( +- 0.00% ) 1,919,616 branch-misses:u # 7.42% of all branches ( +- 0.12% ) 0.039717 +- 0.000227 seconds time elapsed ( +- 0.57% )
| * dhcp: rework DHCP options to not carry around option arrayThomas Haller2021-02-115-196/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would pass around the list of options. However, - that isn't too nice to read. Also, usually when we want to treat IP address families generically, then we have an addr_family argument. Having to first resolve the addr_family to another set of variables is inconvenient. - the option array itself doesn't have enough information. For example, we don't know how many elements there are, we don't know which address family it is (unless we compare it to one of the two well known lists). For example, I'd like to do a binary search for the option. But that's not immediately possible, because the length is unknown. - in practice, there are only two address families: AF_INET and AF_INET6. It is extremely unlikely that we will require a third DHCP options list, and even if we had that, the addr_family argument still abstracts them nicely. We also don't need two different lists for one DHCP type. While that would currently be possible (and afterwards not anymore), it would be wrong to do. - also add a new accessor nm_dhcp_option_find() to find the NMDhcpOption instance by option number.
| * dhcp/nettools: accept any number of trailing NULs in string optionsThomas Haller2021-02-112-8/+8
| | | | | | | | | | | | | | | | | | | | https://tools.ietf.org/html/rfc2132#section-2 says: Options containing NVT ASCII data SHOULD NOT include a trailing NULL; however, the receiver of such options MUST be prepared to delete trailing nulls if they exist. It speaks in plurals.
| * dhcp/nettools: use NMStrBuf in lease_save()Thomas Haller2021-02-111-9/+8
| |
| * dhcp/nettools: cleanup lease_parse_search_domains()Thomas Haller2021-02-111-20/+18
| |
| * dhcp/nettools: make data pointer constThomas Haller2021-02-112-80/+74
| |
| * dhcp/nettools: cleanup nm_dhcp_lease_data_parse_search_list()Thomas Haller2021-02-111-32/+32
| |
| * dhcp/nettools: move nm_dhcp_lease_data_parse_search_list() to nm-dhcp-utils.cThomas Haller2021-02-114-160/+173
| |
| * shared,dhcp: add _nm_utils_ip4_get_default_prefix0() helperThomas Haller2021-02-113-52/+23
| |
| * dhcp/nettools: cleanup lease_parse_routes()Thomas Haller2021-02-111-76/+83
| |
| * dhcp/nettools: refactor parsing of DHCP lease (ntps)Thomas Haller2021-02-111-28/+3
| |
| * dhcp/nettools: cleanup lease_parse_address_list()Thomas Haller2021-02-111-21/+39
| |
| * dhcp/nettools: cleanup lease_parse_address()Thomas Haller2021-02-112-41/+21
| |
| * dhcp/nettools: refactor parsing of DHCP lease (server-id)Thomas Haller2021-02-111-17/+8
| | | | | | | | No change in behavior.
| * dhcp/nettools: refactor parsing of DHCP lease (broadcast)Thomas Haller2021-02-113-17/+24
| | | | | | | | No change in behavior.
| * dhcp/nettools: validate domain-name option (15) differentlyThomas Haller2021-02-111-11/+15
| |
| * dhcp/nettools: refactor parsing of DHCP lease (domain-name)Thomas Haller2021-02-111-33/+32
| | | | | | | | No change in behavior.
| * dhcp/nettools: validate nis-domain option (40) differentlyThomas Haller2021-02-111-9/+5
| | | | | | | | | | | | | | | | | | | | | | Previously, we would check that all characters are ASCII. But we would also accept NUL characters (and truncate on the first NUL). Now: - reject any NUL characters inside the string (except trailing NUL). - accept all characters, and if necessary backslash-encode non UTF-8.
View Lorry Controller Status