15720680019

Committed 17 Jun 2025 07:58PM UTC coverage: 72.087% (-0.02%) from 72.109%

Build # 15720680019

Build Type

push

github

Committed by

web-flow

Commit Message

sd-lldp: several improvements (#37845)

This makes
- sd-lldp-tx not send machine ID as chassis ID, but use application
specific machine ID,
- sd-lldp-tx emit vlan ID if it is running on a vlan interface,
- Describe() DBus method also reply LLDP configurations,
- io.systemd.Network.GetLLDPNeighbors varlink method provides vlan ID,
if received.

Closes #37613.

Coverage Stats

59 of 76 new or added lines in 3 files covered. (77.63%)

4663 existing lines in 75 files now uncovered.

300494 of 416851 relevant lines covered (72.09%)

704683.58 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

64.15

/src/network/networkd.c

/* SPDX-License-Identifier: LGPL-2.1-or-later */

#include <sys/stat.h>

#include "sd-event.h"

#include "bus-log-control-api.h"
#include "bus-object.h"
#include "capability-util.h"
#include "daemon-util.h"
#include "main-func.h"
#include "mkdir-label.h"
#include "networkd-conf.h"
#include "networkd-manager.h"
#include "networkd-manager-bus.h"
#include "networkd-serialize.h"
#include "service-util.h"
#include "strv.h"
#include "user-util.h"

static int run(int argc, char *argv[]) {
        _cleanup_(manager_freep) Manager *m = NULL;
        _unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
        int r;

        log_setup();

        r = service_parse_argv("systemd-networkd.service",
                               "Manage and configure network devices, create virtual network devices",
                               BUS_IMPLEMENTATIONS(&manager_object, &log_control_object),
                               argc, argv);
        if (r <= 0)
                return r;

        umask(0022);

        if (argc != 1)
                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");

        /* Drop privileges, but only if we have been started as root. If we are not running as root we assume all
         * privileges are already dropped and we can't create our runtime directory. */
        if (geteuid() == 0) {
                const char *user = "systemd-network";
                uid_t uid;
                gid_t gid;

                r = get_user_creds(&user, &uid, &gid, NULL, NULL, 0);
                if (r < 0)
                        return log_error_errno(r, "Cannot resolve user name %s: %m", user);

                /* Create runtime directory. This is not necessary when networkd is
                 * started with "RuntimeDirectory=systemd/netif", or after
                 * systemd-tmpfiles-setup.service. */
                r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid, MKDIR_WARN_MODE);
                if (r < 0)
                        log_warning_errno(r, "Could not create runtime directory: %m");

                r = drop_privileges(uid, gid,
                                    (1ULL << CAP_NET_ADMIN) |
                                    (1ULL << CAP_NET_BIND_SERVICE) |
                                    (1ULL << CAP_NET_BROADCAST) |
                                    (1ULL << CAP_NET_RAW) |
                                    (1ULL << CAP_SYS_ADMIN) |
                                    (1ULL << CAP_BPF));
                if (r < 0)
                        return log_error_errno(r, "Failed to drop privileges: %m");
        }

        /* Always create the directories people can create inotify watches in. It is necessary to create the
         * following subdirectories after drop_privileges() to make them owned by systemd-network. */
        FOREACH_STRING(p,
                       "/run/systemd/netif/dhcp-server-lease/",
                       "/run/systemd/netif/leases/",
                       "/run/systemd/netif/links/") {
                r = mkdir_safe_label(p, 0755, UID_INVALID, GID_INVALID, MKDIR_WARN_MODE);
                if (r < 0)
                        log_warning_errno(r, "Could not create directory '%s': %m", p);
        }

        r = manager_new(&m, /* test_mode = */ false);
        if (r < 0)
                return log_error_errno(r, "Could not create manager: %m");

        r = manager_setup(m);
        if (r < 0)
                return log_error_errno(r, "Could not set up manager: %m");

        r = manager_parse_config_file(m);
        if (r < 0)
                log_warning_errno(r, "Failed to parse configuration file: %m");

        r = manager_load_config(m);
        if (r < 0)
                return log_error_errno(r, "Could not load configuration files: %m");

        r = manager_enumerate(m);
        if (r < 0)
                return r;

        r = manager_deserialize(m);
        if (r < 0)
                log_warning_errno(r, "Failed to deserialize the previous invocation, ignoring: %m");

        r = manager_start(m);
        if (r < 0)
                return log_error_errno(r, "Could not start manager: %m");

        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);

        r = sd_event_loop(m->event);
        if (r < 0)
                return log_error_errno(r, "Event loop failed: %m");

        return 0;
}

DEFINE_MAIN_FUNCTION(run);

1	/* SPDX-License-Identifier: LGPL-2.1-or-later */
2
3	#include <sys/stat.h>
4
5	#include "sd-event.h"
6
7	#include "bus-log-control-api.h"
8	#include "bus-object.h"
9	#include "capability-util.h"
10	#include "daemon-util.h"
11	#include "main-func.h"
12	#include "mkdir-label.h"
13	#include "networkd-conf.h"
14	#include "networkd-manager.h"
15	#include "networkd-manager-bus.h"
16	#include "networkd-serialize.h"
17	#include "service-util.h"
18	#include "strv.h"
19	#include "user-util.h"
20
21	static int run(int argc, char *argv[]) {	433✔
22	_cleanup_(manager_freep) Manager *m = NULL;	433✔
23	_unused_ _cleanup_(notify_on_cleanup) const char *notify_message = NULL;	433✔
24	int r;	433✔
25
26	log_setup();	433✔
27
28	r = service_parse_argv("systemd-networkd.service",	866✔
29	"Manage and configure network devices, create virtual network devices",
30	BUS_IMPLEMENTATIONS(&manager_object, &log_control_object),	433✔
31	argc, argv);
32	if (r <= 0)	433✔
33	return r;
34
35	umask(0022);	433✔
36
37	if (argc != 1)	433✔
38	return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");	×
39
40	/* Drop privileges, but only if we have been started as root. If we are not running as root we assume all
41	* privileges are already dropped and we can't create our runtime directory. */
42	if (geteuid() == 0) {	433✔
43	const char *user = "systemd-network";	×
44	uid_t uid;	×
45	gid_t gid;	×
46
47	r = get_user_creds(&user, &uid, &gid, NULL, NULL, 0);	×
48	if (r < 0)	×
49	return log_error_errno(r, "Cannot resolve user name %s: %m", user);	×
50
51	/* Create runtime directory. This is not necessary when networkd is
52	* started with "RuntimeDirectory=systemd/netif", or after
53	* systemd-tmpfiles-setup.service. */
54	r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid, MKDIR_WARN_MODE);	×
55	if (r < 0)	×
56	log_warning_errno(r, "Could not create runtime directory: %m");	×
57
58	r = drop_privileges(uid, gid,	×
59	(1ULL << CAP_NET_ADMIN) \|
60	(1ULL << CAP_NET_BIND_SERVICE) \|
61	(1ULL << CAP_NET_BROADCAST) \|
62	(1ULL << CAP_NET_RAW) \|
63	(1ULL << CAP_SYS_ADMIN) \|
64	(1ULL << CAP_BPF));
65	if (r < 0)	×
66	return log_error_errno(r, "Failed to drop privileges: %m");	×
67	}
68
69	/* Always create the directories people can create inotify watches in. It is necessary to create the
70	* following subdirectories after drop_privileges() to make them owned by systemd-network. */
71	FOREACH_STRING(p,	1,732✔
72	"/run/systemd/netif/dhcp-server-lease/",
73	"/run/systemd/netif/leases/",
74	"/run/systemd/netif/links/") {
75	r = mkdir_safe_label(p, 0755, UID_INVALID, GID_INVALID, MKDIR_WARN_MODE);	1,299✔
76	if (r < 0)	1,299✔
77	log_warning_errno(r, "Could not create directory '%s': %m", p);	1,299✔
78	}
79
80	r = manager_new(&m, /* test_mode = */ false);	433✔
81	if (r < 0)	433✔
UNCOV 82	return log_error_errno(r, "Could not create manager: %m");	×
83
84	r = manager_setup(m);	433✔
85	if (r < 0)	433✔
UNCOV 86	return log_error_errno(r, "Could not set up manager: %m");	×
87
88	r = manager_parse_config_file(m);	433✔
89	if (r < 0)	433✔
UNCOV 90	log_warning_errno(r, "Failed to parse configuration file: %m");	×
91
92	r = manager_load_config(m);	433✔
93	if (r < 0)	433✔
UNCOV 94	return log_error_errno(r, "Could not load configuration files: %m");	×
95
96	r = manager_enumerate(m);	433✔
97	if (r < 0)	433✔
98	return r;
99
100	r = manager_deserialize(m);	433✔
101	if (r < 0)	433✔
102	log_warning_errno(r, "Failed to deserialize the previous invocation, ignoring: %m");	1✔
103
104	r = manager_start(m);	433✔
105	if (r < 0)	433✔
UNCOV 106	return log_error_errno(r, "Could not start manager: %m");	×
107
108	notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);	433✔
109
110	r = sd_event_loop(m->event);	433✔
111	if (r < 0)	433✔
UNCOV 112	return log_error_errno(r, "Event loop failed: %m");	×
113
114	return 0;
115	}
116
117	DEFINE_MAIN_FUNCTION(run);	433✔

systemd / systemd / 15720680019

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous