2012-02-08 17:56:52 +00:00
|
|
|
include $(GLIB_MAKEFILE)
|
2016-10-14 13:54:40 +00:00
|
|
|
-include $(INTROSPECTION_MAKEFILE)
|
2016-10-18 12:01:56 +00:00
|
|
|
include Makefile.vapigen
|
2012-02-08 17:56:52 +00:00
|
|
|
|
2016-10-13 11:39:30 +00:00
|
|
|
@GNOME_CODE_COVERAGE_RULES@
|
|
|
|
|
|
2016-10-14 13:24:28 +00:00
|
|
|
@NM_LOG_COMPILER@
|
|
|
|
|
|
2016-10-13 11:39:30 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-14 10:54:41 +00:00
|
|
|
AUTOMAKE_OPTIONS = subdir-objects
|
|
|
|
|
|
2016-10-14 10:13:50 +00:00
|
|
|
noinst_LTLIBRARIES =
|
2016-10-16 14:50:04 +00:00
|
|
|
check_LTLIBRARIES =
|
2016-10-14 13:24:28 +00:00
|
|
|
noinst_PROGRAMS =
|
2016-10-18 12:01:56 +00:00
|
|
|
noinst_LIBRARIES =
|
2016-10-16 14:50:04 +00:00
|
|
|
check_PROGRAMS =
|
2016-10-14 13:54:40 +00:00
|
|
|
noinst_DATA =
|
2016-10-15 16:25:13 +00:00
|
|
|
sbin_PROGRAMS =
|
2016-10-18 12:01:56 +00:00
|
|
|
bin_PROGRAMS =
|
2016-10-15 16:25:13 +00:00
|
|
|
libexec_PROGRAMS =
|
2018-05-21 15:06:09 +00:00
|
|
|
dist_libexec_SCRIPTS =
|
2016-10-14 13:54:40 +00:00
|
|
|
lib_LTLIBRARIES =
|
2018-03-18 19:38:49 +00:00
|
|
|
plugin_LTLIBRARIES =
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins =
|
2016-10-18 12:01:56 +00:00
|
|
|
service_DATA =
|
2016-10-18 13:53:05 +00:00
|
|
|
man_MANS =
|
2016-10-18 12:01:56 +00:00
|
|
|
examples_DATA =
|
2016-10-14 10:13:50 +00:00
|
|
|
CLEANFILES =
|
2016-10-14 13:54:40 +00:00
|
|
|
DISTCLEANFILES =
|
2016-10-14 10:13:50 +00:00
|
|
|
EXTRA_DIST =
|
2017-04-04 08:31:07 +00:00
|
|
|
EXTRA_LTLIBRARIES =
|
2016-10-17 13:50:56 +00:00
|
|
|
dist_hook =
|
2016-11-15 09:50:19 +00:00
|
|
|
dist_dependencies =
|
|
|
|
|
dist_configure_check =
|
2016-10-18 12:01:56 +00:00
|
|
|
install_data_hook =
|
2016-10-18 12:01:56 +00:00
|
|
|
install_exec_hook =
|
2016-10-18 12:01:56 +00:00
|
|
|
uninstall_hook =
|
2016-10-14 13:54:40 +00:00
|
|
|
TESTS =
|
2016-10-14 10:13:50 +00:00
|
|
|
BUILT_SOURCES =
|
2016-10-14 10:54:41 +00:00
|
|
|
GLIB_GENERATED =
|
2016-10-18 13:53:05 +00:00
|
|
|
man_pages =
|
|
|
|
|
man_pages_autogen =
|
2016-10-16 14:50:04 +00:00
|
|
|
check_programs =
|
2016-10-18 07:36:53 +00:00
|
|
|
check_programs_norun =
|
2016-10-16 14:50:04 +00:00
|
|
|
check_ltlibraries =
|
2016-10-14 13:54:40 +00:00
|
|
|
check_local =
|
2016-10-18 12:01:56 +00:00
|
|
|
VAPIGEN_VAPIS =
|
2016-10-15 20:28:34 +00:00
|
|
|
dbusservice_DATA =
|
2016-10-18 12:01:56 +00:00
|
|
|
dbusactivation_DATA =
|
2019-11-21 14:27:21 +00:00
|
|
|
systemdsystemunit_DATA =
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
INTROSPECTION_GIRS =
|
|
|
|
|
INTROSPECTION_SCANNER_ARGS =
|
|
|
|
|
INTROSPECTION_COMPILER_ARGS =
|
|
|
|
|
# Pass SANITIZER_ENV where a command that uses built libraries is
|
|
|
|
|
# executed, to suppress possible errors
|
2018-02-07 10:10:31 +00:00
|
|
|
INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) LDFLAGS="$(SANITIZER_LIB_LDFLAGS)"
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
libnmincludedir = $(includedir)/libnm
|
|
|
|
|
libnminclude_HEADERS =
|
2016-11-15 13:35:48 +00:00
|
|
|
nodist_libnminclude_HEADERS =
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
|
pkgconfig_DATA =
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-10-15 20:13:28 +00:00
|
|
|
pppd_plugindir = $(PPPD_PLUGIN_DIR)
|
|
|
|
|
pppd_plugin_LTLIBRARIES =
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
vapidir = $(datadir)/vala/vapi
|
|
|
|
|
vapi_DATA =
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
examplesdir = $(docdir)/examples
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
rundir=$(runstatedir)/NetworkManager
|
|
|
|
|
statedir=$(localstatedir)/lib/NetworkManager
|
|
|
|
|
|
2018-03-18 19:38:49 +00:00
|
|
|
plugindir=$(pkglibdir)/$(NM_DIST_VERSION)
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
dbusactivationdir = $(datadir)/dbus-1/system-services
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
servicedir = $(datadir)/dbus-1/system-services
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
completiondir = $(datadir)/bash-completion/completions
|
|
|
|
|
|
2018-05-30 08:51:23 +00:00
|
|
|
nmlocaledir = $(datadir)/locale
|
|
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
|
|
|
|
|
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
|
|
|
|
|
|
2010-02-18 18:17:08 +00:00
|
|
|
SUBDIRS = \
|
2013-04-26 20:42:54 +00:00
|
|
|
. \
|
2016-11-16 11:00:11 +00:00
|
|
|
po
|
|
|
|
|
|
build: combine handling of setting docs and man pages
Building the man pages via xsltproc requires "docbook.xsl"
which is part of docbook.
Previously, we would build the man pages solely based on
"--enable-introspection", which checks for the presence of
xsltproc, but not docbook. This can lead to build failure
when docbook is not available, but "--enable-introspection"
is given.
Instead of adding yet another configure option to fine-tune
and say "--with-docbook --disable-gtk-doc", just simplify it.
Now, documentation (both man pages and setting docs) will be generated
with "--enable-gtk-doc" and "--enable-introspection".
If the documentation is not about to be generated, pre-generated docs
will be installed if they are available. That is commonly the case
with a source tarball, but not with a git checkout.
Finally, if documentation is nither generated nor pre-generated,
no documentation will be installed *duh*.
This removes the possibility to treat man pages separate from settings
docs. Now you either generate both, install both pre-generated, or don't
get any of them.
https://bugzilla.gnome.org/show_bug.cgi?id=778551
2017-02-13 15:26:20 +00:00
|
|
|
if HAVE_DOCS
|
2016-11-16 11:00:11 +00:00
|
|
|
|
|
|
|
|
SUBDIRS += \
|
2016-10-18 13:53:05 +00:00
|
|
|
docs/libnm \
|
|
|
|
|
docs/api
|
|
|
|
|
|
2016-11-16 11:00:11 +00:00
|
|
|
endif
|
|
|
|
|
|
2018-12-28 15:16:30 +00:00
|
|
|
dflt_cppflags = -std=gnu11
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
|
2016-10-13 11:39:30 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2019-06-17 11:41:05 +00:00
|
|
|
include config-extra.h.mk
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
|
|
|
|
|
DISTCLEANFILES += config-extra.h
|
|
|
|
|
|
2019-07-08 12:58:05 +00:00
|
|
|
$(libnm_core_lib_h_pub_mkenums): config-extra.h
|
|
|
|
|
libnm-core/.dirstamp: config-extra.h
|
|
|
|
|
shared/.dirstamp: config-extra.h
|
|
|
|
|
shared/nm-glib-aux/.dirstamp: config-extra.h
|
|
|
|
|
shared/nm-std-aux/.dirstamp: config-extra.h
|
|
|
|
|
shared/nm-udev-aux/.dirstamp: config-extra.h
|
|
|
|
|
shared/systemd/.dirstamp: config-extra.h
|
|
|
|
|
shared/systemd/src/basic/.dirstamp: config-extra.h
|
|
|
|
|
shared/systemd/src/shared/.dirstamp: config-extra.h
|
|
|
|
|
src/dhcp/.dirstamp: config-extra.h
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
2018-05-30 08:21:04 +00:00
|
|
|
|
2016-10-20 12:35:18 +00:00
|
|
|
set_sanitizer_env = \
|
|
|
|
|
[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
|
2018-02-07 10:10:31 +00:00
|
|
|
if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \
|
|
|
|
|
[ -n "$(1)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
|
|
|
|
|
[ -n "$(2)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(2) | grep libasan\.so\.. -o | head -n 1)"; \
|
2016-10-20 12:35:18 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
check_so_symbols = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \
|
2016-11-22 17:25:03 +00:00
|
|
|
LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null
|
2016-10-20 12:35:18 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-13 11:39:30 +00:00
|
|
|
DISTCHECK_CONFIGURE_FLAGS = \
|
|
|
|
|
--enable-tests=yes \
|
|
|
|
|
--with-valgrind=no \
|
|
|
|
|
--enable-gtk-doc \
|
|
|
|
|
--enable-more-warnings=error \
|
|
|
|
|
--with-udev-dir=$$dc_install_base/lib/udev \
|
|
|
|
|
--with-wext=no \
|
|
|
|
|
--enable-ifcfg-rh \
|
|
|
|
|
--enable-ifupdown \
|
2018-10-24 19:43:07 +00:00
|
|
|
--disable-dependency-tracking \
|
|
|
|
|
$(NULL)
|
2016-10-13 11:39:30 +00:00
|
|
|
|
2016-11-15 09:50:19 +00:00
|
|
|
dist-configure-check:
|
2019-03-05 07:44:57 +00:00
|
|
|
@echo "*** 'make dist' requires '--enable-gtk-doc --enable-introspection'. ***"
|
2016-10-13 11:39:30 +00:00
|
|
|
@false
|
build: combine handling of setting docs and man pages
Building the man pages via xsltproc requires "docbook.xsl"
which is part of docbook.
Previously, we would build the man pages solely based on
"--enable-introspection", which checks for the presence of
xsltproc, but not docbook. This can lead to build failure
when docbook is not available, but "--enable-introspection"
is given.
Instead of adding yet another configure option to fine-tune
and say "--with-docbook --disable-gtk-doc", just simplify it.
Now, documentation (both man pages and setting docs) will be generated
with "--enable-gtk-doc" and "--enable-introspection".
If the documentation is not about to be generated, pre-generated docs
will be installed if they are available. That is commonly the case
with a source tarball, but not with a git checkout.
Finally, if documentation is nither generated nor pre-generated,
no documentation will be installed *duh*.
This removes the possibility to treat man pages separate from settings
docs. Now you either generate both, install both pre-generated, or don't
get any of them.
https://bugzilla.gnome.org/show_bug.cgi?id=778551
2017-02-13 15:26:20 +00:00
|
|
|
if !BUILD_DOCS
|
2016-11-15 09:50:19 +00:00
|
|
|
dist_configure_check += dist-configure-check
|
|
|
|
|
endif
|
2016-10-13 11:39:30 +00:00
|
|
|
|
2016-11-15 09:50:19 +00:00
|
|
|
dist: $(dist_configure_check) $(dist_dependencies)
|
2016-10-13 11:39:30 +00:00
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
DISTCLEANFILES += intltool-extract intltool-merge intltool-update
|
2016-10-13 11:39:30 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-11-22 14:39:25 +00:00
|
|
|
install-data-hook-dirs:
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/conf.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/system-connections
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dnsmasq.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dnsmasq-shared.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/system-connections
|
|
|
|
|
$(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir)
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir)
|
|
|
|
|
|
|
|
|
|
install_data_hook += install-data-hook-dirs
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-11-21 14:27:21 +00:00
|
|
|
data_edit = sed \
|
|
|
|
|
-e 's|@NM_VERSION[@]|$(NM_VERSION)|g' \
|
|
|
|
|
-e 's|@bindir[@]|$(bindir)|g' \
|
|
|
|
|
-e 's|@sbindir[@]|$(sbindir)|g' \
|
|
|
|
|
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
|
|
|
|
|
-e 's|@nmrundir[@]|$(nmrundir)|g' \
|
|
|
|
|
-e 's|@nmstatedir[@]|$(nmstatedir)|g' \
|
|
|
|
|
-e 's|@localstatedir[@]|$(localstatedir)|g' \
|
|
|
|
|
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
|
|
|
|
-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \
|
|
|
|
|
-e 's|@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT[@]|$(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT)|g' \
|
|
|
|
|
-e 's|@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)|g' \
|
|
|
|
|
-e 's|@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \
|
|
|
|
|
-e 's|@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER[@]|$(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER)|g' \
|
|
|
|
|
-e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g'
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-13 11:46:28 +00:00
|
|
|
polkit_policydir = $(datadir)/polkit-1/actions
|
|
|
|
|
|
|
|
|
|
dist_polkit_policy_in_in_files = \
|
2016-11-03 12:25:36 +00:00
|
|
|
data/org.freedesktop.NetworkManager.policy.in.in
|
2016-10-13 11:46:28 +00:00
|
|
|
|
|
|
|
|
polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy)
|
|
|
|
|
|
|
|
|
|
@INTLTOOL_POLICY_RULE@
|
|
|
|
|
|
|
|
|
|
DISTCLEANFILES += $(polkit_policy_DATA)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-04-14 10:00:29 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
shared/c-stdaux/src/c-stdaux.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2018-11-03 08:09:33 +00:00
|
|
|
noinst_LTLIBRARIES += shared/libcsiphash.la
|
|
|
|
|
|
2019-04-14 10:00:29 +00:00
|
|
|
shared_libcsiphash_la_CFLAGS = \
|
|
|
|
|
$(AM_CFLAGS) \
|
|
|
|
|
-std=c11 \
|
|
|
|
|
-I$(srcdir)/shared/c-stdaux/src \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-11-03 08:09:33 +00:00
|
|
|
shared_libcsiphash_la_CPPFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-08 15:38:44 +00:00
|
|
|
shared_libcsiphash_la_LDFLAGS = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2019-04-08 15:38:44 +00:00
|
|
|
|
2018-11-03 08:09:33 +00:00
|
|
|
shared_libcsiphash_la_SOURCES = \
|
|
|
|
|
shared/c-siphash/src/c-siphash.c \
|
2018-11-03 07:49:32 +00:00
|
|
|
shared/c-siphash/src/c-siphash.h \
|
|
|
|
|
$(NULL)
|
2018-11-03 08:09:33 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += shared/libcrbtree.la
|
|
|
|
|
|
2018-12-28 15:16:30 +00:00
|
|
|
shared_libcrbtree_la_CFLAGS = \
|
|
|
|
|
$(AM_CFLAGS) \
|
|
|
|
|
-std=c11 \
|
2019-04-14 10:00:29 +00:00
|
|
|
-I$(srcdir)/shared/c-stdaux/src \
|
2018-12-28 15:16:30 +00:00
|
|
|
$(NULL)
|
2018-11-03 08:09:33 +00:00
|
|
|
|
|
|
|
|
shared_libcrbtree_la_CPPFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-08 15:38:44 +00:00
|
|
|
shared_libcrbtree_la_LDFLAGS = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2019-04-08 15:38:44 +00:00
|
|
|
|
2018-11-03 08:09:33 +00:00
|
|
|
shared_libcrbtree_la_SOURCES = \
|
|
|
|
|
shared/c-rbtree/src/c-rbtree.c \
|
|
|
|
|
shared/c-rbtree/src/c-rbtree.h \
|
2018-11-03 07:49:32 +00:00
|
|
|
shared/c-rbtree/src/c-rbtree-private.h \
|
|
|
|
|
$(NULL)
|
2018-11-03 08:09:33 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += shared/libnacd.la
|
|
|
|
|
|
2018-11-03 07:49:32 +00:00
|
|
|
shared_libnacd_la_CFLAGS = \
|
|
|
|
|
$(AM_CFLAGS) \
|
|
|
|
|
-std=c11 \
|
|
|
|
|
-Wno-pointer-arith \
|
|
|
|
|
-Wno-vla \
|
|
|
|
|
$(NULL)
|
2018-11-03 08:09:33 +00:00
|
|
|
|
|
|
|
|
shared_libnacd_la_CPPFLAGS = \
|
|
|
|
|
-D_GNU_SOURCE \
|
|
|
|
|
-DSO_ATTACH_BPF=50 \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
2019-04-14 10:00:29 +00:00
|
|
|
-I$(srcdir)/shared/c-stdaux/src \
|
2018-11-03 08:09:33 +00:00
|
|
|
-I$(srcdir)/shared/c-list/src \
|
|
|
|
|
-I$(srcdir)/shared/c-siphash/src \
|
|
|
|
|
-I$(srcdir)/shared/c-rbtree/src \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-08 15:38:44 +00:00
|
|
|
shared_libnacd_la_LDFLAGS = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2019-04-08 15:38:44 +00:00
|
|
|
|
2018-11-03 08:09:33 +00:00
|
|
|
shared_libnacd_la_SOURCES = \
|
|
|
|
|
shared/n-acd/src/n-acd.c \
|
|
|
|
|
shared/n-acd/src/n-acd.h \
|
|
|
|
|
shared/n-acd/src/n-acd-private.h \
|
|
|
|
|
shared/n-acd/src/n-acd-probe.c \
|
|
|
|
|
shared/n-acd/src/util/timer.c \
|
2018-11-03 07:49:32 +00:00
|
|
|
shared/n-acd/src/util/timer.h \
|
|
|
|
|
$(NULL)
|
2018-11-03 08:09:33 +00:00
|
|
|
|
|
|
|
|
if WITH_EBPF
|
|
|
|
|
shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf.c
|
|
|
|
|
else
|
|
|
|
|
shared_libnacd_la_SOURCES += shared/n-acd/src/n-acd-bpf-fallback.c
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
dhcp: add nettools dhcp4 client
This is inspired by the existing systemd integration, with a few differences:
* This parses the WPAD option, which systemd requested, but did not use.
* We hook into the DAD handling, only making use of the configured address
once DAD has completed successfully, and declining the lease if it fails.
There are still many areas of possible improvement. In particular, we need
to ensure the parsing of all options are compliant, as n-dhcp4 treats all
options as opaque, unlike sd-dhcp4. We probably also need to look at how
to handle failures and retries (in particular if we decline a lease).
We need to query the current MTU at client startu, as well as the hardware
broadcast address. Both these are provided by the kernel over netlink, so
it should simply be a matter of hooking that up with NM's netlink layer.
Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 18:02:48 +00:00
|
|
|
noinst_LTLIBRARIES += shared/libndhcp4.la
|
|
|
|
|
|
|
|
|
|
shared_libndhcp4_la_CFLAGS = \
|
|
|
|
|
$(AM_CFLAGS) \
|
|
|
|
|
-std=c11 \
|
|
|
|
|
-Wno-error=declaration-after-statement \
|
|
|
|
|
-Wno-pointer-arith \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_libndhcp4_la_CPPFLAGS = \
|
|
|
|
|
-D_GNU_SOURCE \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
-I$(srcdir)/shared/c-stdaux/src \
|
|
|
|
|
-I$(srcdir)/shared/c-list/src \
|
|
|
|
|
-I$(srcdir)/shared/c-siphash/src \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_libndhcp4_la_LDFLAGS = \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
shared_libndhcp4_la_SOURCES = \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-c-connection.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-c-lease.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-c-probe.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-client.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-incoming.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-outgoing.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-private.h \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4-socket.c \
|
|
|
|
|
shared/n-dhcp4/src/n-dhcp4.h \
|
|
|
|
|
shared/n-dhcp4/src/util/packet.c \
|
|
|
|
|
shared/n-dhcp4/src/util/packet.h \
|
|
|
|
|
shared/n-dhcp4/src/util/socket.c \
|
|
|
|
|
shared/n-dhcp4/src/util/socket.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-04-14 11:36:32 +00:00
|
|
|
noinst_LTLIBRARIES += shared/nm-std-aux/libnm-std-aux.la
|
|
|
|
|
|
|
|
|
|
shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
|
|
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION='0' \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
|
|
|
|
|
shared/c-list/src/c-list.h \
|
|
|
|
|
shared/nm-std-aux/c-list-util.c \
|
|
|
|
|
shared/nm-std-aux/c-list-util.h \
|
2019-04-15 07:23:31 +00:00
|
|
|
shared/nm-std-aux/nm-dbus-compat.h \
|
2019-04-14 11:36:32 +00:00
|
|
|
shared/nm-std-aux/unaligned.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-04-15 06:16:00 +00:00
|
|
|
shared_nm_glib_aux_cppflags = \
|
2018-10-12 16:05:48 +00:00
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
|
2018-10-12 16:05:48 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 06:16:00 +00:00
|
|
|
noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la
|
2018-11-03 07:49:32 +00:00
|
|
|
|
2019-04-15 06:16:00 +00:00
|
|
|
shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \
|
|
|
|
|
$(shared_nm_glib_aux_cppflags) \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 06:16:00 +00:00
|
|
|
shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
|
|
|
|
|
shared/nm-glib-aux/nm-c-list.h \
|
2019-05-04 09:24:07 +00:00
|
|
|
shared/nm-glib-aux/nm-dbus-aux.c \
|
|
|
|
|
shared/nm-glib-aux/nm-dbus-aux.h \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/nm-dedup-multi.c \
|
|
|
|
|
shared/nm-glib-aux/nm-dedup-multi.h \
|
|
|
|
|
shared/nm-glib-aux/nm-enum-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-enum-utils.h \
|
|
|
|
|
shared/nm-glib-aux/nm-errno.c \
|
|
|
|
|
shared/nm-glib-aux/nm-errno.h \
|
|
|
|
|
shared/nm-glib-aux/nm-glib.h \
|
|
|
|
|
shared/nm-glib-aux/nm-hash-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-hash-utils.h \
|
|
|
|
|
shared/nm-glib-aux/nm-io-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-io-utils.h \
|
|
|
|
|
shared/nm-glib-aux/nm-jansson.h \
|
2019-05-09 11:56:44 +00:00
|
|
|
shared/nm-glib-aux/nm-json-aux.c \
|
|
|
|
|
shared/nm-glib-aux/nm-json-aux.h \
|
2019-05-03 09:57:35 +00:00
|
|
|
shared/nm-glib-aux/nm-keyfile-aux.c \
|
|
|
|
|
shared/nm-glib-aux/nm-keyfile-aux.h \
|
2019-11-24 09:28:22 +00:00
|
|
|
shared/nm-glib-aux/nm-logging-base.c \
|
|
|
|
|
shared/nm-glib-aux/nm-logging-base.h \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/nm-logging-fwd.h \
|
|
|
|
|
shared/nm-glib-aux/nm-macros-internal.h \
|
|
|
|
|
shared/nm-glib-aux/nm-obj.h \
|
|
|
|
|
shared/nm-glib-aux/nm-random-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-random-utils.h \
|
shared: add NMRefString
I'd like to refactor libnm's caching. Note that cached D-Bus objects
have repeated strings all over the place. For example every object will
have a set of D-Bus interfaces (strings) and properties (strings) and an
object path (which is referenced by other objects). We can save a lot of
redundant strings by deduplicating/interning them. Also, by interning
them, we can compare them using pointer equality.
Add a NMRefString implementation for this.
Maybe an alternative name would be NMInternedString or NMDedupString, because
this string gets always interned. There is no way to create a NMRefString
that is not interned. Still, NMRefString name sounds better. It is ref-counted
after all.
Notes:
- glib has GQuark and g_intern_string(). However, such strings cannot
be unrefered and are leaked indefinitely. It is thus unsuited for
anything but a fixed set of well-known strings.
- glib 2.58 adds GRefString, but we cannot use that because we
currently still use glib 2.40.
There are some differences:
- GRefString is just a typedef to char. That means, the glib API
exposes GRefString like regular character strings.
NMRefString intentionally does that not. This makes it slightly
less convenient to pass it to API that expects "const char *".
But it makes it clear to the reader, that an instance is in fact
a NMRefString, which means it indicates that the string is
interned and can be referenced without additional copy.
- GRefString can be optionally interned. That means you can
only use pointer equality for comparing values if you know
that the GRefString was created with g_ref_string_new_intern().
So, GRefString looks like a "const char *" pointer and even if
you know it's a GRefString, you might not know whether it is
interned. NMRefString is always interned, and you can always
compare it using pointer equality.
- In the past I already proposed a different implementation for a
ref-string. That made different choices. For example NMRefString
then was a typedef to "const char *", it did not support interning
but deduplication (without a global cache), ref/unref was not
thread safe (but then there was no global cache so that two threads
could still use the API independently).
The point is, there are various choices to make. GRefString, the
previous NMRefString implementation and the one here, all have pros and
cons. I think for the purpose where I intend NMRefString (dedup and
efficient comparison), it is a preferable implementation.
Ah, and of course NMRefString is an immutable string, which is a nice
property.
2019-09-02 05:54:28 +00:00
|
|
|
shared/nm-glib-aux/nm-ref-string.c \
|
|
|
|
|
shared/nm-glib-aux/nm-ref-string.h \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/nm-secret-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-secret-utils.h \
|
|
|
|
|
shared/nm-glib-aux/nm-shared-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-shared-utils.h \
|
|
|
|
|
shared/nm-glib-aux/nm-time-utils.c \
|
|
|
|
|
shared/nm-glib-aux/nm-time-utils.h \
|
2019-05-10 08:09:54 +00:00
|
|
|
shared/nm-glib-aux/nm-value-type.h \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 06:16:00 +00:00
|
|
|
shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 06:16:00 +00:00
|
|
|
shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-04-15 05:39:31 +00:00
|
|
|
noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la
|
2018-11-03 07:49:32 +00:00
|
|
|
|
2019-04-15 05:39:31 +00:00
|
|
|
shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
|
2019-04-15 06:16:00 +00:00
|
|
|
$(shared_nm_glib_aux_cppflags) \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(LIBUDEV_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 05:39:31 +00:00
|
|
|
shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \
|
|
|
|
|
shared/nm-udev-aux/nm-udev-utils.c \
|
|
|
|
|
shared/nm-udev-aux/nm-udev-utils.h \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 05:39:31 +00:00
|
|
|
shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-15 05:39:31 +00:00
|
|
|
shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(LIBUDEV_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
noinst_LTLIBRARIES += shared/nm-libnm-core-intern/libnm-libnm-core-intern.la
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \
|
|
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \
|
|
|
|
|
shared/nm-libnm-core-intern/nm-common-macros.h \
|
|
|
|
|
shared/nm-libnm-core-intern/nm-ethtool-utils.c \
|
|
|
|
|
shared/nm-libnm-core-intern/nm-ethtool-utils.h \
|
|
|
|
|
shared/nm-libnm-core-intern/nm-libnm-core-utils.c \
|
|
|
|
|
shared/nm-libnm-core-intern/nm-libnm-core-utils.h \
|
2019-12-19 10:30:38 +00:00
|
|
|
shared/nm-libnm-core-intern/nm-auth-subject.c \
|
|
|
|
|
shared/nm-libnm-core-intern/nm-auth-subject.h \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += shared/nm-libnm-core-aux/libnm-libnm-core-aux.la
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \
|
|
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \
|
|
|
|
|
shared/nm-libnm-core-aux/nm-dispatcher-api.h \
|
2019-04-20 19:04:18 +00:00
|
|
|
shared/nm-libnm-core-aux/nm-libnm-core-aux.c \
|
|
|
|
|
shared/nm-libnm-core-aux/nm-libnm-core-aux.h \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
2019-12-06 12:40:39 +00:00
|
|
|
|
2020-01-02 06:37:59 +00:00
|
|
|
noinst_LTLIBRARIES += shared/nm-keyfile/libnm-keyfile.la
|
|
|
|
|
|
|
|
|
|
shared_nm_keyfile_libnm_keyfile_la_CPPFLAGS = \
|
|
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_keyfile_libnm_keyfile_la_SOURCES = \
|
|
|
|
|
shared/nm-keyfile/nm-keyfile-internal.h \
|
|
|
|
|
shared/nm-keyfile/nm-keyfile-utils.c \
|
|
|
|
|
shared/nm-keyfile/nm-keyfile-utils.h \
|
|
|
|
|
shared/nm-keyfile/nm-keyfile.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_keyfile_libnm_keyfile_la_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_keyfile_libnm_keyfile_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(shared_nm_keyfile_libnm_keyfile_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-12-06 12:40:39 +00:00
|
|
|
noinst_LTLIBRARIES += shared/nm-libnm-aux/libnm-libnm-aux.la
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
|
|
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnmc"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
|
|
|
|
|
shared/nm-libnm-aux/nm-libnm-aux.c \
|
|
|
|
|
shared/nm-libnm-aux/nm-libnm-aux.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_aux_libnm_libnm_aux_la_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_nm_libnm_aux_libnm_libnm_aux_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
libnm/libnm.la \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(shared_nm_libnm_aux_libnm_libnm_aux_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
|
2019-08-22 09:04:01 +00:00
|
|
|
EXTRA_DIST += \
|
2019-12-06 12:31:56 +00:00
|
|
|
shared/nm-glib-aux/tests/meson.build \
|
2019-08-22 09:04:01 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-12-06 12:31:56 +00:00
|
|
|
check_programs += shared/nm-glib-aux/tests/test-shared-general
|
2018-11-03 07:49:32 +00:00
|
|
|
|
2019-12-06 12:31:56 +00:00
|
|
|
shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
2018-10-12 16:05:48 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2019-12-06 12:31:56 +00:00
|
|
|
shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \
|
2019-04-08 15:38:44 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-12-06 12:31:56 +00:00
|
|
|
shared_nm_glib_aux_tests_test_shared_general_LDADD = \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-18 11:22:52 +00:00
|
|
|
shared/systemd/libnm-systemd-logging-stub.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2018-10-12 16:05:48 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-05-15 08:34:53 +00:00
|
|
|
noinst_LTLIBRARIES += introspection/libnmdbus.la
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2018-02-16 12:01:12 +00:00
|
|
|
introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS)
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-15 10:07:51 +00:00
|
|
|
introspection_sources = \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.AccessPoint.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.AccessPoint.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.AgentManager.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.AgentManager.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Checkpoint.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Checkpoint.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Connection.Active.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Connection.Active.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DHCP4Config.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DHCP6Config.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DHCP6Config.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Adsl.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Adsl.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bond.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bond.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bridge.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bridge.h \
|
2017-01-31 13:14:33 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Dummy.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Dummy.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Generic.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Generic.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Infiniband.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
|
2018-05-22 14:24:58 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
|
2016-06-30 16:20:22 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Macsec.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Macvlan.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Modem.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Modem.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsBridge.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsBridge.h \
|
2017-10-02 06:39:09 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsInterface.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsInterface.h \
|
2017-10-02 06:39:09 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsPort.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsPort.h \
|
2017-06-06 13:55:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Ppp.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Ppp.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Statistics.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Team.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Team.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Tun.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Tun.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Veth.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Veth.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Vlan.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WifiP2P.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WifiP2P.h \
|
2018-03-13 13:42:38 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wired.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wired.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wireless.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
|
2018-03-09 15:05:58 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wpan.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wpan.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.h \
|
2016-10-24 11:28:51 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.DnsManager.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DnsManager.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.IP4Config.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.IP4Config.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.IP6Config.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.IP6Config.h \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.WifiP2PPeer.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.WifiP2PPeer.h \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.PPP.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.PPP.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.SecretAgent.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.SecretAgent.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Settings.Connection.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Settings.Connection.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Settings.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Settings.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.VPN.Connection.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.VPN.Connection.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.VPN.Plugin.c \
|
2018-10-10 21:30:46 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.VPN.Plugin.h \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.c \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.h \
|
|
|
|
|
$(NULL)
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-15 10:07:51 +00:00
|
|
|
nodist_introspection_libnmdbus_la_SOURCES = $(introspection_sources)
|
|
|
|
|
|
2016-10-14 10:13:50 +00:00
|
|
|
DBUS_INTERFACE_DOCS = \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Checkpoint.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml \
|
2016-06-30 16:20:22 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml \
|
2017-10-02 06:39:09 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml \
|
2017-10-02 06:39:09 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml \
|
2017-06-06 13:55:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Ppp.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml \
|
2018-03-13 13:42:38 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \
|
2018-05-22 14:24:58 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
|
|
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.WifiP2PPeer.xml \
|
2018-10-10 21:30:46 +00:00
|
|
|
docs/api/dbus-org.freedesktop.NetworkManager.xml \
|
|
|
|
|
$(NULL)
|
2016-11-23 12:14:08 +00:00
|
|
|
|
|
|
|
|
introspection/%.c: introspection/%.xml
|
2017-02-22 10:42:35 +00:00
|
|
|
@$(MKDIR_P) introspection/
|
2016-11-23 12:14:08 +00:00
|
|
|
$(AM_V_GEN) gdbus-codegen \
|
|
|
|
|
--generate-c-code $(basename $@) \
|
|
|
|
|
--generate-docbook docs/api/dbus \
|
2016-10-14 10:13:50 +00:00
|
|
|
--c-namespace NMDBus \
|
|
|
|
|
--interface-prefix org.freedesktop.NetworkManager \
|
2016-11-23 12:14:08 +00:00
|
|
|
$<
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/%.h: introspection/%.c
|
|
|
|
|
$()
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-23 12:14:08 +00:00
|
|
|
docs/api/dbus-%.xml: introspection/%.c
|
|
|
|
|
$()
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-23 13:03:51 +00:00
|
|
|
dbusinterfacesdir = $(datadir)/dbus-1/interfaces
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-23 13:03:51 +00:00
|
|
|
dbusinterfaces_DATA = \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.AccessPoint.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.AgentManager.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Checkpoint.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Adsl.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bond.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \
|
2017-01-31 13:14:33 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Dummy.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
|
2018-05-22 14:24:58 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
|
2016-06-30 16:20:22 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsBridge.xml \
|
2017-10-02 06:39:09 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsInterface.xml \
|
2017-10-02 06:39:09 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.OvsPort.xml \
|
2017-06-06 13:55:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Ppp.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Team.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Tun.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml \
|
2018-03-13 13:42:38 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
|
2018-03-09 15:05:58 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.Device.xml \
|
2016-10-24 11:28:51 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.DnsManager.xml \
|
2016-11-23 12:14:08 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.IP4Config.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.IP6Config.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.PPP.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.SecretAgent.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Settings.Connection.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.Settings.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \
|
2019-01-28 14:21:59 +00:00
|
|
|
introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml \
|
|
|
|
|
introspection/org.freedesktop.NetworkManager.xml \
|
|
|
|
|
$(NULL)
|
2016-10-14 10:13:50 +00:00
|
|
|
|
2016-11-22 18:30:06 +00:00
|
|
|
CLEANFILES += $(introspection_sources)
|
|
|
|
|
CLEANFILES += $(DBUS_INTERFACE_DOCS)
|
2016-11-23 13:03:51 +00:00
|
|
|
|
2016-11-22 17:09:19 +00:00
|
|
|
$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources)
|
|
|
|
|
$(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources)
|
2019-10-17 06:41:01 +00:00
|
|
|
$(libnm_liblibnm_la_OBJECTS): $(introspection_sources)
|
2016-11-22 17:09:19 +00:00
|
|
|
$(libnm_libnm_la_OBJECTS): $(introspection_sources)
|
|
|
|
|
|
2016-11-23 13:03:51 +00:00
|
|
|
EXTRA_DIST += \
|
2018-01-08 12:06:54 +00:00
|
|
|
$(dbusinterfaces_DATA) \
|
|
|
|
|
introspection/meson.build
|
2016-11-23 13:03:51 +00:00
|
|
|
|
2018-06-26 10:02:33 +00:00
|
|
|
check-docs:
|
2018-10-25 08:20:33 +00:00
|
|
|
$(srcdir)/tools/check-docs.sh "$(srcdir)" "$(builddir)"
|
2018-06-26 10:02:33 +00:00
|
|
|
|
|
|
|
|
check_local += check-docs
|
|
|
|
|
|
2016-10-14 10:13:50 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm_core_lib_h_pub_real = \
|
2016-10-14 10:54:41 +00:00
|
|
|
shared/nm-version-macros.h \
|
|
|
|
|
libnm-core/nm-connection.h \
|
|
|
|
|
libnm-core/nm-core-types.h \
|
|
|
|
|
libnm-core/nm-dbus-interface.h \
|
|
|
|
|
libnm-core/nm-errors.h \
|
2018-05-22 13:41:29 +00:00
|
|
|
libnm-core/nm-setting-6lowpan.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-8021x.h \
|
|
|
|
|
libnm-core/nm-setting-adsl.h \
|
|
|
|
|
libnm-core/nm-setting-bluetooth.h \
|
|
|
|
|
libnm-core/nm-setting-bond.h \
|
|
|
|
|
libnm-core/nm-setting-bridge-port.h \
|
|
|
|
|
libnm-core/nm-setting-bridge.h \
|
|
|
|
|
libnm-core/nm-setting-cdma.h \
|
|
|
|
|
libnm-core/nm-setting-connection.h \
|
|
|
|
|
libnm-core/nm-setting-dcb.h \
|
2017-01-31 13:13:35 +00:00
|
|
|
libnm-core/nm-setting-dummy.h \
|
libnm, cli, ifcfg-rh: add NMSettingEthtool setting
Note that in NetworkManager API (D-Bus, libnm, and nmcli),
the features are called "feature-xyz". The "feature-" prefix
is used, because NMSettingEthtool possibly will gain support
for options that are not only -K|--offload|--features, for
example -C|--coalesce.
The "xzy" suffix is either how ethtool utility calls the feature
("tso", "rx"). Or, if ethtool utility specifies no alias for that
feature, it's the name from kernel's ETH_SS_FEATURES ("tx-tcp6-segmentation").
If possible, we prefer ethtool utility's naming.
Also note, how the features "feature-sg", "feature-tso", and
"feature-tx" actually refer to multiple underlying kernel features
at once. This too follows what ethtool utility does.
The functionality is not yet implemented server-side.
2018-07-16 21:37:55 +00:00
|
|
|
libnm-core/nm-setting-ethtool.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-generic.h \
|
|
|
|
|
libnm-core/nm-setting-gsm.h \
|
|
|
|
|
libnm-core/nm-setting-infiniband.h \
|
|
|
|
|
libnm-core/nm-setting-ip-config.h \
|
|
|
|
|
libnm-core/nm-setting-ip-tunnel.h \
|
|
|
|
|
libnm-core/nm-setting-ip4-config.h \
|
|
|
|
|
libnm-core/nm-setting-ip6-config.h \
|
2016-06-30 16:20:43 +00:00
|
|
|
libnm-core/nm-setting-macsec.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-macvlan.h \
|
2018-08-07 13:52:56 +00:00
|
|
|
libnm-core/nm-setting-match.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-olpc-mesh.h \
|
2017-08-01 16:36:34 +00:00
|
|
|
libnm-core/nm-setting-ovs-bridge.h \
|
2019-06-11 13:53:05 +00:00
|
|
|
libnm-core/nm-setting-ovs-dpdk.h \
|
2017-08-01 16:36:34 +00:00
|
|
|
libnm-core/nm-setting-ovs-interface.h \
|
2017-08-01 16:36:34 +00:00
|
|
|
libnm-core/nm-setting-ovs-patch.h \
|
2017-10-02 07:03:19 +00:00
|
|
|
libnm-core/nm-setting-ovs-port.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-ppp.h \
|
|
|
|
|
libnm-core/nm-setting-pppoe.h \
|
|
|
|
|
libnm-core/nm-setting-proxy.h \
|
|
|
|
|
libnm-core/nm-setting-serial.h \
|
2018-05-25 10:05:24 +00:00
|
|
|
libnm-core/nm-setting-sriov.h \
|
2017-11-16 16:35:20 +00:00
|
|
|
libnm-core/nm-setting-tc-config.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-team-port.h \
|
|
|
|
|
libnm-core/nm-setting-team.h \
|
|
|
|
|
libnm-core/nm-setting-tun.h \
|
2017-03-24 11:41:04 +00:00
|
|
|
libnm-core/nm-setting-user.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-vlan.h \
|
|
|
|
|
libnm-core/nm-setting-vpn.h \
|
2019-12-05 09:13:34 +00:00
|
|
|
libnm-core/nm-setting-vrf.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-vxlan.h \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm-core/nm-setting-wifi-p2p.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-wimax.h \
|
|
|
|
|
libnm-core/nm-setting-wired.h \
|
2018-12-27 15:48:30 +00:00
|
|
|
libnm-core/nm-setting-wireguard.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-wireless-security.h \
|
|
|
|
|
libnm-core/nm-setting-wireless.h \
|
2018-03-09 09:51:49 +00:00
|
|
|
libnm-core/nm-setting-wpan.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting.h \
|
|
|
|
|
libnm-core/nm-simple-connection.h \
|
|
|
|
|
libnm-core/nm-utils.h \
|
|
|
|
|
libnm-core/nm-version.h \
|
|
|
|
|
libnm-core/nm-vpn-dbus-interface.h \
|
|
|
|
|
libnm-core/nm-vpn-editor-plugin.h \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-vpn-plugin-info.h \
|
|
|
|
|
$(NULL)
|
2016-11-20 13:40:38 +00:00
|
|
|
libnm_core_lib_h_pub_mkenums = \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-core-enum-types.h \
|
|
|
|
|
$(NULL)
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm_core_lib_h_priv = \
|
2017-03-28 09:38:00 +00:00
|
|
|
shared/nm-meta-setting.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-connection-private.h \
|
|
|
|
|
libnm-core/nm-core-internal.h \
|
|
|
|
|
libnm-core/nm-core-types-internal.h \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-crypto-impl.h \
|
|
|
|
|
libnm-core/nm-crypto.h \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-property-compare.h \
|
|
|
|
|
libnm-core/nm-setting-private.h \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-team-utils.h \
|
|
|
|
|
libnm-core/nm-utils-private.h \
|
|
|
|
|
$(NULL)
|
2017-12-15 13:35:31 +00:00
|
|
|
libnm_core_lib_c_settings_real = \
|
2018-05-22 13:41:29 +00:00
|
|
|
libnm-core/nm-setting-6lowpan.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-8021x.c \
|
|
|
|
|
libnm-core/nm-setting-adsl.c \
|
|
|
|
|
libnm-core/nm-setting-bluetooth.c \
|
|
|
|
|
libnm-core/nm-setting-bond.c \
|
|
|
|
|
libnm-core/nm-setting-bridge-port.c \
|
|
|
|
|
libnm-core/nm-setting-bridge.c \
|
|
|
|
|
libnm-core/nm-setting-cdma.c \
|
|
|
|
|
libnm-core/nm-setting-connection.c \
|
|
|
|
|
libnm-core/nm-setting-dcb.c \
|
2017-01-31 13:13:35 +00:00
|
|
|
libnm-core/nm-setting-dummy.c \
|
libnm, cli, ifcfg-rh: add NMSettingEthtool setting
Note that in NetworkManager API (D-Bus, libnm, and nmcli),
the features are called "feature-xyz". The "feature-" prefix
is used, because NMSettingEthtool possibly will gain support
for options that are not only -K|--offload|--features, for
example -C|--coalesce.
The "xzy" suffix is either how ethtool utility calls the feature
("tso", "rx"). Or, if ethtool utility specifies no alias for that
feature, it's the name from kernel's ETH_SS_FEATURES ("tx-tcp6-segmentation").
If possible, we prefer ethtool utility's naming.
Also note, how the features "feature-sg", "feature-tso", and
"feature-tx" actually refer to multiple underlying kernel features
at once. This too follows what ethtool utility does.
The functionality is not yet implemented server-side.
2018-07-16 21:37:55 +00:00
|
|
|
libnm-core/nm-setting-ethtool.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-generic.c \
|
|
|
|
|
libnm-core/nm-setting-gsm.c \
|
|
|
|
|
libnm-core/nm-setting-infiniband.c \
|
|
|
|
|
libnm-core/nm-setting-ip-config.c \
|
|
|
|
|
libnm-core/nm-setting-ip-tunnel.c \
|
|
|
|
|
libnm-core/nm-setting-ip4-config.c \
|
|
|
|
|
libnm-core/nm-setting-ip6-config.c \
|
2016-06-30 16:20:43 +00:00
|
|
|
libnm-core/nm-setting-macsec.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-macvlan.c \
|
2018-08-07 13:52:56 +00:00
|
|
|
libnm-core/nm-setting-match.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-olpc-mesh.c \
|
2017-08-01 16:36:34 +00:00
|
|
|
libnm-core/nm-setting-ovs-bridge.c \
|
2019-06-11 13:53:05 +00:00
|
|
|
libnm-core/nm-setting-ovs-dpdk.c \
|
2017-08-01 16:36:34 +00:00
|
|
|
libnm-core/nm-setting-ovs-interface.c \
|
2017-08-01 16:36:34 +00:00
|
|
|
libnm-core/nm-setting-ovs-patch.c \
|
2017-10-02 07:03:19 +00:00
|
|
|
libnm-core/nm-setting-ovs-port.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-ppp.c \
|
|
|
|
|
libnm-core/nm-setting-pppoe.c \
|
|
|
|
|
libnm-core/nm-setting-proxy.c \
|
|
|
|
|
libnm-core/nm-setting-serial.c \
|
2018-05-25 10:05:24 +00:00
|
|
|
libnm-core/nm-setting-sriov.c \
|
2017-11-16 16:35:20 +00:00
|
|
|
libnm-core/nm-setting-tc-config.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-team-port.c \
|
|
|
|
|
libnm-core/nm-setting-team.c \
|
|
|
|
|
libnm-core/nm-setting-tun.c \
|
2017-03-24 11:41:04 +00:00
|
|
|
libnm-core/nm-setting-user.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-vlan.c \
|
|
|
|
|
libnm-core/nm-setting-vpn.c \
|
2019-12-05 09:13:34 +00:00
|
|
|
libnm-core/nm-setting-vrf.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-vxlan.c \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm-core/nm-setting-wifi-p2p.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-wimax.c \
|
|
|
|
|
libnm-core/nm-setting-wired.c \
|
2018-12-27 15:48:30 +00:00
|
|
|
libnm-core/nm-setting-wireguard.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting-wireless-security.c \
|
2018-03-09 09:51:49 +00:00
|
|
|
libnm-core/nm-setting-wireless.c \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-setting-wpan.c \
|
|
|
|
|
$(NULL)
|
2017-12-15 13:35:31 +00:00
|
|
|
libnm_core_lib_c_real = \
|
|
|
|
|
$(libnm_core_lib_c_settings_real) \
|
|
|
|
|
shared/nm-meta-setting.c \
|
|
|
|
|
libnm-core/nm-connection.c \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-crypto.c \
|
2017-12-15 13:35:31 +00:00
|
|
|
libnm-core/nm-dbus-utils.c \
|
|
|
|
|
libnm-core/nm-errors.c \
|
|
|
|
|
libnm-core/nm-property-compare.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-setting.c \
|
|
|
|
|
libnm-core/nm-simple-connection.c \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-team-utils.c \
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm-core/nm-utils.c \
|
|
|
|
|
libnm-core/nm-vpn-editor-plugin.c \
|
2019-05-06 10:11:23 +00:00
|
|
|
libnm-core/nm-vpn-plugin-info.c \
|
|
|
|
|
$(NULL)
|
2017-12-26 08:28:54 +00:00
|
|
|
|
|
|
|
|
if WITH_JSON_VALIDATION
|
|
|
|
|
libnm_core_lib_h_priv += \
|
2018-01-09 05:20:18 +00:00
|
|
|
libnm-core/nm-json.h
|
2017-12-26 08:28:54 +00:00
|
|
|
libnm_core_lib_c_real += \
|
2018-01-09 05:20:18 +00:00
|
|
|
libnm-core/nm-json.c
|
2017-12-26 08:28:54 +00:00
|
|
|
endif
|
|
|
|
|
|
2016-11-20 13:40:38 +00:00
|
|
|
libnm_core_lib_c_mkenums = \
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm-core/nm-core-enum-types.c
|
|
|
|
|
|
|
|
|
|
libnminclude_HEADERS += \
|
|
|
|
|
$(libnm_core_lib_h_pub_real)
|
2016-10-14 10:54:41 +00:00
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
nodist_libnminclude_HEADERS += \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_core_lib_h_pub_mkenums)
|
2016-10-14 10:54:41 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-22 10:25:40 +00:00
|
|
|
dflt_cppflags_libnm_core = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
2016-10-22 10:25:40 +00:00
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(LIBUDEV_CFLAGS) \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
$(NULL)
|
2017-02-22 16:14:28 +00:00
|
|
|
|
2016-10-14 10:54:41 +00:00
|
|
|
noinst_LTLIBRARIES += libnm-core/libnm-core.la
|
|
|
|
|
|
|
|
|
|
GLIB_GENERATED += \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_core_lib_h_pub_mkenums) \
|
|
|
|
|
$(libnm_core_lib_c_mkenums)
|
2016-11-15 13:35:48 +00:00
|
|
|
nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real)
|
2016-10-14 10:54:41 +00:00
|
|
|
|
2017-03-16 16:09:42 +00:00
|
|
|
nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
|
|
|
|
|
|
2017-03-23 16:18:33 +00:00
|
|
|
libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp
|
|
|
|
|
libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp
|
2017-02-22 11:51:08 +00:00
|
|
|
|
2016-11-22 17:09:19 +00:00
|
|
|
$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_core_libnm_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_libnm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-07-26 10:44:20 +00:00
|
|
|
$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2016-11-20 14:03:45 +00:00
|
|
|
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm_core_libnm_core_la_CPPFLAGS = \
|
2016-10-22 10:25:40 +00:00
|
|
|
$(dflt_cppflags_libnm_core) \
|
2016-10-14 10:54:41 +00:00
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
|
|
|
|
|
$(NULL)
|
2016-10-14 10:54:41 +00:00
|
|
|
|
2017-12-08 10:08:29 +00:00
|
|
|
if WITH_JSON_VALIDATION
|
|
|
|
|
libnm_core_libnm_core_la_CPPFLAGS += $(JANSSON_CFLAGS)
|
|
|
|
|
endif
|
|
|
|
|
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm_core_libnm_core_la_SOURCES = \
|
2016-11-15 13:35:48 +00:00
|
|
|
$(libnm_core_lib_h_pub_real) \
|
|
|
|
|
$(libnm_core_lib_h_priv) \
|
|
|
|
|
$(libnm_core_lib_c_real)
|
|
|
|
|
|
|
|
|
|
nodist_libnm_core_libnm_core_la_SOURCES = \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_core_lib_h_pub_mkenums) \
|
|
|
|
|
$(libnm_core_lib_c_mkenums)
|
2016-10-14 10:54:41 +00:00
|
|
|
|
|
|
|
|
libnm_core_libnm_core_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(UUID_LIBS) \
|
2018-05-30 11:19:07 +00:00
|
|
|
$(NULL)
|
2017-02-22 16:14:28 +00:00
|
|
|
|
2016-10-14 10:54:41 +00:00
|
|
|
libnm_core_libnm_core_la_LDFLAGS = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2016-10-14 10:54:41 +00:00
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
EXTRA_DIST += \
|
2018-08-29 16:58:14 +00:00
|
|
|
libnm-core/nm-crypto-gnutls.c \
|
|
|
|
|
libnm-core/nm-crypto-nss.c \
|
2018-01-08 12:06:54 +00:00
|
|
|
libnm-core/nm-core-enum-types.c.template \
|
|
|
|
|
libnm-core/nm-core-enum-types.h.template \
|
2019-05-15 08:34:53 +00:00
|
|
|
libnm-core/meson.build \
|
|
|
|
|
$(NULL)
|
2016-11-15 13:35:48 +00:00
|
|
|
|
2017-02-22 10:43:21 +00:00
|
|
|
libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl
|
2017-02-22 10:42:35 +00:00
|
|
|
@$(MKDIR_P) libnm-core/
|
2017-03-16 16:10:11 +00:00
|
|
|
$(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-vpn-dbus-types' 'VPN Plugin D-Bus API Types' $< >$@
|
2016-10-14 10:54:41 +00:00
|
|
|
|
2017-02-22 10:43:21 +00:00
|
|
|
libnm-core/nm-dbus-types.xml: libnm-core/nm-dbus-interface.h tools/enums-to-docbook.pl
|
2017-02-22 10:42:35 +00:00
|
|
|
@$(MKDIR_P) libnm-core/
|
2017-03-16 16:10:11 +00:00
|
|
|
$(AM_V_GEN) @PERL@ $(srcdir)/tools/enums-to-docbook.pl 'nm-dbus-types' 'NetworkManager D-Bus API Types' $< >$@
|
2016-10-14 10:54:41 +00:00
|
|
|
|
|
|
|
|
BUILT_SOURCES += \
|
|
|
|
|
libnm-core/nm-vpn-dbus-types.xml \
|
|
|
|
|
libnm-core/nm-dbus-types.xml
|
|
|
|
|
|
2016-11-15 09:50:19 +00:00
|
|
|
dist_dependencies += \
|
|
|
|
|
libnm-core/nm-vpn-dbus-types.xml \
|
|
|
|
|
libnm-core/nm-dbus-types.xml
|
|
|
|
|
|
2016-10-14 10:54:41 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2018-08-30 06:30:19 +00:00
|
|
|
if HAVE_CRYPTO_GNUTLS
|
|
|
|
|
if WITH_GNUTLS
|
|
|
|
|
libnm_crypto_lib = libnm-core/libnm-crypto-gnutls.la
|
|
|
|
|
else
|
|
|
|
|
check_ltlibraries += libnm-core/libnm-crypto-gnutls.la
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
libnm_core_libnm_crypto_gnutls_la_SOURCES = libnm-core/nm-crypto-gnutls.c
|
|
|
|
|
libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \
|
|
|
|
|
$(libnm_core_libnm_core_la_CPPFLAGS) \
|
|
|
|
|
$(GNUTLS_CFLAGS)
|
|
|
|
|
libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \
|
|
|
|
|
$(libnm_core_libnm_core_la_LDFLAGS)
|
|
|
|
|
libnm_core_libnm_crypto_gnutls_la_LIBADD = \
|
2019-05-15 10:51:04 +00:00
|
|
|
$(GLIB_LIBS) \
|
2018-08-30 06:30:19 +00:00
|
|
|
$(GNUTLS_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if HAVE_CRYPTO_NSS
|
|
|
|
|
if WITH_NSS
|
|
|
|
|
libnm_crypto_lib = libnm-core/libnm-crypto-nss.la
|
|
|
|
|
else
|
|
|
|
|
check_ltlibraries += libnm-core/libnm-crypto-nss.la
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
libnm_core_libnm_crypto_nss_la_SOURCES = libnm-core/nm-crypto-nss.c
|
|
|
|
|
libnm_core_libnm_crypto_nss_la_CPPFLAGS = \
|
|
|
|
|
$(libnm_core_libnm_core_la_CPPFLAGS) \
|
|
|
|
|
$(NSS_CFLAGS)
|
|
|
|
|
libnm_core_libnm_crypto_nss_la_LDFLAGS = \
|
|
|
|
|
$(libnm_core_libnm_core_la_LDFLAGS)
|
|
|
|
|
libnm_core_libnm_crypto_nss_la_LIBADD = \
|
2019-05-15 10:51:04 +00:00
|
|
|
$(GLIB_LIBS) \
|
2018-08-30 06:30:19 +00:00
|
|
|
$(NSS_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += $(libnm_crypto_lib)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-22 18:30:06 +00:00
|
|
|
check_programs += \
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm-core/tests/test-compare \
|
|
|
|
|
libnm-core/tests/test-crypto \
|
|
|
|
|
libnm-core/tests/test-general \
|
|
|
|
|
libnm-core/tests/test-keyfile \
|
|
|
|
|
libnm-core/tests/test-secrets \
|
2017-12-03 12:37:39 +00:00
|
|
|
libnm-core/tests/test-setting \
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm-core/tests/test-settings-defaults
|
|
|
|
|
|
|
|
|
|
GLIB_GENERATED += \
|
|
|
|
|
libnm-core/tests/nm-core-tests-enum-types.h \
|
|
|
|
|
libnm-core/tests/nm-core-tests-enum-types.c
|
|
|
|
|
nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h
|
|
|
|
|
|
2017-06-14 12:03:30 +00:00
|
|
|
libnm-core/tests/nm-core-tests-enum-types.h.stamp: libnm-core/tests/.dirstamp
|
|
|
|
|
libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp
|
|
|
|
|
|
2016-11-22 18:30:06 +00:00
|
|
|
$(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h
|
|
|
|
|
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm_core_tests_cppflags = \
|
|
|
|
|
-I$(srcdir)/libnm-core/tests \
|
2016-10-22 14:12:30 +00:00
|
|
|
-I$(builddir)/libnm-core/tests \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(dflt_cppflags_libnm_core) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(SANITIZER_EXEC_CFLAGS) \
|
2018-05-30 08:23:17 +00:00
|
|
|
$(NULL)
|
2016-10-14 13:24:28 +00:00
|
|
|
|
|
|
|
|
libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
|
|
|
|
|
libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags)
|
|
|
|
|
libnm_core_tests_test_general_CPPFLAGS = $(libnm_core_tests_cppflags)
|
|
|
|
|
libnm_core_tests_test_keyfile_CPPFLAGS = $(libnm_core_tests_cppflags)
|
|
|
|
|
libnm_core_tests_test_secrets_CPPFLAGS = $(libnm_core_tests_cppflags)
|
2017-12-03 12:37:39 +00:00
|
|
|
libnm_core_tests_test_setting_CPPFLAGS = $(libnm_core_tests_cppflags)
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags)
|
|
|
|
|
|
|
|
|
|
libnm_core_tests_test_general_SOURCES = \
|
|
|
|
|
libnm-core/tests/test-general-enums.h \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
libnm-core/tests/test-general.c \
|
|
|
|
|
$(NULL)
|
2016-10-14 13:24:28 +00:00
|
|
|
|
2016-11-15 13:56:48 +00:00
|
|
|
nodist_libnm_core_tests_test_general_SOURCES = \
|
|
|
|
|
libnm-core/tests/nm-core-tests-enum-types.c \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
libnm-core/tests/nm-core-tests-enum-types.h \
|
|
|
|
|
$(NULL)
|
2016-11-15 13:56:48 +00:00
|
|
|
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm_core_tests_ldadd = \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
2020-01-02 06:37:59 +00:00
|
|
|
shared/nm-keyfile/libnm-keyfile.la \
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm-core/libnm-core.la \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
$(libnm_crypto_lib) \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
2018-12-28 20:30:03 +00:00
|
|
|
shared/systemd/libnm-systemd-shared.la \
|
|
|
|
|
shared/systemd/libnm-systemd-logging-stub.la \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-14 13:24:28 +00:00
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
libnm_core_tests_ldflags = \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2018-02-07 10:10:31 +00:00
|
|
|
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd)
|
|
|
|
|
libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd)
|
|
|
|
|
libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd)
|
|
|
|
|
libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd)
|
|
|
|
|
libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd)
|
2017-12-03 12:37:39 +00:00
|
|
|
libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd)
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd)
|
|
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_core_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_core_tests_test_secrets_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-12-03 12:37:39 +00:00
|
|
|
$(libnm_core_tests_test_setting_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
$(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-14 13:24:28 +00:00
|
|
|
# test-cert.p12 created with:
|
|
|
|
|
#
|
|
|
|
|
# openssl pkcs12 -export \
|
2018-02-02 09:55:34 +00:00
|
|
|
# -in test_key_and_cert.pem \
|
|
|
|
|
# -inkey test_key_and_cert.pem \
|
|
|
|
|
# -certfile test_ca_cert.pem \
|
|
|
|
|
# -name "test-pkcs12" \
|
|
|
|
|
# -out test-cert.p12
|
2016-10-14 13:24:28 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
libnm-core/tests/certs/ca-no-ending-newline.pem \
|
|
|
|
|
libnm-core/tests/certs/pkcs8-decrypted.der \
|
|
|
|
|
libnm-core/tests/certs/pkcs8-enc-key.pem \
|
|
|
|
|
libnm-core/tests/certs/pkcs8-noenc-key.pem \
|
|
|
|
|
libnm-core/tests/certs/test2_ca_cert.pem \
|
|
|
|
|
libnm-core/tests/certs/test2-cert.p12 \
|
|
|
|
|
libnm-core/tests/certs/test2_key_and_cert.pem \
|
2018-08-27 15:04:34 +00:00
|
|
|
libnm-core/tests/certs/test-aes-128-key.pem \
|
|
|
|
|
libnm-core/tests/certs/test-aes-256-key.pem \
|
2016-10-14 13:24:28 +00:00
|
|
|
libnm-core/tests/certs/test_ca_cert.der \
|
|
|
|
|
libnm-core/tests/certs/test_ca_cert.pem \
|
|
|
|
|
libnm-core/tests/certs/test-ca-cert.pem \
|
|
|
|
|
libnm-core/tests/certs/test-cert.p12 \
|
|
|
|
|
libnm-core/tests/certs/test_key_and_cert.pem \
|
|
|
|
|
libnm-core/tests/certs/test-key-and-cert.pem \
|
|
|
|
|
libnm-core/tests/certs/test-key-only-decrypted.der \
|
|
|
|
|
libnm-core/tests/certs/test-key-only-decrypted.pem \
|
2018-01-08 12:06:54 +00:00
|
|
|
libnm-core/tests/certs/test-key-only.pem \
|
2019-07-11 07:48:51 +00:00
|
|
|
libnm-core/tests/certs/test-tpm2wrapped-key.pem \
|
2018-01-08 12:06:54 +00:00
|
|
|
libnm-core/tests/nm-core-tests-enum-types.c.template \
|
|
|
|
|
libnm-core/tests/nm-core-tests-enum-types.h.template \
|
|
|
|
|
libnm-core/tests/meson.build
|
2016-10-14 13:24:28 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm_lib_h_pub_real = \
|
2016-10-14 13:54:40 +00:00
|
|
|
shared/nm-version-macros.h \
|
|
|
|
|
libnm/NetworkManager.h \
|
|
|
|
|
libnm/nm-access-point.h \
|
|
|
|
|
libnm/nm-active-connection.h \
|
2018-03-19 09:34:58 +00:00
|
|
|
libnm/nm-autoptr.h \
|
2017-10-21 14:05:19 +00:00
|
|
|
libnm/nm-checkpoint.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-client.h \
|
2018-05-22 14:45:05 +00:00
|
|
|
libnm/nm-device-6lowpan.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-adsl.h \
|
|
|
|
|
libnm/nm-device-bond.h \
|
|
|
|
|
libnm/nm-device-bridge.h \
|
|
|
|
|
libnm/nm-device-bt.h \
|
2017-01-31 13:14:33 +00:00
|
|
|
libnm/nm-device-dummy.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-ethernet.h \
|
|
|
|
|
libnm/nm-device-generic.h \
|
|
|
|
|
libnm/nm-device-infiniband.h \
|
|
|
|
|
libnm/nm-device-ip-tunnel.h \
|
2016-06-30 16:20:22 +00:00
|
|
|
libnm/nm-device-macsec.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-macvlan.h \
|
|
|
|
|
libnm/nm-device-modem.h \
|
|
|
|
|
libnm/nm-device-olpc-mesh.h \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-device-ovs-bridge.h \
|
2017-10-10 09:04:32 +00:00
|
|
|
libnm/nm-device-ovs-interface.h \
|
2017-10-10 09:04:32 +00:00
|
|
|
libnm/nm-device-ovs-port.h \
|
2017-06-06 13:55:08 +00:00
|
|
|
libnm/nm-device-ppp.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-team.h \
|
|
|
|
|
libnm/nm-device-tun.h \
|
|
|
|
|
libnm/nm-device-vlan.h \
|
|
|
|
|
libnm/nm-device-vxlan.h \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-device-wifi-p2p.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-wifi.h \
|
|
|
|
|
libnm/nm-device-wimax.h \
|
2018-03-13 13:42:38 +00:00
|
|
|
libnm/nm-device-wireguard.h \
|
2018-03-09 16:19:36 +00:00
|
|
|
libnm/nm-device-wpan.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device.h \
|
|
|
|
|
libnm/nm-dhcp-config.h \
|
|
|
|
|
libnm/nm-ip-config.h \
|
|
|
|
|
libnm/nm-object.h \
|
|
|
|
|
libnm/nm-remote-connection.h \
|
2017-12-15 13:35:32 +00:00
|
|
|
libnm/nm-secret-agent-old.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-types.h \
|
|
|
|
|
libnm/nm-vpn-connection.h \
|
|
|
|
|
libnm/nm-vpn-editor.h \
|
|
|
|
|
libnm/nm-vpn-plugin-old.h \
|
2017-12-15 13:35:32 +00:00
|
|
|
libnm/nm-vpn-service-plugin.h \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-wifi-p2p-peer.h \
|
2017-12-15 13:35:32 +00:00
|
|
|
libnm/nm-wimax-nsp.h
|
2016-11-20 13:40:38 +00:00
|
|
|
libnm_lib_h_pub_mkenums = \
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm/nm-enum-types.h
|
|
|
|
|
libnm_lib_h_priv = \
|
2017-05-19 08:19:25 +00:00
|
|
|
libnm/nm-libnm-utils.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-dbus-helpers.h \
|
|
|
|
|
libnm/nm-device-private.h \
|
|
|
|
|
libnm/nm-dhcp4-config.h \
|
|
|
|
|
libnm/nm-dhcp6-config.h \
|
2016-10-25 09:11:12 +00:00
|
|
|
libnm/nm-dns-manager.h \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-ip4-config.h \
|
|
|
|
|
libnm/nm-ip6-config.h \
|
|
|
|
|
libnm/nm-object-private.h \
|
|
|
|
|
libnm/nm-remote-connection-private.h \
|
libnm: refactor caching of D-Bus objects in NMClient
No longer use GDBusObjectMangaerClient and gdbus-codegen generated classes
for the NMClient cache. Instead, use GDBusConnection directly and a
custom implementation (NMLDBusObject) for caching D-Bus' ObjectManager
data.
CHANGES
-------
- This is a complete rework. I think the previous implementation was
difficult to understand. There were unfixed bugs and nobody understood
the code well enough to fix them. Maybe somebody out there understood the
code, but I certainly did not. At least nobody provided patches to fix those
issues. I do believe that this implementation is more straightforward and
easier to understand. It removes a lot of layers of code. Whether this claim
of simplicity is true, each reader must decide for himself/herself. Note
that it is still fairly complex.
- There was a lingering performance issue with large number of D-Bus
objects. The patch tries hard that the implementation scales well. Of
course, when we cache N objects that have N-to-M references to other,
we still are fundamentally O(N*M) for runtime and memory consumption (with
M being the number of references between objects). But each part should behave
efficiently and well.
- Play well with GMainContext. libnm code (NMClient) is generally not
thread safe. However, it should work to use multiple instances in
parallel, as long as each access to a NMClient is through the caller's
GMainContext. This follows glib's style and effectively allows to use NMClient
in a multi threaded scenario. This implies to stick to a main context
upon construction and ensure that callbacks are only invoked when
iterating that context. Also, NMClient itself shall never iterate the
caller's context. This also means, libnm must never use g_idle_add() or
g_timeout_add(), as those enqueue sources in the g_main_context_default()
context.
- Get ordering of messages right. All events are consistently enqueued
in a GMainContext and processed strictly in order. For example,
previously "nm-object.c" tried to combine signals and emit them on an
idle handler. That is wrong, signals must be emitted in the right order
and when they happen. Note that when using GInitable's synchronous initialization
to initialize the NMClient instance, NMClient internally still operates fully
asynchronously. In that case NMClient has an internal main context.
- NMClient takes over most of the functionality. When using D-Bus'
ObjectManager interface, one needs to handle basically the entire state
of the D-Bus interface. That cannot be separated well into distinct
parts, and even if you try, you just end up having closely related code
in different source files. Spreading related code does not make it
easier to understand, on the contrary. That means, NMClient is
inherently complex as it contains most of the logic. I think that is
not avoidable, but it's not as bad as it sounds.
- NMClient processes D-Bus messages and state changes in separate steps.
First NMClient unpacks the message (e.g. _dbus_handle_properties_changed()) and
keeps track of the changed data. Then we update the GObject instances
(_dbus_handle_obj_changed_dbus()) without emitting any signals yet. Finally,
we emit all signals and notifications that were collected
(_dbus_handle_changes_commit()). Note that for example during the initial
GetManagedObjects() reply, NMClient receive a large amount of state at once.
But we first apply all the changes to our GObject instances before
emitting any signals. The result is that signals are always emitted in a moment
when the cache is consistent. The unavoidable downside is that when you receive
a property changed signal, possibly many other properties changed
already and more signals are about to be emitted.
- NMDeviceWifi no longer modifies the content of the cache from client side
during poke_wireless_devices_with_rf_status(). The content of the cache
should be determined by D-Bus alone and follow what NetworkManager
service exposes. Local modifications should be avoided.
- This aims to bring no API/ABI change, though it does of course bring
various subtle changes in behavior. Those should be all for the better, but the
goal is not to break any existing clients. This does change internal
(albeit externally visible) API, like dropping NM_OBJECT_DBUS_OBJECT_MANAGER
property and NMObject no longer implementing GInitableIface and GAsyncInitableIface.
- Some uses of gdbus-codegen classes remain in NMVpnPluginOld, NMVpnServicePlugin
and NMSecretAgentOld. These are independent of NMClient/NMObject and
should be reworked separately.
- While we no longer use generated classes from gdbus-codegen, we don't
need more glue code than before. Also before we constructed NMPropertiesInfo and
a had large amount of code to propagate properties from NMDBus* to NMObject.
That got completely reworked, but did not fundamentally change. You still need
about the same effort to create the NMLDBusMetaIface. Not using
generated bindings did not make anything worse (which tells about the
usefulness of generated code, at least in the way it was used).
- NMLDBusMetaIface and other meta data is static and immutable. This
avoids copying them around. Also, macros like NML_DBUS_META_PROPERTY_INIT_U()
have compile time checks to ensure the property types matches. It's pretty hard
to misuse them because it won't compile.
- The meta data now explicitly encodes the expected D-Bus types and
makes sure never to accept wrong data. That would only matter when the
server (accidentally or intentionally) exposes unexpected types on
D-Bus. I don't think that was previously ensured in all cases.
For example, demarshal_generic() only cared about the GObject property
type, it didn't know the expected D-Bus type.
- Previously GDBusObjectManager would sometimes emit warnings (g_log()). Those
probably indicated real bugs. In any case, it prevented us from running CI
with G_DEBUG=fatal-warnings, because there would be just too many
unrelated crashes. Now we log debug messages that can be enabled with
"LIBNM_CLIENT_DEBUG=trace". Some of these messages can also be turned
into g_warning()/g_critical() by setting LIBNM_CLIENT_DEBUG=warning,error.
Together with G_DEBUG=fatal-warnings, this turns them into assertions.
Note that such "assertion failures" might also happen because of a server
bug (or change). Thus these are not common assertions that indicate a bug
in libnm and are thus not armed unless explicitly requested. In our CI we
should now always run with LIBNM_CLIENT_DEBUG=warning,error and
G_DEBUG=fatal-warnings and to catch bugs. Note that currently
NetworkManager has bugs in this regard, so enabling this will result in
assertion failures. That should be fixed first.
- Note that this changes the order in which we emit "notify:devices" and
"device-added" signals. I think it makes the most sense to emit first
"device-removed", then "notify:devices", and finally "device-added"
signals.
This changes behavior for commit 52ae28f6e5bf ('libnm: queue
added/removed signals and suppress uninitialized notifications'),
but I don't think that users should actually rely on the order. Still,
the new order makes the most sense to me.
- In NetworkManager, profiles can be invisible to the user by setting
"connection.permissions". Such profiles would be hidden by NMClient's
nm_client_get_connections() and their "connection-added"/"connection-removed"
signals.
Note that NMActiveConnection's nm_active_connection_get_connection()
and NMDevice's nm_device_get_available_connections() still exposes such
hidden NMRemoteConnection instances. This behavior was preserved.
NUMBERS
-------
I compared 3 versions of libnm.
[1] 962297f9085d, current tip of nm-1-20 branch
[2] 4fad8c7c642e, current master, immediate parent of this patch
[3] this patch
All tests were done on Fedora 31, x86_64, gcc 9.2.1-1.fc31.
The libraries were build with
$ ./contrib/fedora/rpm/build_clean.sh -g -w test -W debug
Note that RPM build already stripped the library.
---
N1) File size of libnm.so.0.1.0 in bytes. There currently seems to be a issue
on Fedora 31 generating wrong ELF notes. Usually, libnm is smaller but
in these tests it had large (and bogus) ELF notes. Anyway, the point
is to show the relative sizes, so it doesn't matter).
[1] 4075552 (102.7%)
[2] 3969624 (100.0%)
[3] 3705208 ( 93.3%)
---
N2) `size /usr/lib64/libnm.so.0.1.0`:
text data bss dec hex filename
[1] 1314569 (102.0%) 69980 ( 94.8%) 10632 ( 80.4%) 1395181 (101.4%) 1549ed /usr/lib64/libnm.so.0.1.0
[2] 1288410 (100.0%) 73796 (100.0%) 13224 (100.0%) 1375430 (100.0%) 14fcc6 /usr/lib64/libnm.so.0.1.0
[3] 1229066 ( 95.4%) 65248 ( 88.4%) 13400 (101.3%) 1307714 ( 95.1%) 13f442 /usr/lib64/libnm.so.0.1.0
---
N3) Performance test with test-client.py. With checkout of [2], run
```
prepare_checkout() {
rm -rf /tmp/nm-test && \
git checkout -B test 4fad8c7c642e && \
git clean -fdx && \
./autogen.sh --prefix=/tmp/nm-test && \
make -j 5 install && \
make -j 5 check-local-clients-tests-test-client
}
prepare_test() {
NM_TEST_REGENERATE=1 NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v
}
do_test() {
for i in {1..10}; do
NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v || return -1
done
echo "done!"
}
prepare_checkout
prepare_test
time do_test
```
[1] real 2m14.497s (101.3%) user 5m26.651s (100.3%) sys 1m40.453s (101.4%)
[2] real 2m12.800s (100.0%) user 5m25.619s (100.0%) sys 1m39.065s (100.0%)
[3] real 1m54.915s ( 86.5%) user 4m18.585s ( 79.4%) sys 1m32.066s ( 92.9%)
---
N4) Performance. Run NetworkManager from build [2] and setup a large number
of profiles (551 profiles and 515 devices, mostly unrealized). This
setup is already at the edge of what NetworkManager currently can
handle. Of course, that is a different issue. Here we just check how
long plain `nmcli` takes on the system.
```
do_cleanup() {
for UUID in $(nmcli -g NAME,UUID connection show | sed -n 's/^xx-c-.*:\([^:]\+\)$/\1/p'); do
nmcli connection delete uuid "$UUID"
done
for DEVICE in $(nmcli -g DEVICE device status | grep '^xx-i-'); do
nmcli device delete "$DEVICE"
done
}
do_setup() {
do_cleanup
for i in {1..30}; do
nmcli connection add type bond autoconnect no con-name xx-c-bond-$i ifname xx-i-bond-$i ipv4.method disabled ipv6.method ignore
for j in $(seq $i 30); do
nmcli connection add type vlan autoconnect no con-name xx-c-vlan-$i-$j vlan.id $j ifname xx-i-vlan-$i-$j vlan.parent xx-i-bond-$i ipv4.method disabled ipv6.method ignore
done
done
systemctl restart NetworkManager.service
sleep 5
}
do_test() {
perf stat -r 50 -B nmcli 1>/dev/null
}
do_test
```
[1]
Performance counter stats for 'nmcli' (50 runs):
456.33 msec task-clock:u # 1.093 CPUs utilized ( +- 0.44% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,900 page-faults:u # 0.013 M/sec ( +- 0.02% )
1,408,675,453 cycles:u # 3.087 GHz ( +- 0.48% )
1,594,741,060 instructions:u # 1.13 insn per cycle ( +- 0.02% )
368,744,018 branches:u # 808.061 M/sec ( +- 0.02% )
4,566,058 branch-misses:u # 1.24% of all branches ( +- 0.76% )
0.41761 +- 0.00282 seconds time elapsed ( +- 0.68% )
[2]
Performance counter stats for 'nmcli' (50 runs):
477.99 msec task-clock:u # 1.088 CPUs utilized ( +- 0.36% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,948 page-faults:u # 0.012 M/sec ( +- 0.03% )
1,471,133,482 cycles:u # 3.078 GHz ( +- 0.36% )
1,655,275,369 instructions:u # 1.13 insn per cycle ( +- 0.02% )
382,595,152 branches:u # 800.433 M/sec ( +- 0.02% )
4,746,070 branch-misses:u # 1.24% of all branches ( +- 0.49% )
0.43923 +- 0.00242 seconds time elapsed ( +- 0.55% )
[3]
Performance counter stats for 'nmcli' (50 runs):
352.36 msec task-clock:u # 1.027 CPUs utilized ( +- 0.32% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
4,790 page-faults:u # 0.014 M/sec ( +- 0.26% )
1,092,341,186 cycles:u # 3.100 GHz ( +- 0.26% )
1,209,045,283 instructions:u # 1.11 insn per cycle ( +- 0.02% )
281,708,462 branches:u # 799.499 M/sec ( +- 0.01% )
3,101,031 branch-misses:u # 1.10% of all branches ( +- 0.61% )
0.34296 +- 0.00120 seconds time elapsed ( +- 0.35% )
---
N5) same setup as N4), but run `PAGER= /bin/time -v nmcli`:
[1]
Command being timed: "nmcli"
User time (seconds): 0.42
System time (seconds): 0.04
Percent of CPU this job got: 107%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.43
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34456
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6128
Voluntary context switches: 1298
Involuntary context switches: 1106
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[2]
Command being timed: "nmcli"
User time (seconds): 0.44
System time (seconds): 0.04
Percent of CPU this job got: 108%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34452
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6169
Voluntary context switches: 1849
Involuntary context switches: 142
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[3]
Command being timed: "nmcli"
User time (seconds): 0.32
System time (seconds): 0.02
Percent of CPU this job got: 102%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 29196
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 5059
Voluntary context switches: 919
Involuntary context switches: 685
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
---
N6) same setup as N4), but run `nmcli monitor` and look at `ps aux` for
the RSS size.
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
[1] me 1492900 21.0 0.2 461348 33248 pts/10 Sl+ 15:02 0:00 nmcli monitor
[2] me 1490721 5.0 0.2 461496 33548 pts/10 Sl+ 15:00 0:00 nmcli monitor
[3] me 1495801 16.5 0.1 459476 28692 pts/10 Sl+ 15:04 0:00 nmcli monitor
2019-10-30 10:42:58 +00:00
|
|
|
$(NULL)
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm_lib_c_real = \
|
libnm: refactor caching of D-Bus objects in NMClient
No longer use GDBusObjectMangaerClient and gdbus-codegen generated classes
for the NMClient cache. Instead, use GDBusConnection directly and a
custom implementation (NMLDBusObject) for caching D-Bus' ObjectManager
data.
CHANGES
-------
- This is a complete rework. I think the previous implementation was
difficult to understand. There were unfixed bugs and nobody understood
the code well enough to fix them. Maybe somebody out there understood the
code, but I certainly did not. At least nobody provided patches to fix those
issues. I do believe that this implementation is more straightforward and
easier to understand. It removes a lot of layers of code. Whether this claim
of simplicity is true, each reader must decide for himself/herself. Note
that it is still fairly complex.
- There was a lingering performance issue with large number of D-Bus
objects. The patch tries hard that the implementation scales well. Of
course, when we cache N objects that have N-to-M references to other,
we still are fundamentally O(N*M) for runtime and memory consumption (with
M being the number of references between objects). But each part should behave
efficiently and well.
- Play well with GMainContext. libnm code (NMClient) is generally not
thread safe. However, it should work to use multiple instances in
parallel, as long as each access to a NMClient is through the caller's
GMainContext. This follows glib's style and effectively allows to use NMClient
in a multi threaded scenario. This implies to stick to a main context
upon construction and ensure that callbacks are only invoked when
iterating that context. Also, NMClient itself shall never iterate the
caller's context. This also means, libnm must never use g_idle_add() or
g_timeout_add(), as those enqueue sources in the g_main_context_default()
context.
- Get ordering of messages right. All events are consistently enqueued
in a GMainContext and processed strictly in order. For example,
previously "nm-object.c" tried to combine signals and emit them on an
idle handler. That is wrong, signals must be emitted in the right order
and when they happen. Note that when using GInitable's synchronous initialization
to initialize the NMClient instance, NMClient internally still operates fully
asynchronously. In that case NMClient has an internal main context.
- NMClient takes over most of the functionality. When using D-Bus'
ObjectManager interface, one needs to handle basically the entire state
of the D-Bus interface. That cannot be separated well into distinct
parts, and even if you try, you just end up having closely related code
in different source files. Spreading related code does not make it
easier to understand, on the contrary. That means, NMClient is
inherently complex as it contains most of the logic. I think that is
not avoidable, but it's not as bad as it sounds.
- NMClient processes D-Bus messages and state changes in separate steps.
First NMClient unpacks the message (e.g. _dbus_handle_properties_changed()) and
keeps track of the changed data. Then we update the GObject instances
(_dbus_handle_obj_changed_dbus()) without emitting any signals yet. Finally,
we emit all signals and notifications that were collected
(_dbus_handle_changes_commit()). Note that for example during the initial
GetManagedObjects() reply, NMClient receive a large amount of state at once.
But we first apply all the changes to our GObject instances before
emitting any signals. The result is that signals are always emitted in a moment
when the cache is consistent. The unavoidable downside is that when you receive
a property changed signal, possibly many other properties changed
already and more signals are about to be emitted.
- NMDeviceWifi no longer modifies the content of the cache from client side
during poke_wireless_devices_with_rf_status(). The content of the cache
should be determined by D-Bus alone and follow what NetworkManager
service exposes. Local modifications should be avoided.
- This aims to bring no API/ABI change, though it does of course bring
various subtle changes in behavior. Those should be all for the better, but the
goal is not to break any existing clients. This does change internal
(albeit externally visible) API, like dropping NM_OBJECT_DBUS_OBJECT_MANAGER
property and NMObject no longer implementing GInitableIface and GAsyncInitableIface.
- Some uses of gdbus-codegen classes remain in NMVpnPluginOld, NMVpnServicePlugin
and NMSecretAgentOld. These are independent of NMClient/NMObject and
should be reworked separately.
- While we no longer use generated classes from gdbus-codegen, we don't
need more glue code than before. Also before we constructed NMPropertiesInfo and
a had large amount of code to propagate properties from NMDBus* to NMObject.
That got completely reworked, but did not fundamentally change. You still need
about the same effort to create the NMLDBusMetaIface. Not using
generated bindings did not make anything worse (which tells about the
usefulness of generated code, at least in the way it was used).
- NMLDBusMetaIface and other meta data is static and immutable. This
avoids copying them around. Also, macros like NML_DBUS_META_PROPERTY_INIT_U()
have compile time checks to ensure the property types matches. It's pretty hard
to misuse them because it won't compile.
- The meta data now explicitly encodes the expected D-Bus types and
makes sure never to accept wrong data. That would only matter when the
server (accidentally or intentionally) exposes unexpected types on
D-Bus. I don't think that was previously ensured in all cases.
For example, demarshal_generic() only cared about the GObject property
type, it didn't know the expected D-Bus type.
- Previously GDBusObjectManager would sometimes emit warnings (g_log()). Those
probably indicated real bugs. In any case, it prevented us from running CI
with G_DEBUG=fatal-warnings, because there would be just too many
unrelated crashes. Now we log debug messages that can be enabled with
"LIBNM_CLIENT_DEBUG=trace". Some of these messages can also be turned
into g_warning()/g_critical() by setting LIBNM_CLIENT_DEBUG=warning,error.
Together with G_DEBUG=fatal-warnings, this turns them into assertions.
Note that such "assertion failures" might also happen because of a server
bug (or change). Thus these are not common assertions that indicate a bug
in libnm and are thus not armed unless explicitly requested. In our CI we
should now always run with LIBNM_CLIENT_DEBUG=warning,error and
G_DEBUG=fatal-warnings and to catch bugs. Note that currently
NetworkManager has bugs in this regard, so enabling this will result in
assertion failures. That should be fixed first.
- Note that this changes the order in which we emit "notify:devices" and
"device-added" signals. I think it makes the most sense to emit first
"device-removed", then "notify:devices", and finally "device-added"
signals.
This changes behavior for commit 52ae28f6e5bf ('libnm: queue
added/removed signals and suppress uninitialized notifications'),
but I don't think that users should actually rely on the order. Still,
the new order makes the most sense to me.
- In NetworkManager, profiles can be invisible to the user by setting
"connection.permissions". Such profiles would be hidden by NMClient's
nm_client_get_connections() and their "connection-added"/"connection-removed"
signals.
Note that NMActiveConnection's nm_active_connection_get_connection()
and NMDevice's nm_device_get_available_connections() still exposes such
hidden NMRemoteConnection instances. This behavior was preserved.
NUMBERS
-------
I compared 3 versions of libnm.
[1] 962297f9085d, current tip of nm-1-20 branch
[2] 4fad8c7c642e, current master, immediate parent of this patch
[3] this patch
All tests were done on Fedora 31, x86_64, gcc 9.2.1-1.fc31.
The libraries were build with
$ ./contrib/fedora/rpm/build_clean.sh -g -w test -W debug
Note that RPM build already stripped the library.
---
N1) File size of libnm.so.0.1.0 in bytes. There currently seems to be a issue
on Fedora 31 generating wrong ELF notes. Usually, libnm is smaller but
in these tests it had large (and bogus) ELF notes. Anyway, the point
is to show the relative sizes, so it doesn't matter).
[1] 4075552 (102.7%)
[2] 3969624 (100.0%)
[3] 3705208 ( 93.3%)
---
N2) `size /usr/lib64/libnm.so.0.1.0`:
text data bss dec hex filename
[1] 1314569 (102.0%) 69980 ( 94.8%) 10632 ( 80.4%) 1395181 (101.4%) 1549ed /usr/lib64/libnm.so.0.1.0
[2] 1288410 (100.0%) 73796 (100.0%) 13224 (100.0%) 1375430 (100.0%) 14fcc6 /usr/lib64/libnm.so.0.1.0
[3] 1229066 ( 95.4%) 65248 ( 88.4%) 13400 (101.3%) 1307714 ( 95.1%) 13f442 /usr/lib64/libnm.so.0.1.0
---
N3) Performance test with test-client.py. With checkout of [2], run
```
prepare_checkout() {
rm -rf /tmp/nm-test && \
git checkout -B test 4fad8c7c642e && \
git clean -fdx && \
./autogen.sh --prefix=/tmp/nm-test && \
make -j 5 install && \
make -j 5 check-local-clients-tests-test-client
}
prepare_test() {
NM_TEST_REGENERATE=1 NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v
}
do_test() {
for i in {1..10}; do
NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v || return -1
done
echo "done!"
}
prepare_checkout
prepare_test
time do_test
```
[1] real 2m14.497s (101.3%) user 5m26.651s (100.3%) sys 1m40.453s (101.4%)
[2] real 2m12.800s (100.0%) user 5m25.619s (100.0%) sys 1m39.065s (100.0%)
[3] real 1m54.915s ( 86.5%) user 4m18.585s ( 79.4%) sys 1m32.066s ( 92.9%)
---
N4) Performance. Run NetworkManager from build [2] and setup a large number
of profiles (551 profiles and 515 devices, mostly unrealized). This
setup is already at the edge of what NetworkManager currently can
handle. Of course, that is a different issue. Here we just check how
long plain `nmcli` takes on the system.
```
do_cleanup() {
for UUID in $(nmcli -g NAME,UUID connection show | sed -n 's/^xx-c-.*:\([^:]\+\)$/\1/p'); do
nmcli connection delete uuid "$UUID"
done
for DEVICE in $(nmcli -g DEVICE device status | grep '^xx-i-'); do
nmcli device delete "$DEVICE"
done
}
do_setup() {
do_cleanup
for i in {1..30}; do
nmcli connection add type bond autoconnect no con-name xx-c-bond-$i ifname xx-i-bond-$i ipv4.method disabled ipv6.method ignore
for j in $(seq $i 30); do
nmcli connection add type vlan autoconnect no con-name xx-c-vlan-$i-$j vlan.id $j ifname xx-i-vlan-$i-$j vlan.parent xx-i-bond-$i ipv4.method disabled ipv6.method ignore
done
done
systemctl restart NetworkManager.service
sleep 5
}
do_test() {
perf stat -r 50 -B nmcli 1>/dev/null
}
do_test
```
[1]
Performance counter stats for 'nmcli' (50 runs):
456.33 msec task-clock:u # 1.093 CPUs utilized ( +- 0.44% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,900 page-faults:u # 0.013 M/sec ( +- 0.02% )
1,408,675,453 cycles:u # 3.087 GHz ( +- 0.48% )
1,594,741,060 instructions:u # 1.13 insn per cycle ( +- 0.02% )
368,744,018 branches:u # 808.061 M/sec ( +- 0.02% )
4,566,058 branch-misses:u # 1.24% of all branches ( +- 0.76% )
0.41761 +- 0.00282 seconds time elapsed ( +- 0.68% )
[2]
Performance counter stats for 'nmcli' (50 runs):
477.99 msec task-clock:u # 1.088 CPUs utilized ( +- 0.36% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,948 page-faults:u # 0.012 M/sec ( +- 0.03% )
1,471,133,482 cycles:u # 3.078 GHz ( +- 0.36% )
1,655,275,369 instructions:u # 1.13 insn per cycle ( +- 0.02% )
382,595,152 branches:u # 800.433 M/sec ( +- 0.02% )
4,746,070 branch-misses:u # 1.24% of all branches ( +- 0.49% )
0.43923 +- 0.00242 seconds time elapsed ( +- 0.55% )
[3]
Performance counter stats for 'nmcli' (50 runs):
352.36 msec task-clock:u # 1.027 CPUs utilized ( +- 0.32% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
4,790 page-faults:u # 0.014 M/sec ( +- 0.26% )
1,092,341,186 cycles:u # 3.100 GHz ( +- 0.26% )
1,209,045,283 instructions:u # 1.11 insn per cycle ( +- 0.02% )
281,708,462 branches:u # 799.499 M/sec ( +- 0.01% )
3,101,031 branch-misses:u # 1.10% of all branches ( +- 0.61% )
0.34296 +- 0.00120 seconds time elapsed ( +- 0.35% )
---
N5) same setup as N4), but run `PAGER= /bin/time -v nmcli`:
[1]
Command being timed: "nmcli"
User time (seconds): 0.42
System time (seconds): 0.04
Percent of CPU this job got: 107%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.43
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34456
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6128
Voluntary context switches: 1298
Involuntary context switches: 1106
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[2]
Command being timed: "nmcli"
User time (seconds): 0.44
System time (seconds): 0.04
Percent of CPU this job got: 108%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34452
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6169
Voluntary context switches: 1849
Involuntary context switches: 142
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[3]
Command being timed: "nmcli"
User time (seconds): 0.32
System time (seconds): 0.02
Percent of CPU this job got: 102%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 29196
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 5059
Voluntary context switches: 919
Involuntary context switches: 685
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
---
N6) same setup as N4), but run `nmcli monitor` and look at `ps aux` for
the RSS size.
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
[1] me 1492900 21.0 0.2 461348 33248 pts/10 Sl+ 15:02 0:00 nmcli monitor
[2] me 1490721 5.0 0.2 461496 33548 pts/10 Sl+ 15:00 0:00 nmcli monitor
[3] me 1495801 16.5 0.1 459476 28692 pts/10 Sl+ 15:04 0:00 nmcli monitor
2019-10-30 10:42:58 +00:00
|
|
|
libnm/nm-client.c \
|
|
|
|
|
libnm/nm-object.c \
|
|
|
|
|
libnm/nm-device.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-active-connection.c \
|
libnm: refactor caching of D-Bus objects in NMClient
No longer use GDBusObjectMangaerClient and gdbus-codegen generated classes
for the NMClient cache. Instead, use GDBusConnection directly and a
custom implementation (NMLDBusObject) for caching D-Bus' ObjectManager
data.
CHANGES
-------
- This is a complete rework. I think the previous implementation was
difficult to understand. There were unfixed bugs and nobody understood
the code well enough to fix them. Maybe somebody out there understood the
code, but I certainly did not. At least nobody provided patches to fix those
issues. I do believe that this implementation is more straightforward and
easier to understand. It removes a lot of layers of code. Whether this claim
of simplicity is true, each reader must decide for himself/herself. Note
that it is still fairly complex.
- There was a lingering performance issue with large number of D-Bus
objects. The patch tries hard that the implementation scales well. Of
course, when we cache N objects that have N-to-M references to other,
we still are fundamentally O(N*M) for runtime and memory consumption (with
M being the number of references between objects). But each part should behave
efficiently and well.
- Play well with GMainContext. libnm code (NMClient) is generally not
thread safe. However, it should work to use multiple instances in
parallel, as long as each access to a NMClient is through the caller's
GMainContext. This follows glib's style and effectively allows to use NMClient
in a multi threaded scenario. This implies to stick to a main context
upon construction and ensure that callbacks are only invoked when
iterating that context. Also, NMClient itself shall never iterate the
caller's context. This also means, libnm must never use g_idle_add() or
g_timeout_add(), as those enqueue sources in the g_main_context_default()
context.
- Get ordering of messages right. All events are consistently enqueued
in a GMainContext and processed strictly in order. For example,
previously "nm-object.c" tried to combine signals and emit them on an
idle handler. That is wrong, signals must be emitted in the right order
and when they happen. Note that when using GInitable's synchronous initialization
to initialize the NMClient instance, NMClient internally still operates fully
asynchronously. In that case NMClient has an internal main context.
- NMClient takes over most of the functionality. When using D-Bus'
ObjectManager interface, one needs to handle basically the entire state
of the D-Bus interface. That cannot be separated well into distinct
parts, and even if you try, you just end up having closely related code
in different source files. Spreading related code does not make it
easier to understand, on the contrary. That means, NMClient is
inherently complex as it contains most of the logic. I think that is
not avoidable, but it's not as bad as it sounds.
- NMClient processes D-Bus messages and state changes in separate steps.
First NMClient unpacks the message (e.g. _dbus_handle_properties_changed()) and
keeps track of the changed data. Then we update the GObject instances
(_dbus_handle_obj_changed_dbus()) without emitting any signals yet. Finally,
we emit all signals and notifications that were collected
(_dbus_handle_changes_commit()). Note that for example during the initial
GetManagedObjects() reply, NMClient receive a large amount of state at once.
But we first apply all the changes to our GObject instances before
emitting any signals. The result is that signals are always emitted in a moment
when the cache is consistent. The unavoidable downside is that when you receive
a property changed signal, possibly many other properties changed
already and more signals are about to be emitted.
- NMDeviceWifi no longer modifies the content of the cache from client side
during poke_wireless_devices_with_rf_status(). The content of the cache
should be determined by D-Bus alone and follow what NetworkManager
service exposes. Local modifications should be avoided.
- This aims to bring no API/ABI change, though it does of course bring
various subtle changes in behavior. Those should be all for the better, but the
goal is not to break any existing clients. This does change internal
(albeit externally visible) API, like dropping NM_OBJECT_DBUS_OBJECT_MANAGER
property and NMObject no longer implementing GInitableIface and GAsyncInitableIface.
- Some uses of gdbus-codegen classes remain in NMVpnPluginOld, NMVpnServicePlugin
and NMSecretAgentOld. These are independent of NMClient/NMObject and
should be reworked separately.
- While we no longer use generated classes from gdbus-codegen, we don't
need more glue code than before. Also before we constructed NMPropertiesInfo and
a had large amount of code to propagate properties from NMDBus* to NMObject.
That got completely reworked, but did not fundamentally change. You still need
about the same effort to create the NMLDBusMetaIface. Not using
generated bindings did not make anything worse (which tells about the
usefulness of generated code, at least in the way it was used).
- NMLDBusMetaIface and other meta data is static and immutable. This
avoids copying them around. Also, macros like NML_DBUS_META_PROPERTY_INIT_U()
have compile time checks to ensure the property types matches. It's pretty hard
to misuse them because it won't compile.
- The meta data now explicitly encodes the expected D-Bus types and
makes sure never to accept wrong data. That would only matter when the
server (accidentally or intentionally) exposes unexpected types on
D-Bus. I don't think that was previously ensured in all cases.
For example, demarshal_generic() only cared about the GObject property
type, it didn't know the expected D-Bus type.
- Previously GDBusObjectManager would sometimes emit warnings (g_log()). Those
probably indicated real bugs. In any case, it prevented us from running CI
with G_DEBUG=fatal-warnings, because there would be just too many
unrelated crashes. Now we log debug messages that can be enabled with
"LIBNM_CLIENT_DEBUG=trace". Some of these messages can also be turned
into g_warning()/g_critical() by setting LIBNM_CLIENT_DEBUG=warning,error.
Together with G_DEBUG=fatal-warnings, this turns them into assertions.
Note that such "assertion failures" might also happen because of a server
bug (or change). Thus these are not common assertions that indicate a bug
in libnm and are thus not armed unless explicitly requested. In our CI we
should now always run with LIBNM_CLIENT_DEBUG=warning,error and
G_DEBUG=fatal-warnings and to catch bugs. Note that currently
NetworkManager has bugs in this regard, so enabling this will result in
assertion failures. That should be fixed first.
- Note that this changes the order in which we emit "notify:devices" and
"device-added" signals. I think it makes the most sense to emit first
"device-removed", then "notify:devices", and finally "device-added"
signals.
This changes behavior for commit 52ae28f6e5bf ('libnm: queue
added/removed signals and suppress uninitialized notifications'),
but I don't think that users should actually rely on the order. Still,
the new order makes the most sense to me.
- In NetworkManager, profiles can be invisible to the user by setting
"connection.permissions". Such profiles would be hidden by NMClient's
nm_client_get_connections() and their "connection-added"/"connection-removed"
signals.
Note that NMActiveConnection's nm_active_connection_get_connection()
and NMDevice's nm_device_get_available_connections() still exposes such
hidden NMRemoteConnection instances. This behavior was preserved.
NUMBERS
-------
I compared 3 versions of libnm.
[1] 962297f9085d, current tip of nm-1-20 branch
[2] 4fad8c7c642e, current master, immediate parent of this patch
[3] this patch
All tests were done on Fedora 31, x86_64, gcc 9.2.1-1.fc31.
The libraries were build with
$ ./contrib/fedora/rpm/build_clean.sh -g -w test -W debug
Note that RPM build already stripped the library.
---
N1) File size of libnm.so.0.1.0 in bytes. There currently seems to be a issue
on Fedora 31 generating wrong ELF notes. Usually, libnm is smaller but
in these tests it had large (and bogus) ELF notes. Anyway, the point
is to show the relative sizes, so it doesn't matter).
[1] 4075552 (102.7%)
[2] 3969624 (100.0%)
[3] 3705208 ( 93.3%)
---
N2) `size /usr/lib64/libnm.so.0.1.0`:
text data bss dec hex filename
[1] 1314569 (102.0%) 69980 ( 94.8%) 10632 ( 80.4%) 1395181 (101.4%) 1549ed /usr/lib64/libnm.so.0.1.0
[2] 1288410 (100.0%) 73796 (100.0%) 13224 (100.0%) 1375430 (100.0%) 14fcc6 /usr/lib64/libnm.so.0.1.0
[3] 1229066 ( 95.4%) 65248 ( 88.4%) 13400 (101.3%) 1307714 ( 95.1%) 13f442 /usr/lib64/libnm.so.0.1.0
---
N3) Performance test with test-client.py. With checkout of [2], run
```
prepare_checkout() {
rm -rf /tmp/nm-test && \
git checkout -B test 4fad8c7c642e && \
git clean -fdx && \
./autogen.sh --prefix=/tmp/nm-test && \
make -j 5 install && \
make -j 5 check-local-clients-tests-test-client
}
prepare_test() {
NM_TEST_REGENERATE=1 NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v
}
do_test() {
for i in {1..10}; do
NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v || return -1
done
echo "done!"
}
prepare_checkout
prepare_test
time do_test
```
[1] real 2m14.497s (101.3%) user 5m26.651s (100.3%) sys 1m40.453s (101.4%)
[2] real 2m12.800s (100.0%) user 5m25.619s (100.0%) sys 1m39.065s (100.0%)
[3] real 1m54.915s ( 86.5%) user 4m18.585s ( 79.4%) sys 1m32.066s ( 92.9%)
---
N4) Performance. Run NetworkManager from build [2] and setup a large number
of profiles (551 profiles and 515 devices, mostly unrealized). This
setup is already at the edge of what NetworkManager currently can
handle. Of course, that is a different issue. Here we just check how
long plain `nmcli` takes on the system.
```
do_cleanup() {
for UUID in $(nmcli -g NAME,UUID connection show | sed -n 's/^xx-c-.*:\([^:]\+\)$/\1/p'); do
nmcli connection delete uuid "$UUID"
done
for DEVICE in $(nmcli -g DEVICE device status | grep '^xx-i-'); do
nmcli device delete "$DEVICE"
done
}
do_setup() {
do_cleanup
for i in {1..30}; do
nmcli connection add type bond autoconnect no con-name xx-c-bond-$i ifname xx-i-bond-$i ipv4.method disabled ipv6.method ignore
for j in $(seq $i 30); do
nmcli connection add type vlan autoconnect no con-name xx-c-vlan-$i-$j vlan.id $j ifname xx-i-vlan-$i-$j vlan.parent xx-i-bond-$i ipv4.method disabled ipv6.method ignore
done
done
systemctl restart NetworkManager.service
sleep 5
}
do_test() {
perf stat -r 50 -B nmcli 1>/dev/null
}
do_test
```
[1]
Performance counter stats for 'nmcli' (50 runs):
456.33 msec task-clock:u # 1.093 CPUs utilized ( +- 0.44% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,900 page-faults:u # 0.013 M/sec ( +- 0.02% )
1,408,675,453 cycles:u # 3.087 GHz ( +- 0.48% )
1,594,741,060 instructions:u # 1.13 insn per cycle ( +- 0.02% )
368,744,018 branches:u # 808.061 M/sec ( +- 0.02% )
4,566,058 branch-misses:u # 1.24% of all branches ( +- 0.76% )
0.41761 +- 0.00282 seconds time elapsed ( +- 0.68% )
[2]
Performance counter stats for 'nmcli' (50 runs):
477.99 msec task-clock:u # 1.088 CPUs utilized ( +- 0.36% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,948 page-faults:u # 0.012 M/sec ( +- 0.03% )
1,471,133,482 cycles:u # 3.078 GHz ( +- 0.36% )
1,655,275,369 instructions:u # 1.13 insn per cycle ( +- 0.02% )
382,595,152 branches:u # 800.433 M/sec ( +- 0.02% )
4,746,070 branch-misses:u # 1.24% of all branches ( +- 0.49% )
0.43923 +- 0.00242 seconds time elapsed ( +- 0.55% )
[3]
Performance counter stats for 'nmcli' (50 runs):
352.36 msec task-clock:u # 1.027 CPUs utilized ( +- 0.32% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
4,790 page-faults:u # 0.014 M/sec ( +- 0.26% )
1,092,341,186 cycles:u # 3.100 GHz ( +- 0.26% )
1,209,045,283 instructions:u # 1.11 insn per cycle ( +- 0.02% )
281,708,462 branches:u # 799.499 M/sec ( +- 0.01% )
3,101,031 branch-misses:u # 1.10% of all branches ( +- 0.61% )
0.34296 +- 0.00120 seconds time elapsed ( +- 0.35% )
---
N5) same setup as N4), but run `PAGER= /bin/time -v nmcli`:
[1]
Command being timed: "nmcli"
User time (seconds): 0.42
System time (seconds): 0.04
Percent of CPU this job got: 107%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.43
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34456
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6128
Voluntary context switches: 1298
Involuntary context switches: 1106
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[2]
Command being timed: "nmcli"
User time (seconds): 0.44
System time (seconds): 0.04
Percent of CPU this job got: 108%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34452
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6169
Voluntary context switches: 1849
Involuntary context switches: 142
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[3]
Command being timed: "nmcli"
User time (seconds): 0.32
System time (seconds): 0.02
Percent of CPU this job got: 102%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 29196
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 5059
Voluntary context switches: 919
Involuntary context switches: 685
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
---
N6) same setup as N4), but run `nmcli monitor` and look at `ps aux` for
the RSS size.
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
[1] me 1492900 21.0 0.2 461348 33248 pts/10 Sl+ 15:02 0:00 nmcli monitor
[2] me 1490721 5.0 0.2 461496 33548 pts/10 Sl+ 15:00 0:00 nmcli monitor
[3] me 1495801 16.5 0.1 459476 28692 pts/10 Sl+ 15:04 0:00 nmcli monitor
2019-10-30 10:42:58 +00:00
|
|
|
\
|
|
|
|
|
libnm/nm-access-point.c \
|
2017-10-21 14:05:19 +00:00
|
|
|
libnm/nm-checkpoint.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-dbus-helpers.c \
|
2018-05-22 14:45:05 +00:00
|
|
|
libnm/nm-device-6lowpan.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-adsl.c \
|
|
|
|
|
libnm/nm-device-bond.c \
|
|
|
|
|
libnm/nm-device-bridge.c \
|
|
|
|
|
libnm/nm-device-bt.c \
|
2017-01-31 13:14:33 +00:00
|
|
|
libnm/nm-device-dummy.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-ethernet.c \
|
|
|
|
|
libnm/nm-device-generic.c \
|
|
|
|
|
libnm/nm-device-infiniband.c \
|
|
|
|
|
libnm/nm-device-ip-tunnel.c \
|
2016-06-30 16:20:22 +00:00
|
|
|
libnm/nm-device-macsec.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-macvlan.c \
|
|
|
|
|
libnm/nm-device-modem.c \
|
|
|
|
|
libnm/nm-device-olpc-mesh.c \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-device-ovs-bridge.c \
|
2017-10-10 09:04:32 +00:00
|
|
|
libnm/nm-device-ovs-interface.c \
|
2017-10-10 09:04:32 +00:00
|
|
|
libnm/nm-device-ovs-port.c \
|
2017-06-06 13:55:08 +00:00
|
|
|
libnm/nm-device-ppp.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-team.c \
|
|
|
|
|
libnm/nm-device-tun.c \
|
|
|
|
|
libnm/nm-device-vlan.c \
|
|
|
|
|
libnm/nm-device-vxlan.c \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-device-wifi-p2p.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-device-wifi.c \
|
|
|
|
|
libnm/nm-device-wimax.c \
|
2018-03-13 13:42:38 +00:00
|
|
|
libnm/nm-device-wireguard.c \
|
2018-03-09 16:19:36 +00:00
|
|
|
libnm/nm-device-wpan.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-dhcp-config.c \
|
|
|
|
|
libnm/nm-dhcp4-config.c \
|
|
|
|
|
libnm/nm-dhcp6-config.c \
|
2016-10-25 09:11:12 +00:00
|
|
|
libnm/nm-dns-manager.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-ip-config.c \
|
|
|
|
|
libnm/nm-ip4-config.c \
|
|
|
|
|
libnm/nm-ip6-config.c \
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm/nm-libnm-utils.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-remote-connection.c \
|
|
|
|
|
libnm/nm-secret-agent-old.c \
|
|
|
|
|
libnm/nm-vpn-connection.c \
|
|
|
|
|
libnm/nm-vpn-editor.c \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-vpn-plugin-old.c \
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/nm-vpn-service-plugin.c \
|
2019-01-28 11:39:38 +00:00
|
|
|
libnm/nm-wifi-p2p-peer.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
libnm/nm-wimax-nsp.c \
|
|
|
|
|
$(NULL)
|
2016-11-20 13:40:38 +00:00
|
|
|
libnm_lib_c_mkenums = \
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm/nm-enum-types.c
|
|
|
|
|
|
2017-05-19 08:19:25 +00:00
|
|
|
libnm_lib_cppflags = \
|
|
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(dflt_cppflags_libnm_core) \
|
2017-05-19 08:19:25 +00:00
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
|
2018-05-30 08:23:17 +00:00
|
|
|
$(NULL)
|
2017-05-19 08:19:25 +00:00
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
libnminclude_HEADERS += \
|
2017-12-15 13:35:32 +00:00
|
|
|
$(libnm_lib_h_pub_real)
|
2016-11-15 13:35:48 +00:00
|
|
|
|
|
|
|
|
nodist_libnminclude_HEADERS += \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_lib_h_pub_mkenums)
|
2016-11-15 13:35:48 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-05-15 09:20:33 +00:00
|
|
|
noinst_LTLIBRARIES += libnm/liblibnm.la
|
2017-05-19 08:19:25 +00:00
|
|
|
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm_liblibnm_la_CPPFLAGS = \
|
2017-11-04 19:41:45 +00:00
|
|
|
$(INTROSPECTION_CFLAGS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(libnm_lib_cppflags) \
|
|
|
|
|
$(NULL)
|
2017-05-19 08:19:25 +00:00
|
|
|
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm_liblibnm_la_SOURCES = \
|
|
|
|
|
$(libnm_lib_c_real) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(NULL)
|
2017-05-19 08:19:25 +00:00
|
|
|
|
2019-10-17 06:41:01 +00:00
|
|
|
nodist_libnm_liblibnm_la_SOURCES = \
|
|
|
|
|
$(libnm_lib_h_pub_mkenums) \
|
|
|
|
|
$(libnm_lib_c_mkenums) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm_liblibnm_la_LIBADD = \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
2017-05-19 08:19:25 +00:00
|
|
|
libnm-core/libnm-core.la \
|
2018-08-30 06:30:19 +00:00
|
|
|
$(libnm_crypto_lib) \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
2017-05-19 08:19:25 +00:00
|
|
|
introspection/libnmdbus.la \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:20:33 +00:00
|
|
|
shared/systemd/libnm-systemd-shared.la \
|
|
|
|
|
shared/systemd/libnm-systemd-logging-stub.la \
|
|
|
|
|
shared/nm-udev-aux/libnm-udev-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
shared/libcsiphash.la \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_LIBS) \
|
2019-05-15 09:20:33 +00:00
|
|
|
$(DL_LIBS) \
|
|
|
|
|
$(UUID_LIBS) \
|
2019-05-15 09:57:36 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(NULL)
|
2017-05-19 08:19:25 +00:00
|
|
|
|
2019-05-15 09:20:33 +00:00
|
|
|
$(libnm_liblibnm_la_OBJECTS) : $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_liblibnm_la_OBJECTS) : $(libnm_core_lib_h_pub_mkenums)
|
2017-05-19 08:19:25 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
lib_LTLIBRARIES += libnm/libnm.la
|
|
|
|
|
|
|
|
|
|
GLIB_GENERATED += \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_lib_h_pub_mkenums) \
|
|
|
|
|
$(libnm_lib_c_mkenums)
|
2016-11-15 13:35:48 +00:00
|
|
|
nm_enum_types_sources = \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_lib_h_pub_mkenums) \
|
2017-12-15 13:35:32 +00:00
|
|
|
$(libnm_lib_h_pub_real)
|
2016-11-15 13:35:48 +00:00
|
|
|
nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
|
|
|
|
|
nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
|
|
|
|
|
|
2016-11-22 17:09:19 +00:00
|
|
|
$(dispatcher_nm_dispatcher_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
$(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2016-11-20 14:03:45 +00:00
|
|
|
|
2016-11-15 13:35:48 +00:00
|
|
|
libnm_libnm_la_CPPFLAGS = \
|
2017-05-19 08:19:25 +00:00
|
|
|
$(libnm_lib_cppflags) \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(LIBUDEV_CFLAGS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
$(NULL)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
libnm_libnm_la_SOURCES = \
|
2016-11-15 13:35:48 +00:00
|
|
|
$(libnm_lib_h_pub_real) \
|
|
|
|
|
$(libnm_lib_h_priv) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(NULL)
|
2016-11-15 13:35:48 +00:00
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
EXTRA_libnm_libnm_la_DEPENDENCIES = \
|
|
|
|
|
libnm/libnm.ver
|
|
|
|
|
|
|
|
|
|
libnm_libnm_la_LIBADD = \
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm/liblibnm.la \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(NULL)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
libnm_libnm_la_LDFLAGS = \
|
|
|
|
|
-Wl,--version-script="$(srcdir)/libnm/libnm.ver" \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(SANITIZER_LIB_LDFLAGS) \
|
2016-10-14 13:54:40 +00:00
|
|
|
-version-info "1:0:1"
|
|
|
|
|
|
|
|
|
|
check-local-exports-libnm: libnm/libnm.la
|
|
|
|
|
$(srcdir)/tools/check-exports.sh "$(builddir)/libnm/.libs/libnm.so" "$(srcdir)/libnm/libnm.ver"
|
|
|
|
|
|
|
|
|
|
check_local += check-local-exports-libnm
|
|
|
|
|
|
|
|
|
|
pkgconfig_DATA += libnm/libnm.pc
|
|
|
|
|
|
|
|
|
|
DISTCLEANFILES += \
|
|
|
|
|
libnm/libnm.pc
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
libnm/libnm.pc.in \
|
|
|
|
|
libnm/libnm.ver
|
|
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
libnm_NM_1_0_typelib =
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
if HAVE_INTROSPECTION
|
2018-05-06 06:51:26 +00:00
|
|
|
libnm_NM_1_0_typelib += libnm/NM-1.0.typelib
|
|
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm/NM-1.0.gir: libnm/libnm.la
|
|
|
|
|
libnm_NM_1_0_gir_INCLUDES = Gio-2.0
|
2017-03-12 14:54:02 +00:00
|
|
|
libnm_NM_1_0_gir_PACKAGES = gio-2.0
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm
|
|
|
|
|
libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS)
|
|
|
|
|
libnm_NM_1_0_gir_LIBS = libnm/libnm.la
|
2016-10-18 13:53:05 +00:00
|
|
|
libnm_NM_1_0_gir_FILES = \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_core_lib_h_pub_mkenums) \
|
2016-11-15 13:35:48 +00:00
|
|
|
$(libnm_core_lib_h_pub_real) \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_core_lib_c_mkenums) \
|
2016-11-15 13:35:48 +00:00
|
|
|
$(libnm_core_lib_c_real) \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_lib_h_pub_mkenums) \
|
2016-11-15 13:35:48 +00:00
|
|
|
$(libnm_lib_h_pub_real) \
|
2016-11-20 13:40:38 +00:00
|
|
|
$(libnm_lib_c_mkenums) \
|
2016-11-15 13:35:48 +00:00
|
|
|
$(libnm_lib_c_real)
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
|
|
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
libnm/libnm.typelib: libnm/libnm.gir
|
|
|
|
|
$(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@
|
|
|
|
|
|
|
|
|
|
INTROSPECTION_GIRS += libnm/NM-1.0.gir
|
2017-11-04 19:41:45 +00:00
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
libnm_noinst_data = \
|
|
|
|
|
libnm/nm-property-docs.xml \
|
2016-11-23 16:09:48 +00:00
|
|
|
libnm/nm-settings-docs-overrides.xml \
|
|
|
|
|
libnm/nm-settings-docs.xml \
|
|
|
|
|
libnm/nm-settings-keyfile-docs.xml \
|
|
|
|
|
libnm/nm-settings-ifcfg-rh-docs.xml
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
noinst_DATA += $(libnm_noinst_data)
|
|
|
|
|
|
2017-12-15 13:35:31 +00:00
|
|
|
libnm_docs_sources = $(libnm_core_lib_c_settings_real)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
2016-11-23 16:09:48 +00:00
|
|
|
libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
|
2017-12-18 11:34:14 +00:00
|
|
|
$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
# When the python scripts loads libnm and the address sanitizers is
|
|
|
|
|
# enabled, we must LD_PRELOAD libasan otherwise it will complain that
|
|
|
|
|
# it was not loaded as initial library.
|
|
|
|
|
libnm/nm-property-docs.xml: libnm/generate-setting-docs.py $(libnm_docs_sources) | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) \
|
2016-10-14 13:54:40 +00:00
|
|
|
export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \
|
|
|
|
|
export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \
|
|
|
|
|
$(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \
|
2016-12-14 17:18:37 +00:00
|
|
|
"$(PYTHON)" \
|
2016-10-14 13:54:40 +00:00
|
|
|
$(srcdir)/libnm/generate-setting-docs.py \
|
|
|
|
|
--gir $(builddir)/libnm/NM-1.0.gir \
|
|
|
|
|
--output $@
|
|
|
|
|
|
2016-11-23 17:25:12 +00:00
|
|
|
libnm/nm-settings-docs.xml: libnm/generate-setting-docs.py libnm/nm-settings-docs-overrides.xml $(libnm_docs_sources) | libnm/NM-1.0.gir libnm/NM-1.0.typelib libnm/libnm.la
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) \
|
2016-10-14 13:54:40 +00:00
|
|
|
export GI_TYPELIB_PATH=$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \
|
|
|
|
|
export LD_LIBRARY_PATH=$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \
|
|
|
|
|
$(call set_sanitizer_env,$(abs_builddir)/libnm/.libs/libnm.so); \
|
2016-12-15 23:07:42 +00:00
|
|
|
"$(PYTHON)" \
|
2016-10-14 13:54:40 +00:00
|
|
|
$(srcdir)/libnm/generate-setting-docs.py \
|
|
|
|
|
--gir $(builddir)/libnm/NM-1.0.gir \
|
2016-11-23 17:25:12 +00:00
|
|
|
--overrides $(word 2,$^) \
|
2016-10-14 13:54:40 +00:00
|
|
|
--output $@
|
|
|
|
|
|
2016-11-23 16:09:48 +00:00
|
|
|
libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
|
2017-12-18 11:34:14 +00:00
|
|
|
$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile $@ $(filter-out $<,$^)
|
2016-11-23 16:09:48 +00:00
|
|
|
libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources)
|
2017-12-18 11:34:14 +00:00
|
|
|
$(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += $(libnm_noinst_data)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
libnm/generate-setting-docs.py \
|
2018-01-08 12:06:54 +00:00
|
|
|
libnm/generate-plugin-docs.pl \
|
|
|
|
|
libnm/nm-enum-types.c.template \
|
|
|
|
|
libnm/nm-enum-types.h.template \
|
|
|
|
|
libnm/meson.build
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-05-19 12:02:29 +00:00
|
|
|
check_programs += libnm/tests/test-libnm
|
2018-05-06 06:51:26 +00:00
|
|
|
|
|
|
|
|
libnm_tests_programs_req_introspection = \
|
2016-10-15 14:24:59 +00:00
|
|
|
libnm/tests/test-nm-client \
|
|
|
|
|
libnm/tests/test-remote-settings-client \
|
|
|
|
|
libnm/tests/test-secret-agent
|
|
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
if HAVE_INTROSPECTION
|
|
|
|
|
check_programs += $(libnm_tests_programs_req_introspection)
|
|
|
|
|
else
|
|
|
|
|
check_programs_norun += $(libnm_tests_programs_req_introspection)
|
|
|
|
|
endif
|
2016-10-15 14:24:59 +00:00
|
|
|
|
|
|
|
|
libnm_tests_cppflags = \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(dflt_cppflags_libnm_core) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(SANITIZER_EXEC_CFLAGS) \
|
2018-05-30 08:23:17 +00:00
|
|
|
$(NULL)
|
2016-10-15 14:24:59 +00:00
|
|
|
|
|
|
|
|
libnm_tests_ldadd = \
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm/liblibnm.la \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 14:24:59 +00:00
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
libnm_tests_ldflags = \
|
2019-04-08 15:38:44 +00:00
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2018-02-07 10:10:31 +00:00
|
|
|
|
2019-05-19 12:02:29 +00:00
|
|
|
libnm_tests_test_libnm_CPPFLAGS = $(libnm_tests_cppflags)
|
2016-10-15 14:24:59 +00:00
|
|
|
libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags)
|
|
|
|
|
libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags)
|
|
|
|
|
libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags)
|
|
|
|
|
|
2019-05-19 12:02:29 +00:00
|
|
|
libnm_tests_test_libnm_SOURCES = \
|
2017-11-20 18:41:45 +00:00
|
|
|
shared/nm-utils/nm-compat.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
libnm/tests/test-libnm.c \
|
|
|
|
|
$(NULL)
|
2017-05-19 08:19:25 +00:00
|
|
|
|
2016-10-15 14:24:59 +00:00
|
|
|
libnm_tests_test_nm_client_SOURCES = \
|
|
|
|
|
shared/nm-test-utils-impl.c \
|
|
|
|
|
shared/nm-test-libnm-utils.h \
|
|
|
|
|
libnm/tests/test-nm-client.c
|
|
|
|
|
|
|
|
|
|
libnm_tests_test_remote_settings_client_SOURCES = \
|
|
|
|
|
shared/nm-test-utils-impl.c \
|
|
|
|
|
shared/nm-test-libnm-utils.h \
|
|
|
|
|
libnm/tests/test-remote-settings-client.c
|
|
|
|
|
|
|
|
|
|
libnm_tests_test_secret_agent_SOURCES = \
|
|
|
|
|
shared/nm-test-utils-impl.c \
|
|
|
|
|
shared/nm-test-libnm-utils.h \
|
|
|
|
|
libnm/tests/test-secret-agent.c
|
|
|
|
|
|
2019-05-15 09:20:33 +00:00
|
|
|
libnm_tests_test_libnm_LDADD = $(libnm_tests_ldadd)
|
2016-10-15 14:24:59 +00:00
|
|
|
libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd)
|
|
|
|
|
libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd)
|
|
|
|
|
libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd)
|
|
|
|
|
|
2019-05-19 12:02:29 +00:00
|
|
|
libnm_tests_test_libnm_LDFLAGS = $(libnm_tests_ldflags)
|
2018-02-07 10:10:31 +00:00
|
|
|
libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags)
|
|
|
|
|
libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags)
|
|
|
|
|
libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags)
|
|
|
|
|
|
2019-05-19 12:02:29 +00:00
|
|
|
$(libnm_tests_test_libnm_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
$(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it
|
|
|
|
|
# is built first.
|
|
|
|
|
$(libnm_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib)
|
|
|
|
|
$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib)
|
|
|
|
|
$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_NM_1_0_typelib)
|
|
|
|
|
|
2016-10-15 14:24:59 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
# just test, that we can build "nm-vpn-plugin-utils.c"
|
|
|
|
|
|
2016-10-16 14:50:04 +00:00
|
|
|
check_ltlibraries += libnm/tests/libnm-vpn-plugin-utils-test.la
|
2016-10-15 14:24:59 +00:00
|
|
|
|
|
|
|
|
libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
|
2016-11-21 11:59:31 +00:00
|
|
|
shared/nm-utils/nm-vpn-plugin-utils.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
shared/nm-utils/nm-vpn-plugin-utils.h \
|
|
|
|
|
$(NULL)
|
2016-10-15 14:24:59 +00:00
|
|
|
|
|
|
|
|
libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
2018-01-02 12:37:06 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(SANITIZER_EXEC_CFLAGS) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
2019-05-15 08:34:53 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
|
|
|
|
$(NULL)
|
2016-10-15 14:24:59 +00:00
|
|
|
|
|
|
|
|
libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 14:24:59 +00:00
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
libnm/tests/meson.build
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_cppflags_base = \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/src \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(dflt_cppflags_libnm_core) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(SANITIZER_EXEC_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_cppflags_base_test = \
|
|
|
|
|
$(src_cppflags_base) \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_cppflags_device_plugin = \
|
|
|
|
|
$(src_cppflags_base)
|
|
|
|
|
|
|
|
|
|
src_cppflags = \
|
|
|
|
|
$(src_cppflags_base) \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
|
|
|
|
$(LIBNDP_CFLAGS) \
|
2017-03-20 16:57:58 +00:00
|
|
|
$(LIBPSL_CFLAGS) \
|
2016-04-04 16:23:13 +00:00
|
|
|
$(LIBCURL_CFLAGS) \
|
2016-10-15 16:25:13 +00:00
|
|
|
$(SELINUX_CFLAGS) \
|
|
|
|
|
$(LIBAUDIT_CFLAGS) \
|
|
|
|
|
$(SYSTEMD_LOGIN_CFLAGS) \
|
|
|
|
|
$(SYSTEMD_JOURNAL_CFLAGS) \
|
|
|
|
|
\
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_cppflags_test = \
|
|
|
|
|
$(src_cppflags) \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
if REQUIRE_ROOT_TESTS
|
|
|
|
|
src_cppflags_test += -DREQUIRE_ROOT_TESTS=1
|
|
|
|
|
endif
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
src_ldflags = $(CODE_COVERAGE_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
sbin_PROGRAMS += \
|
|
|
|
|
src/NetworkManager
|
|
|
|
|
|
|
|
|
|
libexec_PROGRAMS += \
|
|
|
|
|
src/nm-iface-helper
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += \
|
|
|
|
|
src/libNetworkManagerBase.la \
|
|
|
|
|
src/libNetworkManager.la \
|
2018-12-28 17:11:16 +00:00
|
|
|
src/libnm-systemd-core.la \
|
|
|
|
|
$(NULL)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2018-11-09 17:08:45 +00:00
|
|
|
check-config-options:
|
|
|
|
|
$(srcdir)/tools/check-config-options.sh "$(srcdir)"
|
|
|
|
|
|
|
|
|
|
check_local += check-config-options
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2018-12-28 17:11:16 +00:00
|
|
|
libsystemd_cppflags = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
2018-12-28 17:11:16 +00:00
|
|
|
-I$(srcdir)/shared/systemd/ \
|
|
|
|
|
-I$(srcdir)/shared/systemd/sd-adapt-shared \
|
|
|
|
|
-I$(srcdir)/shared/systemd/src/basic \
|
2019-06-25 09:44:02 +00:00
|
|
|
-I$(srcdir)/shared/systemd/src/shared \
|
2018-12-28 17:11:16 +00:00
|
|
|
$(LIBSYSTEMD_NM_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-12-28 20:30:03 +00:00
|
|
|
noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la
|
|
|
|
|
|
|
|
|
|
shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
|
|
|
|
|
$(libsystemd_cppflags) \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \
|
|
|
|
|
shared/systemd/nm-logging-stub.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \
|
2019-05-15 10:51:04 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
2018-12-28 20:30:03 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2018-12-28 17:11:16 +00:00
|
|
|
noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la
|
|
|
|
|
|
|
|
|
|
shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
|
|
|
|
|
$(libsystemd_cppflags) \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \
|
|
|
|
|
-DG_LOG_DOMAIN=\""libnm"\" \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_systemd_libnm_systemd_shared_la_SOURCES = \
|
|
|
|
|
shared/systemd/nm-sd-utils-shared.c \
|
|
|
|
|
shared/systemd/nm-sd-utils-shared.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/architecture.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/build.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/copy.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/def.h \
|
2019-11-20 07:47:31 +00:00
|
|
|
shared/systemd/sd-adapt-shared/dhcp-server-internal.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/sd-adapt-shared/dirent-util.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/errno-list.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/glob-util.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/gunicode.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/ioprio.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/locale-util.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/memfd-util.h \
|
2019-11-20 07:47:31 +00:00
|
|
|
shared/systemd/sd-adapt-shared/missing_fs.h \
|
2019-12-15 13:28:45 +00:00
|
|
|
shared/systemd/sd-adapt-shared/missing_keyctl.h \
|
2019-11-20 07:47:31 +00:00
|
|
|
shared/systemd/sd-adapt-shared/missing_magic.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/missing_network.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/missing_sched.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/sd-adapt-shared/missing_timerfd.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/mkdir.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
shared/systemd/sd-adapt-shared/namespace-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
shared/systemd/sd-adapt-shared/nulstr-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/sd-adapt-shared/raw-clone.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/rlimit-util.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/terminal-util.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/unaligned.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/user-util.h \
|
|
|
|
|
shared/systemd/sd-adapt-shared/virt.h \
|
|
|
|
|
shared/systemd/src/basic/alloc-util.c \
|
|
|
|
|
shared/systemd/src/basic/alloc-util.h \
|
|
|
|
|
shared/systemd/src/basic/async.h \
|
|
|
|
|
shared/systemd/src/basic/env-file.c \
|
|
|
|
|
shared/systemd/src/basic/env-file.h \
|
|
|
|
|
shared/systemd/src/basic/env-util.c \
|
|
|
|
|
shared/systemd/src/basic/env-util.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
shared/systemd/src/basic/errno-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/escape.c \
|
|
|
|
|
shared/systemd/src/basic/escape.h \
|
|
|
|
|
shared/systemd/src/basic/ether-addr-util.c \
|
|
|
|
|
shared/systemd/src/basic/ether-addr-util.h \
|
|
|
|
|
shared/systemd/src/basic/extract-word.c \
|
|
|
|
|
shared/systemd/src/basic/extract-word.h \
|
|
|
|
|
shared/systemd/src/basic/fd-util.c \
|
|
|
|
|
shared/systemd/src/basic/fd-util.h \
|
|
|
|
|
shared/systemd/src/basic/fileio.c \
|
|
|
|
|
shared/systemd/src/basic/fileio.h \
|
2019-07-05 07:11:40 +00:00
|
|
|
shared/systemd/src/basic/format-util.c \
|
|
|
|
|
shared/systemd/src/basic/format-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/fs-util.c \
|
|
|
|
|
shared/systemd/src/basic/fs-util.h \
|
|
|
|
|
shared/systemd/src/basic/hash-funcs.c \
|
|
|
|
|
shared/systemd/src/basic/hash-funcs.h \
|
|
|
|
|
shared/systemd/src/basic/hashmap.c \
|
|
|
|
|
shared/systemd/src/basic/hashmap.h \
|
|
|
|
|
shared/systemd/src/basic/hexdecoct.c \
|
|
|
|
|
shared/systemd/src/basic/hexdecoct.h \
|
|
|
|
|
shared/systemd/src/basic/hostname-util.c \
|
|
|
|
|
shared/systemd/src/basic/hostname-util.h \
|
|
|
|
|
shared/systemd/src/basic/in-addr-util.c \
|
|
|
|
|
shared/systemd/src/basic/in-addr-util.h \
|
|
|
|
|
shared/systemd/src/basic/io-util.c \
|
|
|
|
|
shared/systemd/src/basic/io-util.h \
|
|
|
|
|
shared/systemd/src/basic/list.h \
|
|
|
|
|
shared/systemd/src/basic/log.h \
|
|
|
|
|
shared/systemd/src/basic/macro.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
shared/systemd/src/basic/memory-util.c \
|
|
|
|
|
shared/systemd/src/basic/memory-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/mempool.c \
|
|
|
|
|
shared/systemd/src/basic/mempool.h \
|
2019-02-06 08:13:06 +00:00
|
|
|
shared/systemd/src/basic/missing_fcntl.h \
|
2019-11-20 07:47:31 +00:00
|
|
|
shared/systemd/src/basic/missing_random.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
shared/systemd/src/basic/missing_socket.h \
|
|
|
|
|
shared/systemd/src/basic/missing_stat.h \
|
2019-12-15 13:28:45 +00:00
|
|
|
shared/systemd/src/basic/missing_syscall.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/missing_type.h \
|
|
|
|
|
shared/systemd/src/basic/parse-util.c \
|
|
|
|
|
shared/systemd/src/basic/parse-util.h \
|
|
|
|
|
shared/systemd/src/basic/path-util.c \
|
|
|
|
|
shared/systemd/src/basic/path-util.h \
|
|
|
|
|
shared/systemd/src/basic/prioq.c \
|
|
|
|
|
shared/systemd/src/basic/prioq.h \
|
|
|
|
|
shared/systemd/src/basic/process-util.c \
|
|
|
|
|
shared/systemd/src/basic/process-util.h \
|
|
|
|
|
shared/systemd/src/basic/random-util.c \
|
|
|
|
|
shared/systemd/src/basic/random-util.h \
|
|
|
|
|
shared/systemd/src/basic/set.h \
|
2019-12-15 13:28:45 +00:00
|
|
|
shared/systemd/src/basic/signal-util.c \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/signal-util.h \
|
|
|
|
|
shared/systemd/src/basic/siphash24.h \
|
|
|
|
|
shared/systemd/src/basic/socket-util.c \
|
|
|
|
|
shared/systemd/src/basic/socket-util.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
shared/systemd/src/basic/sort-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/sparse-endian.h \
|
|
|
|
|
shared/systemd/src/basic/stat-util.c \
|
|
|
|
|
shared/systemd/src/basic/stat-util.h \
|
|
|
|
|
shared/systemd/src/basic/stdio-util.h \
|
|
|
|
|
shared/systemd/src/basic/string-table.c \
|
|
|
|
|
shared/systemd/src/basic/string-table.h \
|
|
|
|
|
shared/systemd/src/basic/string-util.c \
|
|
|
|
|
shared/systemd/src/basic/string-util.h \
|
|
|
|
|
shared/systemd/src/basic/strv.c \
|
|
|
|
|
shared/systemd/src/basic/strv.h \
|
2019-07-26 12:47:35 +00:00
|
|
|
shared/systemd/src/basic/strxcpyx.c \
|
|
|
|
|
shared/systemd/src/basic/strxcpyx.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
shared/systemd/src/basic/time-util.c \
|
|
|
|
|
shared/systemd/src/basic/time-util.h \
|
|
|
|
|
shared/systemd/src/basic/tmpfile-util.c \
|
|
|
|
|
shared/systemd/src/basic/tmpfile-util.h \
|
|
|
|
|
shared/systemd/src/basic/umask-util.h \
|
|
|
|
|
shared/systemd/src/basic/utf8.c \
|
|
|
|
|
shared/systemd/src/basic/utf8.h \
|
|
|
|
|
shared/systemd/src/basic/util.c \
|
|
|
|
|
shared/systemd/src/basic/util.h \
|
2019-06-25 09:44:02 +00:00
|
|
|
shared/systemd/src/shared/dns-domain.c \
|
|
|
|
|
shared/systemd/src/shared/dns-domain.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
shared_systemd_libnm_systemd_shared_la_LIBADD = \
|
2019-05-15 10:51:04 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
2018-12-28 17:11:16 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_libnm_systemd_core_la_cppflags = \
|
|
|
|
|
$(libsystemd_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
2016-10-18 09:54:58 +00:00
|
|
|
-I$(srcdir)/src \
|
2018-12-28 17:11:16 +00:00
|
|
|
-I$(srcdir)/src/systemd/sd-adapt-core \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/src/systemd/src/systemd \
|
|
|
|
|
-I$(srcdir)/src/systemd/src/libsystemd-network \
|
2018-11-23 09:55:45 +00:00
|
|
|
-I$(srcdir)/src/systemd/src/libsystemd/sd-event \
|
2016-10-18 09:54:58 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
|
2018-12-28 17:11:16 +00:00
|
|
|
$(NULL)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2018-12-28 17:11:16 +00:00
|
|
|
src_libnm_systemd_core_la_libadd = \
|
2019-05-15 10:51:04 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
2018-12-28 17:11:16 +00:00
|
|
|
$(NULL)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2018-12-28 17:11:16 +00:00
|
|
|
src_libnm_systemd_core_la_SOURCES = \
|
|
|
|
|
src/systemd/nm-sd-utils-core.c \
|
|
|
|
|
src/systemd/nm-sd-utils-core.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/systemd/nm-sd.c \
|
|
|
|
|
src/systemd/nm-sd.h \
|
2019-05-14 13:15:05 +00:00
|
|
|
src/systemd/nm-sd-utils-dhcp.h \
|
|
|
|
|
src/systemd/nm-sd-utils-dhcp.c \
|
2018-12-28 17:11:16 +00:00
|
|
|
src/systemd/sd-adapt-core/condition.h \
|
|
|
|
|
src/systemd/sd-adapt-core/conf-parser.h \
|
2019-02-20 16:59:37 +00:00
|
|
|
src/systemd/sd-adapt-core/device-util.h \
|
2018-12-28 17:11:16 +00:00
|
|
|
src/systemd/sd-adapt-core/khash.h \
|
|
|
|
|
src/systemd/sd-adapt-core/nm-sd-adapt-core.c \
|
|
|
|
|
src/systemd/sd-adapt-core/nm-sd-adapt-core.h \
|
|
|
|
|
src/systemd/sd-adapt-core/sd-daemon.h \
|
|
|
|
|
src/systemd/sd-adapt-core/sd-device.h \
|
2019-04-04 07:49:37 +00:00
|
|
|
src/systemd/sd-adapt-core/udev-util.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/systemd/src/libsystemd-network/arp-util.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/arp-util.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-identifier.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-identifier.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-internal.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-lease-internal.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-network.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-option.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-packet.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp-protocol.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp6-internal.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp6-network.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp6-option.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/dhcp6-protocol.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/lldp-internal.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/lldp-neighbor.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/lldp-neighbor.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/lldp-network.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/lldp-network.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/network-internal.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/network-internal.h \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-dhcp-client.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-dhcp-lease.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-dhcp6-client.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-ipv4acd.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-ipv4ll.c \
|
|
|
|
|
src/systemd/src/libsystemd-network/sd-lldp.c \
|
2018-11-23 09:55:45 +00:00
|
|
|
src/systemd/src/libsystemd/sd-event/event-source.h \
|
|
|
|
|
src/systemd/src/libsystemd/sd-event/event-util.c \
|
|
|
|
|
src/systemd/src/libsystemd/sd-event/event-util.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/systemd/src/libsystemd/sd-event/sd-event.c \
|
|
|
|
|
src/systemd/src/libsystemd/sd-id128/id128-util.c \
|
|
|
|
|
src/systemd/src/libsystemd/sd-id128/id128-util.h \
|
|
|
|
|
src/systemd/src/libsystemd/sd-id128/sd-id128.c \
|
|
|
|
|
src/systemd/src/systemd/_sd-common.h \
|
|
|
|
|
src/systemd/src/systemd/sd-dhcp-client.h \
|
|
|
|
|
src/systemd/src/systemd/sd-dhcp-lease.h \
|
2019-11-20 07:47:31 +00:00
|
|
|
src/systemd/src/systemd/sd-dhcp-option.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/systemd/src/systemd/sd-dhcp6-client.h \
|
|
|
|
|
src/systemd/src/systemd/sd-dhcp6-lease.h \
|
|
|
|
|
src/systemd/src/systemd/sd-event.h \
|
|
|
|
|
src/systemd/src/systemd/sd-id128.h \
|
|
|
|
|
src/systemd/src/systemd/sd-ipv4acd.h \
|
|
|
|
|
src/systemd/src/systemd/sd-ipv4ll.h \
|
|
|
|
|
src/systemd/src/systemd/sd-lldp.h \
|
|
|
|
|
src/systemd/src/systemd/sd-ndisc.h
|
|
|
|
|
|
2018-12-28 17:11:16 +00:00
|
|
|
src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
|
2019-05-15 10:51:04 +00:00
|
|
|
src_libnm_systemd_core_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2018-12-28 17:11:16 +00:00
|
|
|
$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/systemd/meson.build
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
dhcp: add nettools dhcp4 client
This is inspired by the existing systemd integration, with a few differences:
* This parses the WPAD option, which systemd requested, but did not use.
* We hook into the DAD handling, only making use of the configured address
once DAD has completed successfully, and declining the lease if it fails.
There are still many areas of possible improvement. In particular, we need
to ensure the parsing of all options are compliant, as n-dhcp4 treats all
options as opaque, unlike sd-dhcp4. We probably also need to look at how
to handle failures and retries (in particular if we decline a lease).
We need to query the current MTU at client startu, as well as the hardware
broadcast address. Both these are provided by the kernel over netlink, so
it should simply be a matter of hooking that up with NM's netlink layer.
Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 18:02:48 +00:00
|
|
|
src_libNetworkManagerBase_la_CPPFLAGS = \
|
|
|
|
|
$(libsystemd_cppflags) \
|
|
|
|
|
$(src_cppflags)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_libNetworkManagerBase_la_SOURCES = \
|
shared: add NMDedupMultiIndex "nm-dedup-multi.h"
Add the NMDedupMultiIndex cache. It basically tracks
objects as doubly linked list. With the addition that
each object and the list head is indexed by a hash table.
Also, it supports tracking multiple distinct lists,
all indexed by the idx-type instance.
It also deduplicates the tracked objects and shares them.
- the objects that can be put into the cache must be immutable
and ref-counted. That is, the cache will deduplicate them
and share the reference. Also, as these objects are immutable
and ref-counted, it is safe that users outside the cache
own them too (as long as they keep them immutable and manage
their reference properly).
The deduplication uses obj_id_hash_func() and obj_id_equal_func().
These functions must cover *every* aspect of the objects when
comparing equality. For example nm_platform_ip4_route_cmp()
would be a function that qualifies as obj_id_equal_func().
The cache creates references to the objects as needed and
gives them back. This happens via obj_get_ref() and
obj_put_ref(). Note that obj_get_ref() is free to create
a new object, for example to convert a stack-allocated object
to a (ref-counted) heap allocated one.
The deduplication process creates NMDedupIndexBox instances
which are the ref-counted entity. In principle, the objects
themself don't need to be ref-counted as that is handled by
the boxing instance.
- The cache doesn't only do deduplication. It is a multi-index,
meaning, callers add objects using a index handle NMDedupMultiIdxType.
The NMDedupMultiIdxType instance is the access handle to lookup
the list and objects inside the cache. Note that the idx-type
instance may partition the objects in distinct lists.
For all operations there are cross-references and hash table lookups.
Hence, every operation of this data structure is O(1) and the memory
overhead for an index tracking an object is constant.
The cache preserves ordering (due to linked list) and exposes the list
as public API. This allows users to iterate the list without any
additional copying of elements.
2017-06-04 20:43:21 +00:00
|
|
|
\
|
2016-10-15 16:25:13 +00:00
|
|
|
src/nm-core-utils.c \
|
|
|
|
|
src/nm-core-utils.h \
|
|
|
|
|
src/nm-logging.c \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/nm-logging.h \
|
|
|
|
|
\
|
|
|
|
|
src/NetworkManagerUtils.c \
|
|
|
|
|
src/NetworkManagerUtils.h \
|
|
|
|
|
\
|
2018-01-14 13:43:34 +00:00
|
|
|
src/platform/nm-netlink.c \
|
|
|
|
|
src/platform/nm-netlink.h \
|
|
|
|
|
\
|
2016-10-22 12:54:56 +00:00
|
|
|
src/platform/nmp-netns.c \
|
|
|
|
|
src/platform/nmp-netns.h \
|
|
|
|
|
src/platform/nmp-object.c \
|
|
|
|
|
src/platform/nmp-object.h \
|
|
|
|
|
src/platform/nm-platform-utils.c \
|
|
|
|
|
src/platform/nm-platform-utils.h \
|
|
|
|
|
src/platform/nm-platform.c \
|
|
|
|
|
src/platform/nm-platform.h \
|
2017-06-29 09:18:10 +00:00
|
|
|
src/platform/nm-platform-private.h \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/platform/nm-linux-platform.c \
|
|
|
|
|
src/platform/nm-linux-platform.h \
|
2019-03-11 10:37:40 +00:00
|
|
|
src/platform/nmp-rules-manager.c \
|
|
|
|
|
src/platform/nmp-rules-manager.h \
|
2018-06-09 11:56:21 +00:00
|
|
|
src/platform/wifi/nm-wifi-utils-nl80211.c \
|
|
|
|
|
src/platform/wifi/nm-wifi-utils-nl80211.h \
|
|
|
|
|
src/platform/wifi/nm-wifi-utils-private.h \
|
|
|
|
|
src/platform/wifi/nm-wifi-utils.c \
|
|
|
|
|
src/platform/wifi/nm-wifi-utils.h \
|
2018-05-18 14:40:28 +00:00
|
|
|
src/platform/wpan/nm-wpan-utils.c \
|
|
|
|
|
src/platform/wpan/nm-wpan-utils.h \
|
2016-10-22 12:54:56 +00:00
|
|
|
\
|
2016-10-13 11:06:25 +00:00
|
|
|
src/ndisc/nm-lndp-ndisc.c \
|
|
|
|
|
src/ndisc/nm-lndp-ndisc.h \
|
|
|
|
|
src/ndisc/nm-ndisc.c \
|
|
|
|
|
src/ndisc/nm-ndisc.h \
|
|
|
|
|
src/ndisc/nm-ndisc-private.h \
|
2016-10-22 12:54:56 +00:00
|
|
|
\
|
core/dbus: rework D-Bus implementation to use lower layer GDBusConnection API
Previously, we used the generated GDBusInterfaceSkeleton types and glued
them via the NMExportedObject base class to our NM types. We also used
GDBusObjectManagerServer.
Don't do that anymore. The resulting code was more complicated despite (or
because?) using generated classes. It was hard to understand, complex, had
ordering-issues, and had a runtime and memory overhead.
This patch refactors this entirely and uses the lower layer API GDBusConnection
directly. It replaces the generated code, GDBusInterfaceSkeleton, and
GDBusObjectManagerServer. All this is now done by NMDbusObject and NMDBusManager
and static descriptor instances of type GDBusInterfaceInfo.
This adds a net plus of more then 1300 lines of hand written code. I claim
that this implementation is easier to understand. Note that previously we
also required extensive and complex glue code to bind our objects to the
generated skeleton objects. Instead, now glue our objects directly to
GDBusConnection. The result is more immediate and gets rid of layers of
code in between.
Now that the D-Bus glue us more under our control, we can address issus and
bottlenecks better, instead of adding code to bend the generated skeletons
to our needs.
Note that the current implementation now only supports one D-Bus connection.
That was effectively the case already, although there were places (and still are)
where the code pretends it could also support connections from a private socket.
We dropped private socket support mainly because it was unused, untested and
buggy, but also because GDBusObjectManagerServer could not export the same
objects on multiple connections. Now, it would be rather straight forward to
fix that and re-introduce ObjectManager on each private connection. But this
commit doesn't do that yet, and the new code intentionally supports only one
D-Bus connection.
Also, the D-Bus startup was simplified. There is no retry, either nm_dbus_manager_start()
succeeds, or it detects the initrd case. In the initrd case, bus manager never tries to
connect to D-Bus. Since the initrd scenario is not yet used/tested, this is good enough
for the moment. It could be easily extended later, for example with polling whether the
system bus appears (like was done previously). Also, restart of D-Bus daemon isn't
supported either -- just like before.
Note how NMDBusManager now implements the ObjectManager D-Bus interface
directly.
Also, this fixes race issues in the server, by no longer delaying
PropertiesChanged signals. NMExportedObject would collect changed
properties and send the signal out in idle_emit_properties_changed()
on idle. This messes up the ordering of change events w.r.t. other
signals and events on the bus. Note that not only NMExportedObject
messed up the ordering. Also the generated code would hook into
notify() and process change events in and idle handle, exhibiting the
same ordering issue too.
No longer do that. PropertiesChanged signals will be sent right away
by hooking into dispatch_properties_changed(). This means, changing
a property in quick succession will no longer be combined and is
guaranteed to emit signals for each individual state. Quite possibly
we emit now more PropertiesChanged signals then before.
However, we are now able to group a set of changes by using standard
g_object_freeze_notify()/g_object_thaw_notify(). We probably should
make more use of that.
Also, now that our signals are all handled in the right order, we
might find places where we still emit them in the wrong order. But that
is then due to the order in which our GObjects emit signals, not due
to an ill behavior of the D-Bus glue. Possibly we need to identify
such ordering issues and fix them.
Numbers (for contrib/rpm --without debug on x86_64):
- the patch changes the code size of NetworkManager by
- 2809360 bytes
+ 2537528 bytes (-9.7%)
- Runtime measurements are harder because there is a large variance
during testing. In other words, the numbers are not reproducible.
Currently, the implementation performs no caching of GVariants at all,
but it would be rather simple to add it, if that turns out to be
useful.
Anyway, without strong claim, it seems that the new form tends to
perform slightly better. That would be no surprise.
$ time (for i in {1..1000}; do nmcli >/dev/null || break; echo -n .; done)
- real 1m39.355s
+ real 1m37.432s
$ time (for i in {1..2000}; do busctl call org.freedesktop.NetworkManager /org/freedesktop org.freedesktop.DBus.ObjectManager GetManagedObjects > /dev/null || break; echo -n .; done)
- real 0m26.843s
+ real 0m25.281s
- Regarding RSS size, just looking at the processes in similar
conditions, doesn't give a large difference. On my system they
consume about 19MB RSS. It seems that the new version has a
slightly smaller RSS size.
- 19356 RSS
+ 18660 RSS
2018-02-26 12:51:52 +00:00
|
|
|
src/nm-dbus-utils.c \
|
|
|
|
|
src/nm-dbus-utils.h \
|
|
|
|
|
src/nm-dbus-object.c \
|
|
|
|
|
src/nm-dbus-object.h \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/nm-ip4-config.c \
|
|
|
|
|
src/nm-ip4-config.h \
|
|
|
|
|
src/nm-ip6-config.c \
|
|
|
|
|
src/nm-ip6-config.h \
|
|
|
|
|
\
|
2016-11-20 23:26:17 +00:00
|
|
|
src/dhcp/nm-dhcp-client.c \
|
|
|
|
|
src/dhcp/nm-dhcp-client.h \
|
|
|
|
|
src/dhcp/nm-dhcp-client-logging.h \
|
dhcp: add nettools dhcp4 client
This is inspired by the existing systemd integration, with a few differences:
* This parses the WPAD option, which systemd requested, but did not use.
* We hook into the DAD handling, only making use of the configured address
once DAD has completed successfully, and declining the lease if it fails.
There are still many areas of possible improvement. In particular, we need
to ensure the parsing of all options are compliant, as n-dhcp4 treats all
options as opaque, unlike sd-dhcp4. We probably also need to look at how
to handle failures and retries (in particular if we decline a lease).
We need to query the current MTU at client startu, as well as the hardware
broadcast address. Both these are provided by the kernel over netlink, so
it should simply be a matter of hooking that up with NM's netlink layer.
Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 18:02:48 +00:00
|
|
|
src/dhcp/nm-dhcp-nettools.c \
|
2016-11-20 23:26:17 +00:00
|
|
|
src/dhcp/nm-dhcp-utils.c \
|
|
|
|
|
src/dhcp/nm-dhcp-utils.h \
|
2019-06-06 10:27:06 +00:00
|
|
|
src/dhcp/nm-dhcp-options.c \
|
|
|
|
|
src/dhcp/nm-dhcp-options.h \
|
2016-11-20 23:26:17 +00:00
|
|
|
src/dhcp/nm-dhcp-systemd.c \
|
|
|
|
|
src/dhcp/nm-dhcp-manager.c \
|
|
|
|
|
src/dhcp/nm-dhcp-manager.h \
|
2016-10-22 12:54:56 +00:00
|
|
|
\
|
|
|
|
|
src/main-utils.c \
|
|
|
|
|
src/main-utils.h \
|
|
|
|
|
\
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
if WITH_WEXT
|
|
|
|
|
src_libNetworkManagerBase_la_SOURCES += \
|
2018-06-09 11:56:21 +00:00
|
|
|
src/platform/wifi/nm-wifi-utils-wext.c \
|
|
|
|
|
src/platform/wifi/nm-wifi-utils-wext.h
|
2016-10-22 12:54:56 +00:00
|
|
|
endif
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_libNetworkManagerBase_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(SYSTEMD_JOURNAL_LIBS) \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
2016-10-15 16:25:13 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2018-05-18 14:40:46 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/platform/linux/nl802154.h
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_libNetworkManager_la_SOURCES = \
|
|
|
|
|
\
|
|
|
|
|
src/nm-checkpoint.c \
|
|
|
|
|
src/nm-checkpoint.h \
|
2018-03-27 10:45:23 +00:00
|
|
|
src/nm-checkpoint-manager.c \
|
|
|
|
|
src/nm-checkpoint-manager.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2018-04-05 13:19:27 +00:00
|
|
|
src/devices/nm-acd-manager.c \
|
|
|
|
|
src/devices/nm-acd-manager.h \
|
2018-09-20 08:15:48 +00:00
|
|
|
src/devices/nm-lldp-listener.c \
|
|
|
|
|
src/devices/nm-lldp-listener.h \
|
|
|
|
|
src/devices/nm-device.c \
|
|
|
|
|
src/devices/nm-device.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/devices/nm-device-ethernet-utils.c \
|
|
|
|
|
src/devices/nm-device-ethernet-utils.h \
|
|
|
|
|
src/devices/nm-device-factory.c \
|
|
|
|
|
src/devices/nm-device-factory.h \
|
|
|
|
|
src/devices/nm-device-generic.c \
|
|
|
|
|
src/devices/nm-device-generic.h \
|
|
|
|
|
src/devices/nm-device-logging.h \
|
|
|
|
|
src/devices/nm-device-private.h \
|
|
|
|
|
\
|
2018-05-22 14:25:54 +00:00
|
|
|
src/devices/nm-device-6lowpan.c \
|
|
|
|
|
src/devices/nm-device-6lowpan.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/devices/nm-device-bond.c \
|
|
|
|
|
src/devices/nm-device-bond.h \
|
|
|
|
|
src/devices/nm-device-bridge.c \
|
|
|
|
|
src/devices/nm-device-bridge.h \
|
2017-01-31 13:14:33 +00:00
|
|
|
src/devices/nm-device-dummy.c \
|
|
|
|
|
src/devices/nm-device-dummy.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/devices/nm-device-ethernet.c \
|
|
|
|
|
src/devices/nm-device-ethernet.h \
|
|
|
|
|
src/devices/nm-device-infiniband.c \
|
|
|
|
|
src/devices/nm-device-infiniband.h \
|
|
|
|
|
src/devices/nm-device-ip-tunnel.c \
|
|
|
|
|
src/devices/nm-device-ip-tunnel.h \
|
2016-06-30 16:20:22 +00:00
|
|
|
src/devices/nm-device-macsec.c \
|
|
|
|
|
src/devices/nm-device-macsec.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/devices/nm-device-macvlan.c \
|
|
|
|
|
src/devices/nm-device-macvlan.h \
|
2017-06-06 13:55:08 +00:00
|
|
|
src/devices/nm-device-ppp.c \
|
|
|
|
|
src/devices/nm-device-ppp.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/devices/nm-device-tun.c \
|
|
|
|
|
src/devices/nm-device-tun.h \
|
|
|
|
|
src/devices/nm-device-veth.c \
|
|
|
|
|
src/devices/nm-device-veth.h \
|
|
|
|
|
src/devices/nm-device-vlan.c \
|
|
|
|
|
src/devices/nm-device-vlan.h \
|
|
|
|
|
src/devices/nm-device-vxlan.c \
|
|
|
|
|
src/devices/nm-device-vxlan.h \
|
2018-03-13 13:42:38 +00:00
|
|
|
src/devices/nm-device-wireguard.c \
|
|
|
|
|
src/devices/nm-device-wireguard.h \
|
2018-03-09 15:26:25 +00:00
|
|
|
src/devices/nm-device-wpan.c \
|
|
|
|
|
src/devices/nm-device-wpan.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2017-10-05 14:44:08 +00:00
|
|
|
src/dhcp/nm-dhcp-dhcpcanon.c \
|
2016-11-20 23:26:17 +00:00
|
|
|
src/dhcp/nm-dhcp-dhclient.c \
|
|
|
|
|
src/dhcp/nm-dhcp-dhcpcd.c \
|
|
|
|
|
src/dhcp/nm-dhcp-helper-api.h \
|
|
|
|
|
src/dhcp/nm-dhcp-listener.c \
|
|
|
|
|
src/dhcp/nm-dhcp-listener.h \
|
|
|
|
|
src/dhcp/nm-dhcp-dhclient-utils.c \
|
|
|
|
|
src/dhcp/nm-dhcp-dhclient-utils.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2017-12-15 13:07:09 +00:00
|
|
|
src/dns/nm-dns-manager.c \
|
|
|
|
|
src/dns/nm-dns-manager.h \
|
|
|
|
|
src/dns/nm-dns-plugin.c \
|
|
|
|
|
src/dns/nm-dns-plugin.h \
|
2016-11-20 23:31:51 +00:00
|
|
|
src/dns/nm-dns-dnsmasq.c \
|
|
|
|
|
src/dns/nm-dns-dnsmasq.h \
|
|
|
|
|
src/dns/nm-dns-systemd-resolved.c \
|
|
|
|
|
src/dns/nm-dns-systemd-resolved.h \
|
|
|
|
|
src/dns/nm-dns-unbound.c \
|
|
|
|
|
src/dns/nm-dns-unbound.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2016-11-20 23:35:32 +00:00
|
|
|
src/dnsmasq/nm-dnsmasq-manager.c \
|
|
|
|
|
src/dnsmasq/nm-dnsmasq-manager.h \
|
|
|
|
|
src/dnsmasq/nm-dnsmasq-utils.c \
|
|
|
|
|
src/dnsmasq/nm-dnsmasq-utils.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2016-11-03 17:38:27 +00:00
|
|
|
src/ppp/nm-ppp-manager-call.c \
|
|
|
|
|
src/ppp/nm-ppp-manager-call.h \
|
2016-11-20 23:38:45 +00:00
|
|
|
src/ppp/nm-ppp-manager.h \
|
|
|
|
|
src/ppp/nm-ppp-status.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2017-04-22 22:40:46 +00:00
|
|
|
src/nm-hostname-manager.c \
|
|
|
|
|
src/nm-hostname-manager.h \
|
|
|
|
|
\
|
2016-10-15 16:25:13 +00:00
|
|
|
src/settings/nm-agent-manager.c \
|
|
|
|
|
src/settings/nm-agent-manager.h \
|
|
|
|
|
src/settings/nm-secret-agent.c \
|
|
|
|
|
src/settings/nm-secret-agent.h \
|
|
|
|
|
src/settings/nm-settings-connection.c \
|
|
|
|
|
src/settings/nm-settings-connection.h \
|
settings: rework tracking settings connections and settings plugins
Completely rework how settings plugin handle connections and how
NMSettings tracks the list of connections.
Previously, settings plugins would return objects of (a subtype of) type
NMSettingsConnection. The NMSettingsConnection was tightly coupled with
the settings plugin. That has a lot of downsides.
Change that. When changing this basic relation how settings connections
are tracked, everything falls appart. That's why this is a huge change.
Also, since I have to largely rewrite the settings plugins, I also
added support for multiple keyfile directories, handle in-memory
connections only by keyfile plugin and (partly) use copy-on-write NMConnection
instances. I don't want to spend effort rewriting large parts while
preserving the old way, that anyway should change. E.g. while rewriting ifcfg-rh,
I don't want to let it handle in-memory connections because that's not right
long-term.
--
If the settings plugins themself create subtypes of NMSettingsConnection
instances, then a lot of knowledge about tracking connections moves
to the plugins.
Just try to follow the code what happend during nm_settings_add_connection().
Note how the logic is spread out:
- nm_settings_add_connection() calls plugin's add_connection()
- add_connection() creates a NMSettingsConnection subtype
- the plugin has to know that it's called during add-connection and
not emit NM_SETTINGS_PLUGIN_CONNECTION_ADDED signal
- NMSettings calls claim_connection() which hocks up the new
NMSettingsConnection instance and configures the instance
(like calling nm_settings_connection_added()).
This summary does not sound like a lot, but try to follow that code. The logic
is all over the place.
Instead, settings plugins should have a very simple API for adding, modifying,
deleting, loading and reloading connections. All the plugin does is to return a
NMSettingsStorage handle. The storage instance is a handle to identify a profile
in storage (e.g. a particular file). The settings plugin is free to subtype
NMSettingsStorage, but it's not necessary.
There are no more events raised, and the settings plugin implements the small
API in a straightforward manner.
NMSettings now drives all of this. Even NMSettingsConnection has now
very little concern about how it's tracked and delegates only to NMSettings.
This should make settings plugins simpler. Currently settings plugins
are so cumbersome to implement, that we avoid having them. It should not be
like that and it should be easy, beneficial and lightweight to create a new
settings plugin.
Note also how the settings plugins no longer care about duplicate UUIDs.
Duplicated UUIDs are a fact of life and NMSettings must handle them. No
need to overly concern settings plugins with that.
--
NMSettingsConnection is exposed directly on D-Bus (being a subtype of
NMDBusObject) but it was also a GObject type provided by the settings
plugin. Hence, it was not possible to migrate a profile from one plugin to
another.
However that would be useful when one profile does not support a
connection type (like ifcfg-rh not supporting VPN). Currently such
migration is not implemented except for migrating them to/from keyfile's
run directory. The problem is that migrating profiles in general is
complicated but in some cases it is important to do.
For example checkpoint rollback should recreate the profile in the right
settings plugin, not just add it to persistent storage. This is not yet
properly implemented.
--
Previously, both keyfile and ifcfg-rh plugin implemented in-memory (unsaved)
profiles, while ifupdown plugin cannot handle them. That meant duplication of code
and a ifupdown profile could not be modified or made unsaved.
This is now unified and only keyfile plugin handles in-memory profiles (bgo #744711).
Also, NMSettings is aware of such profiles and treats them specially.
In particular, NMSettings drives the migration between persistent and non-persistent
storage.
Note that a settings plugins may create truly generated, in-memory profiles.
The settings plugin is free to generate and persist the profiles in any way it
wishes. But the concept of "unsaved" profiles is now something explicitly handled
by keyfile plugin. Also, these "unsaved" keyfile profiles are persisted to file system
too, to the /run directory. This is great for two reasons: first of all, all
profiles from keyfile storage in fact have a backing file -- even the
unsaved ones. It also means you can create "unsaved" profiles in /run
and load them with `nmcli connection load`, meaning there is a file
based API for creating unsaved profiles.
The other advantage is that these profiles now survive restarting
NetworkManager. It's paramount that restarting the daemon is as
non-disruptive as possible. Persisting unsaved files to /run improves
here significantly.
--
In the past, NMSettingsConnection also implemented NMConnection interface.
That was already changed a while ago and instead users call now
nm_settings_connection_get_connection() to delegate to a
NMSimpleConnection. What however still happened was that the NMConnection
instance gets never swapped but instead the instance was modified with
nm_connection_replace_settings_from_connection(), clear-secrets, etc.
Change that and treat the NMConnection instance immutable. Instead of modifying
it, reference/clone a new instance. This changes that previously when somebody
wanted to keep a reference to an NMConnection, then the profile would be cloned.
Now, it is supposed to be safe to reference the instance directly and everybody
must ensure not to modify the instance. nmtst_connection_assert_unchanging()
should help with that.
The point is that the settings plugins may keep references to the
NMConnection instance, and so does the NMSettingsConnection. We want
to avoid cloning the instances as long as they are the same.
Likewise, the device's applied connection can now also be referenced
instead of cloning it. This is not yet done, and possibly there are
further improvements possible.
--
Also implement multiple keyfile directores /usr/lib, /etc, /run (rh #1674545,
bgo #772414).
It was always the case that multiple files could provide the same UUID
(both in case of keyfile and ifcfg-rh). For keyfile plugin, if a profile in
read-only storage in /usr/lib gets modified, then it gets actually stored in
/etc (or /run, if the profile is unsaved).
--
While at it, make /etc/network/interfaces profiles for ifupdown plugin reloadable.
--
https://bugzilla.gnome.org/show_bug.cgi?id=772414
https://bugzilla.gnome.org/show_bug.cgi?id=744711
https://bugzilla.redhat.com/show_bug.cgi?id=1674545
2019-06-13 15:12:20 +00:00
|
|
|
src/settings/nm-settings-storage.c \
|
|
|
|
|
src/settings/nm-settings-storage.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/settings/nm-settings-plugin.c \
|
|
|
|
|
src/settings/nm-settings-plugin.h \
|
|
|
|
|
src/settings/nm-settings.c \
|
|
|
|
|
src/settings/nm-settings.h \
|
settings: rework tracking settings connections and settings plugins
Completely rework how settings plugin handle connections and how
NMSettings tracks the list of connections.
Previously, settings plugins would return objects of (a subtype of) type
NMSettingsConnection. The NMSettingsConnection was tightly coupled with
the settings plugin. That has a lot of downsides.
Change that. When changing this basic relation how settings connections
are tracked, everything falls appart. That's why this is a huge change.
Also, since I have to largely rewrite the settings plugins, I also
added support for multiple keyfile directories, handle in-memory
connections only by keyfile plugin and (partly) use copy-on-write NMConnection
instances. I don't want to spend effort rewriting large parts while
preserving the old way, that anyway should change. E.g. while rewriting ifcfg-rh,
I don't want to let it handle in-memory connections because that's not right
long-term.
--
If the settings plugins themself create subtypes of NMSettingsConnection
instances, then a lot of knowledge about tracking connections moves
to the plugins.
Just try to follow the code what happend during nm_settings_add_connection().
Note how the logic is spread out:
- nm_settings_add_connection() calls plugin's add_connection()
- add_connection() creates a NMSettingsConnection subtype
- the plugin has to know that it's called during add-connection and
not emit NM_SETTINGS_PLUGIN_CONNECTION_ADDED signal
- NMSettings calls claim_connection() which hocks up the new
NMSettingsConnection instance and configures the instance
(like calling nm_settings_connection_added()).
This summary does not sound like a lot, but try to follow that code. The logic
is all over the place.
Instead, settings plugins should have a very simple API for adding, modifying,
deleting, loading and reloading connections. All the plugin does is to return a
NMSettingsStorage handle. The storage instance is a handle to identify a profile
in storage (e.g. a particular file). The settings plugin is free to subtype
NMSettingsStorage, but it's not necessary.
There are no more events raised, and the settings plugin implements the small
API in a straightforward manner.
NMSettings now drives all of this. Even NMSettingsConnection has now
very little concern about how it's tracked and delegates only to NMSettings.
This should make settings plugins simpler. Currently settings plugins
are so cumbersome to implement, that we avoid having them. It should not be
like that and it should be easy, beneficial and lightweight to create a new
settings plugin.
Note also how the settings plugins no longer care about duplicate UUIDs.
Duplicated UUIDs are a fact of life and NMSettings must handle them. No
need to overly concern settings plugins with that.
--
NMSettingsConnection is exposed directly on D-Bus (being a subtype of
NMDBusObject) but it was also a GObject type provided by the settings
plugin. Hence, it was not possible to migrate a profile from one plugin to
another.
However that would be useful when one profile does not support a
connection type (like ifcfg-rh not supporting VPN). Currently such
migration is not implemented except for migrating them to/from keyfile's
run directory. The problem is that migrating profiles in general is
complicated but in some cases it is important to do.
For example checkpoint rollback should recreate the profile in the right
settings plugin, not just add it to persistent storage. This is not yet
properly implemented.
--
Previously, both keyfile and ifcfg-rh plugin implemented in-memory (unsaved)
profiles, while ifupdown plugin cannot handle them. That meant duplication of code
and a ifupdown profile could not be modified or made unsaved.
This is now unified and only keyfile plugin handles in-memory profiles (bgo #744711).
Also, NMSettings is aware of such profiles and treats them specially.
In particular, NMSettings drives the migration between persistent and non-persistent
storage.
Note that a settings plugins may create truly generated, in-memory profiles.
The settings plugin is free to generate and persist the profiles in any way it
wishes. But the concept of "unsaved" profiles is now something explicitly handled
by keyfile plugin. Also, these "unsaved" keyfile profiles are persisted to file system
too, to the /run directory. This is great for two reasons: first of all, all
profiles from keyfile storage in fact have a backing file -- even the
unsaved ones. It also means you can create "unsaved" profiles in /run
and load them with `nmcli connection load`, meaning there is a file
based API for creating unsaved profiles.
The other advantage is that these profiles now survive restarting
NetworkManager. It's paramount that restarting the daemon is as
non-disruptive as possible. Persisting unsaved files to /run improves
here significantly.
--
In the past, NMSettingsConnection also implemented NMConnection interface.
That was already changed a while ago and instead users call now
nm_settings_connection_get_connection() to delegate to a
NMSimpleConnection. What however still happened was that the NMConnection
instance gets never swapped but instead the instance was modified with
nm_connection_replace_settings_from_connection(), clear-secrets, etc.
Change that and treat the NMConnection instance immutable. Instead of modifying
it, reference/clone a new instance. This changes that previously when somebody
wanted to keep a reference to an NMConnection, then the profile would be cloned.
Now, it is supposed to be safe to reference the instance directly and everybody
must ensure not to modify the instance. nmtst_connection_assert_unchanging()
should help with that.
The point is that the settings plugins may keep references to the
NMConnection instance, and so does the NMSettingsConnection. We want
to avoid cloning the instances as long as they are the same.
Likewise, the device's applied connection can now also be referenced
instead of cloning it. This is not yet done, and possibly there are
further improvements possible.
--
Also implement multiple keyfile directores /usr/lib, /etc, /run (rh #1674545,
bgo #772414).
It was always the case that multiple files could provide the same UUID
(both in case of keyfile and ifcfg-rh). For keyfile plugin, if a profile in
read-only storage in /usr/lib gets modified, then it gets actually stored in
/etc (or /run, if the profile is unsaved).
--
While at it, make /etc/network/interfaces profiles for ifupdown plugin reloadable.
--
https://bugzilla.gnome.org/show_bug.cgi?id=772414
https://bugzilla.gnome.org/show_bug.cgi?id=744711
https://bugzilla.redhat.com/show_bug.cgi?id=1674545
2019-06-13 15:12:20 +00:00
|
|
|
src/settings/nm-settings-utils.c \
|
|
|
|
|
src/settings/nm-settings-utils.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
settings: rework tracking settings connections and settings plugins
Completely rework how settings plugin handle connections and how
NMSettings tracks the list of connections.
Previously, settings plugins would return objects of (a subtype of) type
NMSettingsConnection. The NMSettingsConnection was tightly coupled with
the settings plugin. That has a lot of downsides.
Change that. When changing this basic relation how settings connections
are tracked, everything falls appart. That's why this is a huge change.
Also, since I have to largely rewrite the settings plugins, I also
added support for multiple keyfile directories, handle in-memory
connections only by keyfile plugin and (partly) use copy-on-write NMConnection
instances. I don't want to spend effort rewriting large parts while
preserving the old way, that anyway should change. E.g. while rewriting ifcfg-rh,
I don't want to let it handle in-memory connections because that's not right
long-term.
--
If the settings plugins themself create subtypes of NMSettingsConnection
instances, then a lot of knowledge about tracking connections moves
to the plugins.
Just try to follow the code what happend during nm_settings_add_connection().
Note how the logic is spread out:
- nm_settings_add_connection() calls plugin's add_connection()
- add_connection() creates a NMSettingsConnection subtype
- the plugin has to know that it's called during add-connection and
not emit NM_SETTINGS_PLUGIN_CONNECTION_ADDED signal
- NMSettings calls claim_connection() which hocks up the new
NMSettingsConnection instance and configures the instance
(like calling nm_settings_connection_added()).
This summary does not sound like a lot, but try to follow that code. The logic
is all over the place.
Instead, settings plugins should have a very simple API for adding, modifying,
deleting, loading and reloading connections. All the plugin does is to return a
NMSettingsStorage handle. The storage instance is a handle to identify a profile
in storage (e.g. a particular file). The settings plugin is free to subtype
NMSettingsStorage, but it's not necessary.
There are no more events raised, and the settings plugin implements the small
API in a straightforward manner.
NMSettings now drives all of this. Even NMSettingsConnection has now
very little concern about how it's tracked and delegates only to NMSettings.
This should make settings plugins simpler. Currently settings plugins
are so cumbersome to implement, that we avoid having them. It should not be
like that and it should be easy, beneficial and lightweight to create a new
settings plugin.
Note also how the settings plugins no longer care about duplicate UUIDs.
Duplicated UUIDs are a fact of life and NMSettings must handle them. No
need to overly concern settings plugins with that.
--
NMSettingsConnection is exposed directly on D-Bus (being a subtype of
NMDBusObject) but it was also a GObject type provided by the settings
plugin. Hence, it was not possible to migrate a profile from one plugin to
another.
However that would be useful when one profile does not support a
connection type (like ifcfg-rh not supporting VPN). Currently such
migration is not implemented except for migrating them to/from keyfile's
run directory. The problem is that migrating profiles in general is
complicated but in some cases it is important to do.
For example checkpoint rollback should recreate the profile in the right
settings plugin, not just add it to persistent storage. This is not yet
properly implemented.
--
Previously, both keyfile and ifcfg-rh plugin implemented in-memory (unsaved)
profiles, while ifupdown plugin cannot handle them. That meant duplication of code
and a ifupdown profile could not be modified or made unsaved.
This is now unified and only keyfile plugin handles in-memory profiles (bgo #744711).
Also, NMSettings is aware of such profiles and treats them specially.
In particular, NMSettings drives the migration between persistent and non-persistent
storage.
Note that a settings plugins may create truly generated, in-memory profiles.
The settings plugin is free to generate and persist the profiles in any way it
wishes. But the concept of "unsaved" profiles is now something explicitly handled
by keyfile plugin. Also, these "unsaved" keyfile profiles are persisted to file system
too, to the /run directory. This is great for two reasons: first of all, all
profiles from keyfile storage in fact have a backing file -- even the
unsaved ones. It also means you can create "unsaved" profiles in /run
and load them with `nmcli connection load`, meaning there is a file
based API for creating unsaved profiles.
The other advantage is that these profiles now survive restarting
NetworkManager. It's paramount that restarting the daemon is as
non-disruptive as possible. Persisting unsaved files to /run improves
here significantly.
--
In the past, NMSettingsConnection also implemented NMConnection interface.
That was already changed a while ago and instead users call now
nm_settings_connection_get_connection() to delegate to a
NMSimpleConnection. What however still happened was that the NMConnection
instance gets never swapped but instead the instance was modified with
nm_connection_replace_settings_from_connection(), clear-secrets, etc.
Change that and treat the NMConnection instance immutable. Instead of modifying
it, reference/clone a new instance. This changes that previously when somebody
wanted to keep a reference to an NMConnection, then the profile would be cloned.
Now, it is supposed to be safe to reference the instance directly and everybody
must ensure not to modify the instance. nmtst_connection_assert_unchanging()
should help with that.
The point is that the settings plugins may keep references to the
NMConnection instance, and so does the NMSettingsConnection. We want
to avoid cloning the instances as long as they are the same.
Likewise, the device's applied connection can now also be referenced
instead of cloning it. This is not yet done, and possibly there are
further improvements possible.
--
Also implement multiple keyfile directores /usr/lib, /etc, /run (rh #1674545,
bgo #772414).
It was always the case that multiple files could provide the same UUID
(both in case of keyfile and ifcfg-rh). For keyfile plugin, if a profile in
read-only storage in /usr/lib gets modified, then it gets actually stored in
/etc (or /run, if the profile is unsaved).
--
While at it, make /etc/network/interfaces profiles for ifupdown plugin reloadable.
--
https://bugzilla.gnome.org/show_bug.cgi?id=772414
https://bugzilla.gnome.org/show_bug.cgi?id=744711
https://bugzilla.redhat.com/show_bug.cgi?id=1674545
2019-06-13 15:12:20 +00:00
|
|
|
src/settings/plugins/keyfile/nms-keyfile-storage.c \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-storage.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/settings/plugins/keyfile/nms-keyfile-plugin.c \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-plugin.h \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-reader.c \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-reader.h \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-utils.c \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-utils.h \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-writer.c \
|
|
|
|
|
src/settings/plugins/keyfile/nms-keyfile-writer.h \
|
|
|
|
|
\
|
2016-11-20 23:24:54 +00:00
|
|
|
src/supplicant/nm-supplicant-config.c \
|
|
|
|
|
src/supplicant/nm-supplicant-config.h \
|
|
|
|
|
src/supplicant/nm-supplicant-interface.c \
|
|
|
|
|
src/supplicant/nm-supplicant-interface.h \
|
|
|
|
|
src/supplicant/nm-supplicant-manager.c \
|
|
|
|
|
src/supplicant/nm-supplicant-manager.h \
|
|
|
|
|
src/supplicant/nm-supplicant-settings-verify.c \
|
|
|
|
|
src/supplicant/nm-supplicant-settings-verify.h \
|
|
|
|
|
src/supplicant/nm-supplicant-types.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
2016-11-20 23:33:50 +00:00
|
|
|
src/vpn/nm-vpn-connection.c \
|
|
|
|
|
src/vpn/nm-vpn-connection.h \
|
|
|
|
|
src/vpn/nm-vpn-manager.c \
|
|
|
|
|
src/vpn/nm-vpn-manager.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
\
|
|
|
|
|
src/nm-act-request.c \
|
|
|
|
|
src/nm-act-request.h \
|
|
|
|
|
src/nm-active-connection.c \
|
|
|
|
|
src/nm-active-connection.h \
|
|
|
|
|
src/nm-audit-manager.c \
|
|
|
|
|
src/nm-audit-manager.h \
|
2018-03-02 04:55:21 +00:00
|
|
|
src/nm-dbus-manager.c \
|
|
|
|
|
src/nm-dbus-manager.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/nm-config.c \
|
|
|
|
|
src/nm-config.h \
|
|
|
|
|
src/nm-config-data.c \
|
|
|
|
|
src/nm-config-data.h \
|
2018-02-19 18:50:18 +00:00
|
|
|
src/nm-connectivity.c \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/nm-connectivity.h \
|
|
|
|
|
src/nm-dcb.c \
|
|
|
|
|
src/nm-dcb.h \
|
2017-04-17 16:40:52 +00:00
|
|
|
src/nm-netns.c \
|
|
|
|
|
src/nm-netns.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/nm-dhcp4-config.c \
|
|
|
|
|
src/nm-dhcp4-config.h \
|
|
|
|
|
src/nm-dhcp6-config.c \
|
|
|
|
|
src/nm-dhcp6-config.h \
|
|
|
|
|
src/nm-dispatcher.c \
|
|
|
|
|
src/nm-dispatcher.h \
|
|
|
|
|
src/nm-firewall-manager.c \
|
|
|
|
|
src/nm-firewall-manager.h \
|
|
|
|
|
src/nm-proxy-config.c \
|
|
|
|
|
src/nm-proxy-config.h \
|
|
|
|
|
src/nm-auth-manager.c \
|
|
|
|
|
src/nm-auth-manager.h \
|
|
|
|
|
src/nm-auth-utils.c \
|
|
|
|
|
src/nm-auth-utils.h \
|
|
|
|
|
src/nm-manager.c \
|
|
|
|
|
src/nm-manager.h \
|
|
|
|
|
src/nm-pacrunner-manager.c \
|
|
|
|
|
src/nm-pacrunner-manager.h \
|
|
|
|
|
src/nm-policy.c \
|
|
|
|
|
src/nm-policy.h \
|
|
|
|
|
src/nm-rfkill-manager.c \
|
|
|
|
|
src/nm-rfkill-manager.h \
|
|
|
|
|
src/nm-session-monitor.h \
|
|
|
|
|
src/nm-session-monitor.c \
|
2018-10-10 15:10:01 +00:00
|
|
|
src/nm-keep-alive.c \
|
|
|
|
|
src/nm-keep-alive.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/nm-sleep-monitor.c \
|
|
|
|
|
src/nm-sleep-monitor.h \
|
2016-10-22 11:54:59 +00:00
|
|
|
src/nm-types.h \
|
2016-10-22 12:54:56 +00:00
|
|
|
\
|
2016-10-15 16:25:13 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_libNetworkManager_la_LIBADD = \
|
|
|
|
|
src/libNetworkManagerBase.la \
|
2019-05-15 11:06:29 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
2020-01-02 06:37:59 +00:00
|
|
|
shared/nm-keyfile/libnm-keyfile.la \
|
2019-05-15 11:06:29 +00:00
|
|
|
libnm-core/libnm-core.la \
|
|
|
|
|
$(libnm_crypto_lib) \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
|
|
|
|
shared/nm-udev-aux/libnm-udev-aux.la \
|
|
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2018-12-28 17:11:16 +00:00
|
|
|
src/libnm-systemd-core.la \
|
|
|
|
|
shared/systemd/libnm-systemd-shared.la \
|
2018-04-06 14:57:26 +00:00
|
|
|
shared/libnacd.la \
|
dhcp: add nettools dhcp4 client
This is inspired by the existing systemd integration, with a few differences:
* This parses the WPAD option, which systemd requested, but did not use.
* We hook into the DAD handling, only making use of the configured address
once DAD has completed successfully, and declining the lease if it fails.
There are still many areas of possible improvement. In particular, we need
to ensure the parsing of all options are compliant, as n-dhcp4 treats all
options as opaque, unlike sd-dhcp4. We probably also need to look at how
to handle failures and retries (in particular if we decline a lease).
We need to query the current MTU at client startu, as well as the hardware
broadcast address. Both these are provided by the kernel over netlink, so
it should simply be a matter of hooking that up with NM's netlink layer.
Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 18:02:48 +00:00
|
|
|
shared/libndhcp4.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcrbtree.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2016-10-15 16:25:13 +00:00
|
|
|
$(GLIB_LIBS) \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
2016-10-15 16:25:13 +00:00
|
|
|
$(SYSTEMD_LOGIN_LIBS) \
|
|
|
|
|
$(LIBNDP_LIBS) \
|
|
|
|
|
$(DL_LIBS) \
|
|
|
|
|
$(SELINUX_LIBS) \
|
2016-10-22 10:25:40 +00:00
|
|
|
$(LIBAUDIT_LIBS) \
|
2017-03-20 16:57:58 +00:00
|
|
|
$(LIBPSL_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(LIBCURL_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-22 13:44:19 +00:00
|
|
|
check_ltlibraries += src/libNetworkManagerTest.la
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup
|
|
|
|
|
src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup
|
2016-10-22 14:56:37 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test)
|
2016-10-22 14:56:37 +00:00
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
src_libNetworkManagerTest_la_SOURCES = \
|
2016-10-13 11:06:25 +00:00
|
|
|
src/ndisc/nm-fake-ndisc.c \
|
|
|
|
|
src/ndisc/nm-fake-ndisc.h \
|
2016-10-15 16:25:13 +00:00
|
|
|
src/platform/nm-fake-platform.c \
|
2016-10-22 13:44:19 +00:00
|
|
|
src/platform/nm-fake-platform.h \
|
|
|
|
|
src/platform/tests/test-common.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/platform/tests/test-common.h \
|
|
|
|
|
$(NULL)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_libNetworkManagerTest_la_LIBADD = \
|
2016-10-22 13:44:19 +00:00
|
|
|
src/libNetworkManager.la \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(GLIB_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-12-18 12:11:18 +00:00
|
|
|
src/NetworkManager.ver: src/libNetworkManager.la $(core_plugins)
|
2018-09-11 11:48:40 +00:00
|
|
|
$(AM_V_GEN) NM="$(NM)" "$(srcdir)/tools/create-exports-NetworkManager.sh" --called-from-build "$(srcdir)"
|
2016-11-10 16:06:37 +00:00
|
|
|
|
|
|
|
|
CLEANFILES += src/NetworkManager.ver
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
EXTRA_src_NetworkManager_DEPENDENCIES = \
|
|
|
|
|
src/NetworkManager.ver
|
|
|
|
|
|
|
|
|
|
src_NetworkManager_CPPFLAGS = $(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_NetworkManager_SOURCES = \
|
|
|
|
|
src/main.c
|
|
|
|
|
|
|
|
|
|
src_NetworkManager_LDADD = \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/libNetworkManager.la \
|
2019-05-15 11:11:10 +00:00
|
|
|
$(GLIB_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(NULL)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_NetworkManager_LDFLAGS = \
|
|
|
|
|
-rdynamic \
|
2018-02-07 10:10:31 +00:00
|
|
|
-Wl,--version-script="src/NetworkManager.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-22 14:23:40 +00:00
|
|
|
src_nm_iface_helper_CPPFLAGS = $(src_cppflags)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_nm_iface_helper_SOURCES = \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/nm-iface-helper.c
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_nm_iface_helper_LDADD = \
|
|
|
|
|
src/libNetworkManagerBase.la \
|
2019-05-15 11:06:29 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
2020-01-02 06:37:59 +00:00
|
|
|
shared/nm-keyfile/libnm-keyfile.la \
|
2019-05-15 11:06:29 +00:00
|
|
|
libnm-core/libnm-core.la \
|
|
|
|
|
$(libnm_crypto_lib) \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
|
|
|
|
shared/nm-udev-aux/libnm-udev-aux.la \
|
|
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2018-12-28 17:11:16 +00:00
|
|
|
src/libnm-systemd-core.la \
|
|
|
|
|
shared/systemd/libnm-systemd-shared.la \
|
dhcp: add nettools dhcp4 client
This is inspired by the existing systemd integration, with a few differences:
* This parses the WPAD option, which systemd requested, but did not use.
* We hook into the DAD handling, only making use of the configured address
once DAD has completed successfully, and declining the lease if it fails.
There are still many areas of possible improvement. In particular, we need
to ensure the parsing of all options are compliant, as n-dhcp4 treats all
options as opaque, unlike sd-dhcp4. We probably also need to look at how
to handle failures and retries (in particular if we decline a lease).
We need to query the current MTU at client startu, as well as the hardware
broadcast address. Both these are provided by the kernel over netlink, so
it should simply be a matter of hooking that up with NM's netlink layer.
Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 18:02:48 +00:00
|
|
|
shared/libndhcp4.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2016-10-15 16:25:13 +00:00
|
|
|
$(GLIB_LIBS) \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
2016-10-15 16:25:13 +00:00
|
|
|
$(LIBNDP_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(DL_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
|
|
|
|
src_nm_iface_helper_LDFLAGS = \
|
2018-02-07 10:10:31 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-05-03 07:13:32 +00:00
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += src/initrd/libnmi-core.la
|
|
|
|
|
|
|
|
|
|
src_initrd_libnmi_core_la_CPPFLAGS = \
|
|
|
|
|
$(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_initrd_libnmi_core_la_SOURCES = \
|
|
|
|
|
src/initrd/nm-initrd-generator.h \
|
2018-08-09 16:02:51 +00:00
|
|
|
src/initrd/nmi-cmdline-reader.c \
|
2019-09-02 15:11:05 +00:00
|
|
|
src/initrd/nmi-dt-reader.c \
|
2018-05-03 07:13:32 +00:00
|
|
|
src/initrd/nmi-ibft-reader.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-04-28 18:36:15 +00:00
|
|
|
libexec_PROGRAMS += src/initrd/nm-initrd-generator
|
|
|
|
|
|
|
|
|
|
src_initrd_nm_initrd_generator_CPPFLAGS = \
|
|
|
|
|
$(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_initrd_nm_initrd_generator_SOURCES = \
|
|
|
|
|
src/initrd/nm-initrd-generator.c
|
|
|
|
|
|
|
|
|
|
src_initrd_nm_initrd_generator_LDADD = \
|
|
|
|
|
src/initrd/libnmi-core.la \
|
|
|
|
|
src/libNetworkManagerBase.la \
|
2019-05-15 11:06:29 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
2020-01-02 06:37:59 +00:00
|
|
|
shared/nm-keyfile/libnm-keyfile.la \
|
2019-05-15 11:06:29 +00:00
|
|
|
libnm-core/libnm-core.la \
|
|
|
|
|
$(libnm_crypto_lib) \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
|
|
|
|
shared/nm-udev-aux/libnm-udev-aux.la \
|
|
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2018-12-28 20:30:03 +00:00
|
|
|
shared/systemd/libnm-systemd-shared.la \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
dhcp: add nettools dhcp4 client
This is inspired by the existing systemd integration, with a few differences:
* This parses the WPAD option, which systemd requested, but did not use.
* We hook into the DAD handling, only making use of the configured address
once DAD has completed successfully, and declining the lease if it fails.
There are still many areas of possible improvement. In particular, we need
to ensure the parsing of all options are compliant, as n-dhcp4 treats all
options as opaque, unlike sd-dhcp4. We probably also need to look at how
to handle failures and retries (in particular if we decline a lease).
We need to query the current MTU at client startu, as well as the hardware
broadcast address. Both these are provided by the kernel over netlink, so
it should simply be a matter of hooking that up with NM's netlink layer.
Contribution under LGPL2.0+, in addition to stated licenses.
2019-05-13 18:02:48 +00:00
|
|
|
shared/libndhcp4.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2018-04-28 18:36:15 +00:00
|
|
|
|
|
|
|
|
src_initrd_nm_initrd_generator_LDFLAGS = \
|
|
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
|
|
|
|
|
2019-09-02 15:11:05 +00:00
|
|
|
check_programs += src/initrd/tests/test-dt-reader
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_dt_reader_CPPFLAGS = \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
|
|
|
|
|
$(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_dt_reader_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_dt_reader_LDADD = \
|
|
|
|
|
src/initrd/libnmi-core.la \
|
|
|
|
|
src/libNetworkManagerTest.la \
|
|
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
|
|
|
|
shared/libcsiphash.la \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-05-03 07:13:32 +00:00
|
|
|
check_programs += src/initrd/tests/test-ibft-reader
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_ibft_reader_CPPFLAGS = \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
|
|
|
|
|
$(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_ibft_reader_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_ibft_reader_LDADD = \
|
|
|
|
|
src/initrd/libnmi-core.la \
|
|
|
|
|
src/libNetworkManagerTest.la \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2018-05-03 07:13:32 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
2018-11-06 22:33:20 +00:00
|
|
|
src/initrd/meson.build \
|
|
|
|
|
src/initrd/tests/meson.build \
|
2018-05-03 07:13:32 +00:00
|
|
|
src/initrd/tests/sysfs/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs/class/net/eth2/address \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/hostname \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/dhcp \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet0/flags \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/isns-server \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/pri-radius-server \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/slp-server \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/sec-radius-server \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/index \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/initiator/flags \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/nic-assoc \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/chap-type \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/flags \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/target-name \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/nic-assoc \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/chap-type \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/index \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/lun \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/flags \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/target2/port \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_table_id \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/acpi_header/oem_id \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/acpi_header/signature \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/hostname \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/gateway \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/mac \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/vlan \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/dhcp \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/origin \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/index \
|
|
|
|
|
src/initrd/tests/sysfs/firmware/ibft/ethernet2/flags \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns1/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-bad-dns2/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-bad-gateway/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-bad-ipaddr/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/class/net/eth1/address \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/mac \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/origin \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/ethernet1/index \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/index \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/lun \
|
|
|
|
|
src/initrd/tests/sysfs-dhcp/firmware/ibft/target1/port \
|
2019-09-10 12:11:16 +00:00
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootpath \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-request \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/bootp-response \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/broadcast-ip \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-ip \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/client-name \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/domain-name \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/gateway-ip \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/name \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/netmask-ip \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/root-path \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/server-ip \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/tftp-file \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/chosen/vendor-options \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/device_type \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/local-mac-address \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/mac-address \
|
|
|
|
|
src/initrd/tests/sysfs-dt/firmware/devicetree/base/ethernet/name \
|
|
|
|
|
src/initrd/tests/sysfs-dt-tftp/firmware/devicetree/base/chosen/bootpath \
|
2018-05-03 07:13:32 +00:00
|
|
|
src/initrd/tests/sysfs-static/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-static/class/net/eth1/address \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target0/port \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/gateway \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/mac \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/primary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/origin \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/secondary-dns \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/ethernet1/index \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target1/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target1/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target1/index \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target1/lun \
|
|
|
|
|
src/initrd/tests/sysfs-static/firmware/ibft/target1/port \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/class/net/eth0/address \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/prefix-len \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/mac \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/vlan \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/origin \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/subnet-mask \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/ethernet0/index \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/initiator/initiator-name \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/target0/target-name \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/target0/ip-addr \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/target0/index \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/target0/lun \
|
|
|
|
|
src/initrd/tests/sysfs-vlan/firmware/ibft/target0/port \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
check_programs += src/initrd/tests/test-cmdline-reader
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_cmdline_reader_CPPFLAGS = \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DTEST_INITRD_DIR=\"$(abs_srcdir)/src/initrd/tests\" \
|
|
|
|
|
$(src_cppflags)
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_cmdline_reader_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
src_initrd_tests_test_cmdline_reader_LDADD = \
|
|
|
|
|
src/initrd/libnmi-core.la \
|
|
|
|
|
src/libNetworkManagerTest.la \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2018-11-03 07:49:32 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2018-05-03 07:13:32 +00:00
|
|
|
|
|
|
|
|
$(src_initrd_libnmi_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-04-28 18:36:15 +00:00
|
|
|
$(src_initrd_nm_initrd_generator_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-08-09 16:02:51 +00:00
|
|
|
$(src_initrd_tests_test_cmdline_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-05-03 07:13:32 +00:00
|
|
|
$(src_initrd_tests_test_ibft_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2019-09-02 15:11:05 +00:00
|
|
|
$(src_initrd_tests_test_dt_reader_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/org.freedesktop.NetworkManager.conf \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/nm-test-utils-core.h \
|
|
|
|
|
src/meson.build
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2016-10-15 17:59:09 +00:00
|
|
|
###############################################################################
|
2016-11-20 23:26:17 +00:00
|
|
|
# src/dhcp
|
2016-10-15 17:59:09 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
libexec_PROGRAMS += src/dhcp/nm-dhcp-helper
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_nm_dhcp_helper_CPPFLAGS = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
2016-10-15 17:59:09 +00:00
|
|
|
-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
$(NULL)
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_nm_dhcp_helper_SOURCES = \
|
|
|
|
|
src/dhcp/nm-dhcp-helper.c \
|
|
|
|
|
src/dhcp/nm-dhcp-helper-api.h \
|
2016-10-15 17:59:09 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_nm_dhcp_helper_LDFLAGS = \
|
2016-10-15 17:59:09 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
|
|
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/dhcp/meson.build
|
|
|
|
|
|
2016-10-15 17:59:09 +00:00
|
|
|
###############################################################################
|
2016-11-20 23:26:17 +00:00
|
|
|
# src/dhcp/tests
|
2016-10-15 17:59:09 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_dhcp_tests_cppflags = $(src_cppflags_test)
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_tests_ldadd = \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-10-22 12:54:56 +00:00
|
|
|
check_programs += \
|
2016-11-20 23:26:17 +00:00
|
|
|
src/dhcp/tests/test-dhcp-dhclient \
|
|
|
|
|
src/dhcp/tests/test-dhcp-utils
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags)
|
|
|
|
|
src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags)
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-11-20 23:26:17 +00:00
|
|
|
src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd)
|
|
|
|
|
src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd)
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 17:59:09 +00:00
|
|
|
EXTRA_DIST += \
|
2016-11-20 23:26:17 +00:00
|
|
|
src/dhcp/tests/test-dhclient-duid.leases \
|
|
|
|
|
src/dhcp/tests/test-dhclient-commented-duid.leases \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/dhcp/tests/meson.build
|
2016-10-15 17:59:09 +00:00
|
|
|
|
2016-10-15 20:13:28 +00:00
|
|
|
###############################################################################
|
2016-11-20 23:38:45 +00:00
|
|
|
# src/ppp
|
2016-10-15 20:13:28 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if WITH_PPP
|
|
|
|
|
|
2016-12-12 20:38:04 +00:00
|
|
|
core_plugins += src/ppp/libnm-ppp-plugin.la
|
|
|
|
|
|
2016-11-20 23:38:45 +00:00
|
|
|
pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la
|
2016-10-15 20:13:28 +00:00
|
|
|
|
2016-11-20 23:38:45 +00:00
|
|
|
src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
2016-10-15 20:13:28 +00:00
|
|
|
-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
|
2016-10-15 20:13:28 +00:00
|
|
|
$(GLIB_CFLAGS)
|
|
|
|
|
|
2016-11-20 23:38:45 +00:00
|
|
|
src_ppp_nm_pppd_plugin_la_SOURCES = \
|
|
|
|
|
src/ppp/nm-pppd-plugin.c \
|
|
|
|
|
src/ppp/nm-pppd-plugin.h \
|
|
|
|
|
src/ppp/nm-ppp-status.h
|
2016-10-15 20:13:28 +00:00
|
|
|
|
2016-11-20 23:38:45 +00:00
|
|
|
src_ppp_nm_pppd_plugin_la_LDFLAGS = \
|
2016-10-15 20:13:28 +00:00
|
|
|
-module -avoid-version
|
|
|
|
|
|
2016-11-20 23:38:45 +00:00
|
|
|
src_ppp_nm_pppd_plugin_la_LIBADD = \
|
2016-10-15 20:13:28 +00:00
|
|
|
$(GLIB_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(DL_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:13:28 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_ppp_nm_pppd_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-11-03 17:38:27 +00:00
|
|
|
src_ppp_libnm_ppp_plugin_la_SOURCES = \
|
|
|
|
|
src/ppp/nm-pppd-plugin.h \
|
|
|
|
|
src/ppp/nm-ppp-manager.c \
|
|
|
|
|
src/ppp/nm-ppp-manager.h \
|
|
|
|
|
src/ppp/nm-ppp-plugin-api.h \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/ppp/nm-ppp-status.h \
|
|
|
|
|
$(NULL)
|
2016-11-03 17:38:27 +00:00
|
|
|
|
|
|
|
|
EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/ppp/nm-ppp-plugin.ver \
|
|
|
|
|
$(NULL)
|
2016-11-03 17:38:27 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base)
|
2016-11-03 17:38:27 +00:00
|
|
|
|
|
|
|
|
src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2019-05-15 08:34:53 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" \
|
|
|
|
|
$(NULL)
|
2016-11-03 17:38:27 +00:00
|
|
|
|
|
|
|
|
src_ppp_libnm_ppp_plugin_la_LIBADD = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-11-03 17:38:27 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 20:13:28 +00:00
|
|
|
endif
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/ppp/meson.build
|
|
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/settings/plugins/keyfile/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-05-19 09:12:53 +00:00
|
|
|
check_programs += src/settings/plugins/keyfile/tests/test-keyfile-settings
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2019-05-19 09:12:53 +00:00
|
|
|
src_settings_plugins_keyfile_tests_test_keyfile_settings_CPPFLAGS = $(src_cppflags_test)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2019-05-19 09:12:53 +00:00
|
|
|
src_settings_plugins_keyfile_tests_test_keyfile_settings_LDFLAGS = \
|
2016-10-15 20:28:34 +00:00
|
|
|
$(GLIB_LIBS) \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2019-05-19 09:12:53 +00:00
|
|
|
src_settings_plugins_keyfile_tests_test_keyfile_settings_LDADD = \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2019-05-19 09:12:53 +00:00
|
|
|
$(src_settings_plugins_keyfile_tests_test_keyfile_settings_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_Old_Format \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_MAC_IB_Old_Format \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Intlist_SSID \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Intlike_SSID_2 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Old \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_New \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Blob \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_TLS_Path_Missing \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_InfiniBand_Connection \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Component \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wired_Group_Name \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_New_Wireless_Group_Names \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_1 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_2 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_1 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_2 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_3 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_minimal_slave_4 \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Flags \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_ID_UUID \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Enum_Property \
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_Flags_Property \
|
2017-01-04 13:41:30 +00:00
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_dcb_connection \
|
2017-11-28 08:02:03 +00:00
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \
|
2016-10-15 20:28:34 +00:00
|
|
|
\
|
|
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \
|
|
|
|
|
\
|
|
|
|
|
src/settings/plugins/keyfile/tests/meson.build
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/settings/plugins/ifcfg-rh
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if CONFIG_PLUGIN_IFCFG_RH
|
|
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base))
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2016-11-22 18:30:06 +00:00
|
|
|
CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h: src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
|
2017-02-22 10:43:49 +00:00
|
|
|
@$(MKDIR_P) src/settings/plugins/ifcfg-rh/
|
2016-10-15 20:28:34 +00:00
|
|
|
$(AM_V_GEN) gdbus-codegen \
|
|
|
|
|
--generate-c-code $(basename $@) \
|
|
|
|
|
--c-namespace NMDBus \
|
|
|
|
|
--interface-prefix com.redhat \
|
|
|
|
|
$<
|
|
|
|
|
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c: src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
|
|
|
|
|
@true
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/shvar.c \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/shvar.h \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
|
2019-05-28 15:55:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-04-07 10:37:52 +00:00
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
|
settings: rework tracking settings connections and settings plugins
Completely rework how settings plugin handle connections and how
NMSettings tracks the list of connections.
Previously, settings plugins would return objects of (a subtype of) type
NMSettingsConnection. The NMSettingsConnection was tightly coupled with
the settings plugin. That has a lot of downsides.
Change that. When changing this basic relation how settings connections
are tracked, everything falls appart. That's why this is a huge change.
Also, since I have to largely rewrite the settings plugins, I also
added support for multiple keyfile directories, handle in-memory
connections only by keyfile plugin and (partly) use copy-on-write NMConnection
instances. I don't want to spend effort rewriting large parts while
preserving the old way, that anyway should change. E.g. while rewriting ifcfg-rh,
I don't want to let it handle in-memory connections because that's not right
long-term.
--
If the settings plugins themself create subtypes of NMSettingsConnection
instances, then a lot of knowledge about tracking connections moves
to the plugins.
Just try to follow the code what happend during nm_settings_add_connection().
Note how the logic is spread out:
- nm_settings_add_connection() calls plugin's add_connection()
- add_connection() creates a NMSettingsConnection subtype
- the plugin has to know that it's called during add-connection and
not emit NM_SETTINGS_PLUGIN_CONNECTION_ADDED signal
- NMSettings calls claim_connection() which hocks up the new
NMSettingsConnection instance and configures the instance
(like calling nm_settings_connection_added()).
This summary does not sound like a lot, but try to follow that code. The logic
is all over the place.
Instead, settings plugins should have a very simple API for adding, modifying,
deleting, loading and reloading connections. All the plugin does is to return a
NMSettingsStorage handle. The storage instance is a handle to identify a profile
in storage (e.g. a particular file). The settings plugin is free to subtype
NMSettingsStorage, but it's not necessary.
There are no more events raised, and the settings plugin implements the small
API in a straightforward manner.
NMSettings now drives all of this. Even NMSettingsConnection has now
very little concern about how it's tracked and delegates only to NMSettings.
This should make settings plugins simpler. Currently settings plugins
are so cumbersome to implement, that we avoid having them. It should not be
like that and it should be easy, beneficial and lightweight to create a new
settings plugin.
Note also how the settings plugins no longer care about duplicate UUIDs.
Duplicated UUIDs are a fact of life and NMSettings must handle them. No
need to overly concern settings plugins with that.
--
NMSettingsConnection is exposed directly on D-Bus (being a subtype of
NMDBusObject) but it was also a GObject type provided by the settings
plugin. Hence, it was not possible to migrate a profile from one plugin to
another.
However that would be useful when one profile does not support a
connection type (like ifcfg-rh not supporting VPN). Currently such
migration is not implemented except for migrating them to/from keyfile's
run directory. The problem is that migrating profiles in general is
complicated but in some cases it is important to do.
For example checkpoint rollback should recreate the profile in the right
settings plugin, not just add it to persistent storage. This is not yet
properly implemented.
--
Previously, both keyfile and ifcfg-rh plugin implemented in-memory (unsaved)
profiles, while ifupdown plugin cannot handle them. That meant duplication of code
and a ifupdown profile could not be modified or made unsaved.
This is now unified and only keyfile plugin handles in-memory profiles (bgo #744711).
Also, NMSettings is aware of such profiles and treats them specially.
In particular, NMSettings drives the migration between persistent and non-persistent
storage.
Note that a settings plugins may create truly generated, in-memory profiles.
The settings plugin is free to generate and persist the profiles in any way it
wishes. But the concept of "unsaved" profiles is now something explicitly handled
by keyfile plugin. Also, these "unsaved" keyfile profiles are persisted to file system
too, to the /run directory. This is great for two reasons: first of all, all
profiles from keyfile storage in fact have a backing file -- even the
unsaved ones. It also means you can create "unsaved" profiles in /run
and load them with `nmcli connection load`, meaning there is a file
based API for creating unsaved profiles.
The other advantage is that these profiles now survive restarting
NetworkManager. It's paramount that restarting the daemon is as
non-disruptive as possible. Persisting unsaved files to /run improves
here significantly.
--
In the past, NMSettingsConnection also implemented NMConnection interface.
That was already changed a while ago and instead users call now
nm_settings_connection_get_connection() to delegate to a
NMSimpleConnection. What however still happened was that the NMConnection
instance gets never swapped but instead the instance was modified with
nm_connection_replace_settings_from_connection(), clear-secrets, etc.
Change that and treat the NMConnection instance immutable. Instead of modifying
it, reference/clone a new instance. This changes that previously when somebody
wanted to keep a reference to an NMConnection, then the profile would be cloned.
Now, it is supposed to be safe to reference the instance directly and everybody
must ensure not to modify the instance. nmtst_connection_assert_unchanging()
should help with that.
The point is that the settings plugins may keep references to the
NMConnection instance, and so does the NMSettingsConnection. We want
to avoid cloning the instances as long as they are the same.
Likewise, the device's applied connection can now also be referenced
instead of cloning it. This is not yet done, and possibly there are
further improvements possible.
--
Also implement multiple keyfile directores /usr/lib, /etc, /run (rh #1674545,
bgo #772414).
It was always the case that multiple files could provide the same UUID
(both in case of keyfile and ifcfg-rh). For keyfile plugin, if a profile in
read-only storage in /usr/lib gets modified, then it gets actually stored in
/etc (or /run, if the profile is unsaved).
--
While at it, make /etc/network/interfaces profiles for ifupdown plugin reloadable.
--
https://bugzilla.gnome.org/show_bug.cgi?id=772414
https://bugzilla.gnome.org/show_bug.cgi?id=744711
https://bugzilla.redhat.com/show_bug.cgi?id=1674545
2019-06-13 15:12:20 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.h \
|
2016-10-15 20:28:34 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
|
settings: rework tracking settings connections and settings plugins
Completely rework how settings plugin handle connections and how
NMSettings tracks the list of connections.
Previously, settings plugins would return objects of (a subtype of) type
NMSettingsConnection. The NMSettingsConnection was tightly coupled with
the settings plugin. That has a lot of downsides.
Change that. When changing this basic relation how settings connections
are tracked, everything falls appart. That's why this is a huge change.
Also, since I have to largely rewrite the settings plugins, I also
added support for multiple keyfile directories, handle in-memory
connections only by keyfile plugin and (partly) use copy-on-write NMConnection
instances. I don't want to spend effort rewriting large parts while
preserving the old way, that anyway should change. E.g. while rewriting ifcfg-rh,
I don't want to let it handle in-memory connections because that's not right
long-term.
--
If the settings plugins themself create subtypes of NMSettingsConnection
instances, then a lot of knowledge about tracking connections moves
to the plugins.
Just try to follow the code what happend during nm_settings_add_connection().
Note how the logic is spread out:
- nm_settings_add_connection() calls plugin's add_connection()
- add_connection() creates a NMSettingsConnection subtype
- the plugin has to know that it's called during add-connection and
not emit NM_SETTINGS_PLUGIN_CONNECTION_ADDED signal
- NMSettings calls claim_connection() which hocks up the new
NMSettingsConnection instance and configures the instance
(like calling nm_settings_connection_added()).
This summary does not sound like a lot, but try to follow that code. The logic
is all over the place.
Instead, settings plugins should have a very simple API for adding, modifying,
deleting, loading and reloading connections. All the plugin does is to return a
NMSettingsStorage handle. The storage instance is a handle to identify a profile
in storage (e.g. a particular file). The settings plugin is free to subtype
NMSettingsStorage, but it's not necessary.
There are no more events raised, and the settings plugin implements the small
API in a straightforward manner.
NMSettings now drives all of this. Even NMSettingsConnection has now
very little concern about how it's tracked and delegates only to NMSettings.
This should make settings plugins simpler. Currently settings plugins
are so cumbersome to implement, that we avoid having them. It should not be
like that and it should be easy, beneficial and lightweight to create a new
settings plugin.
Note also how the settings plugins no longer care about duplicate UUIDs.
Duplicated UUIDs are a fact of life and NMSettings must handle them. No
need to overly concern settings plugins with that.
--
NMSettingsConnection is exposed directly on D-Bus (being a subtype of
NMDBusObject) but it was also a GObject type provided by the settings
plugin. Hence, it was not possible to migrate a profile from one plugin to
another.
However that would be useful when one profile does not support a
connection type (like ifcfg-rh not supporting VPN). Currently such
migration is not implemented except for migrating them to/from keyfile's
run directory. The problem is that migrating profiles in general is
complicated but in some cases it is important to do.
For example checkpoint rollback should recreate the profile in the right
settings plugin, not just add it to persistent storage. This is not yet
properly implemented.
--
Previously, both keyfile and ifcfg-rh plugin implemented in-memory (unsaved)
profiles, while ifupdown plugin cannot handle them. That meant duplication of code
and a ifupdown profile could not be modified or made unsaved.
This is now unified and only keyfile plugin handles in-memory profiles (bgo #744711).
Also, NMSettings is aware of such profiles and treats them specially.
In particular, NMSettings drives the migration between persistent and non-persistent
storage.
Note that a settings plugins may create truly generated, in-memory profiles.
The settings plugin is free to generate and persist the profiles in any way it
wishes. But the concept of "unsaved" profiles is now something explicitly handled
by keyfile plugin. Also, these "unsaved" keyfile profiles are persisted to file system
too, to the /run directory. This is great for two reasons: first of all, all
profiles from keyfile storage in fact have a backing file -- even the
unsaved ones. It also means you can create "unsaved" profiles in /run
and load them with `nmcli connection load`, meaning there is a file
based API for creating unsaved profiles.
The other advantage is that these profiles now survive restarting
NetworkManager. It's paramount that restarting the daemon is as
non-disruptive as possible. Persisting unsaved files to /run improves
here significantly.
--
In the past, NMSettingsConnection also implemented NMConnection interface.
That was already changed a while ago and instead users call now
nm_settings_connection_get_connection() to delegate to a
NMSimpleConnection. What however still happened was that the NMConnection
instance gets never swapped but instead the instance was modified with
nm_connection_replace_settings_from_connection(), clear-secrets, etc.
Change that and treat the NMConnection instance immutable. Instead of modifying
it, reference/clone a new instance. This changes that previously when somebody
wanted to keep a reference to an NMConnection, then the profile would be cloned.
Now, it is supposed to be safe to reference the instance directly and everybody
must ensure not to modify the instance. nmtst_connection_assert_unchanging()
should help with that.
The point is that the settings plugins may keep references to the
NMConnection instance, and so does the NMSettingsConnection. We want
to avoid cloning the instances as long as they are the same.
Likewise, the device's applied connection can now also be referenced
instead of cloning it. This is not yet done, and possibly there are
further improvements possible.
--
Also implement multiple keyfile directores /usr/lib, /etc, /run (rh #1674545,
bgo #772414).
It was always the case that multiple files could provide the same UUID
(both in case of keyfile and ifcfg-rh). For keyfile plugin, if a profile in
read-only storage in /usr/lib gets modified, then it gets actually stored in
/etc (or /run, if the profile is unsaved).
--
While at it, make /etc/network/interfaces profiles for ifupdown plugin reloadable.
--
https://bugzilla.gnome.org/show_bug.cgi?id=772414
https://bugzilla.gnome.org/show_bug.cgi?id=744711
https://bugzilla.redhat.com/show_bug.cgi?id=1674545
2019-06-13 15:12:20 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2018-02-07 10:10:31 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
|
2018-01-28 10:48:49 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2017-04-07 10:37:52 +00:00
|
|
|
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
|
|
|
|
|
$(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la
|
|
|
|
|
$(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-symbols-settings-ifcfg-rh
|
|
|
|
|
|
2016-10-17 13:50:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/settings/plugins/ifcfg-rh/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
|
|
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test)
|
2016-10-17 13:50:56 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
|
|
|
|
|
$(GLIB_LIBS) \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-17 13:50:56 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-17 13:50:56 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2018-05-21 15:06:09 +00:00
|
|
|
dist_libexec_SCRIPTS += \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nm-ifup \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nm-ifdown
|
|
|
|
|
|
2018-07-24 12:05:55 +00:00
|
|
|
install-data-hook-ifcfg-rh:
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts
|
|
|
|
|
|
|
|
|
|
install_data_hook += install-data-hook-ifcfg-rh
|
|
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
endif
|
|
|
|
|
|
2016-10-17 13:50:56 +00:00
|
|
|
EXTRA_DIST += \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \
|
ifcfg-rh: add support for routing rules as "ROUTING_RULE_#" keys
initscripts support rule-* and rule6-* files for that.
Up until now, we ignored these files for the most part, except if
a user configured such files, the profile could not contain any static
routes (or specify a route-table setting). This also worked together
with the dispatcher script "examples/dispatcher/10-ifcfg-rh-routes.sh".
We cannot now start taking over that file format for rules. It might
break existing setups, because we can never fully understand all rules as
they are understood by iproute2. Also, if a user has a rule/rule6 file and
uses NetworkManager successfully today, then clearly there is a script
in place to make that work. We must not break that when adding rules
support.
Hence, store routing rules as numbered "ROUTING_RULE_#" and
"ROUTING_RULE6_#" keys.
Note that we use different keys for IPv4 and IPv6. The main reason is
that the string format is mostly compatible with iproute2. That means,
you can take the value and pass it to `ip rule add`.
However, `ip rule add` only accepts IPv4 rules. For IPv6 rules, the user
needs to call `ip -6 rule add`. If we would use the same key for IPv4
and IPv6, then it would be hard to write a script to do this.
Also, nm_ip_routing_rule_from_string() does take the address family as
hint in this case. This makes
ROUTING_RULE_1="pref 1"
ROUTING_RULE6_1="pref 1"
automatically determine that address families. Otherwise, such
abbreviated forms would be not valid.
2019-03-22 19:13:15 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \
|
2017-11-06 14:32:01 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \
|
2019-02-05 11:53:55 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
|
2017-11-07 18:35:46 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
|
2018-08-10 15:31:59 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
|
2017-05-25 12:03:42 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
|
2017-06-01 10:47:43 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-team-slave-enp31s0f1-142.cexpected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-eth-type \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
|
2019-04-26 11:25:21 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
|
2018-05-24 15:32:37 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
|
2018-04-16 14:45:44 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
|
2019-11-17 21:20:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-owe \
|
2019-02-05 11:53:55 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-sae \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
|
2017-10-31 07:43:59 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-password-raw \
|
2019-02-05 11:53:55 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
|
2019-05-14 13:27:45 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-p12-no-client-cert \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-auto-negotiate-on \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcpv6-hostname-fallback \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
|
2016-10-17 13:50:56 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
|
2016-09-21 13:18:19 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-unknown-ethtool-opt \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
|
2016-11-01 08:15:15 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-1.expected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-2.expected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3 \
|
2016-11-01 20:48:57 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
|
2017-04-25 18:02:29 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
|
libnm, cli, ifcfg-rh: add NMSettingEthtool setting
Note that in NetworkManager API (D-Bus, libnm, and nmcli),
the features are called "feature-xyz". The "feature-" prefix
is used, because NMSettingEthtool possibly will gain support
for options that are not only -K|--offload|--features, for
example -C|--coalesce.
The "xzy" suffix is either how ethtool utility calls the feature
("tso", "rx"). Or, if ethtool utility specifies no alias for that
feature, it's the name from kernel's ETH_SS_FEATURES ("tx-tcp6-segmentation").
If possible, we prefer ethtool utility's naming.
Also note, how the features "feature-sg", "feature-tso", and
"feature-tx" actually refer to multiple underlying kernel features
at once. This too follows what ethtool utility does.
The functionality is not yet implemented server-side.
2018-07-16 21:37:55 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
|
2019-02-05 11:53:55 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-sae \
|
2017-05-25 12:07:28 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
|
2019-05-14 13:27:45 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/test_client.p12 \
|
2017-05-25 12:07:28 +00:00
|
|
|
$(NULL)
|
2016-10-17 13:50:56 +00:00
|
|
|
|
|
|
|
|
# make target dependencies can't have colons in their names, which ends up
|
|
|
|
|
# meaning that we can't add the alias files to EXTRA_DIST. They are instead
|
|
|
|
|
# dist'ed via dist-hook-settings-ifcfg-rh below.
|
|
|
|
|
src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \
|
2017-02-20 23:37:41 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1 \
|
2017-02-20 19:51:45 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3 \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem3:1
|
2016-10-17 13:50:56 +00:00
|
|
|
|
|
|
|
|
dist-hook-settings-ifcfg-rh-alias-files:
|
|
|
|
|
@for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \
|
|
|
|
|
cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
dist_hook += dist-hook-settings-ifcfg-rh-alias-files
|
|
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2017-01-17 23:10:29 +00:00
|
|
|
if CONFIG_PLUGIN_IFCFG_RH
|
2016-10-15 20:28:34 +00:00
|
|
|
dbusservice_DATA += src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
|
2017-01-17 23:10:29 +00:00
|
|
|
endif
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/meson.build \
|
|
|
|
|
src/settings/plugins/ifcfg-rh/tests/meson.build
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/settings/plugins/ifupdown
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if CONFIG_PLUGIN_IFUPDOWN
|
|
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
|
|
|
|
|
|
|
|
|
|
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
|
|
|
|
|
src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
|
|
|
|
|
src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
|
|
|
|
|
src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/settings/plugins/ifupdown/nms-ifupdown-parser.h \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2017-03-12 14:54:02 +00:00
|
|
|
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
|
|
|
|
|
src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/settings/plugins/ifupdown/nms-ifupdown-plugin.h \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2019-05-15 08:34:53 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-settings.ver" \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
|
2017-03-12 14:54:02 +00:00
|
|
|
src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(LIBUDEV_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
2017-04-07 10:37:52 +00:00
|
|
|
$(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-07-26 10:44:20 +00:00
|
|
|
$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-04-07 10:37:52 +00:00
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
|
|
|
|
|
$(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-symbols-settings-ifupdown
|
|
|
|
|
|
2016-10-17 17:10:03 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
|
2016-10-17 17:10:03 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-17 17:10:03 +00:00
|
|
|
|
|
|
|
|
src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \
|
|
|
|
|
src/settings/plugins/ifupdown/libnms-ifupdown-core.la \
|
2018-11-03 07:49:32 +00:00
|
|
|
src/libNetworkManagerTest.la \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-17 17:10:03 +00:00
|
|
|
|
2017-04-07 10:37:52 +00:00
|
|
|
$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
endif
|
|
|
|
|
|
2016-10-17 17:10:03 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test1 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test2 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test3 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test4 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test5 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test6 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test7 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test8 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test9 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test11 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test12 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test13 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test14 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test15 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test16 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test17-wired-static-verify-ip4 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test18-wired-static-verify-ip6 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test19-wired-static-verify-ip4-plen \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test20-source-stanza \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \
|
2019-08-24 11:38:19 +00:00
|
|
|
src/settings/plugins/ifupdown/tests/test22-duplicate-stanzas \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/settings/plugins/ifupdown/meson.build \
|
|
|
|
|
src/settings/plugins/ifupdown/tests/meson.build
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
# src/devices
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/devices/meson.build
|
2016-10-17 17:10:03 +00:00
|
|
|
|
2016-10-15 20:28:34 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/adsl
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/devices/adsl/libnm-device-plugin-adsl.la
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
|
|
|
|
|
src/devices/adsl/nm-atm-manager.c \
|
|
|
|
|
src/devices/adsl/nm-device-adsl.c \
|
|
|
|
|
src/devices/adsl/nm-device-adsl.h
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2016-11-22 17:25:03 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(LIBUDEV_LIBS)
|
2016-10-15 20:28:34 +00:00
|
|
|
|
|
|
|
|
check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
|
2016-11-22 17:25:03 +00:00
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver"
|
2016-10-15 20:28:34 +00:00
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-devices-adsl
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/devices/adsl/meson.build
|
|
|
|
|
|
2016-10-18 06:39:30 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/wwan
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if WITH_MODEM_MANAGER_1
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_cppflags = \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(src_cppflags_device_plugin) \
|
|
|
|
|
$(MM_GLIB_CFLAGS) \
|
|
|
|
|
$(NULL)
|
2016-10-18 06:39:30 +00:00
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/devices/wwan/libnm-wwan.la
|
2016-10-18 06:39:30 +00:00
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_wwan_la_SOURCES = \
|
|
|
|
|
src/devices/wwan/nm-modem-broadband.c \
|
|
|
|
|
src/devices/wwan/nm-modem-broadband.h \
|
|
|
|
|
src/devices/wwan/nm-modem-manager.c \
|
|
|
|
|
src/devices/wwan/nm-modem-manager.h \
|
|
|
|
|
src/devices/wwan/nm-modem.c \
|
2019-03-18 09:53:20 +00:00
|
|
|
src/devices/wwan/nm-modem.h \
|
|
|
|
|
src/devices/wwan/nm-service-providers.c \
|
|
|
|
|
src/devices/wwan/nm-service-providers.h \
|
|
|
|
|
$(NULL)
|
2016-10-18 06:39:30 +00:00
|
|
|
|
|
|
|
|
if WITH_OFONO
|
|
|
|
|
src_devices_wwan_libnm_wwan_la_SOURCES += \
|
|
|
|
|
src/devices/wwan/nm-modem-ofono.c \
|
|
|
|
|
src/devices/wwan/nm-modem-ofono.h
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_wwan_la_LDFLAGS = \
|
|
|
|
|
-avoid-version \
|
|
|
|
|
-Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver"
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_wwan_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(LIBSYSTEMD_LIBS) \
|
|
|
|
|
$(MM_GLIB_LIBS)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_devices_wwan_libnm_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2017-01-20 16:07:50 +00:00
|
|
|
EXTRA_src_devices_wwan_libnm_wwan_la_DEPENDENCIES = \
|
|
|
|
|
src/devices/wwan/libnm-wwan.ver
|
|
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/devices/wwan/libnm-device-plugin-wwan.la
|
2016-10-18 06:39:30 +00:00
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \
|
|
|
|
|
src/devices/wwan/nm-wwan-factory.c \
|
|
|
|
|
src/devices/wwan/nm-device-modem.c \
|
|
|
|
|
src/devices/wwan/nm-device-modem.h
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2016-11-22 17:25:03 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
|
2016-10-18 06:39:30 +00:00
|
|
|
|
|
|
|
|
src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \
|
|
|
|
|
src/devices/wwan/libnm-wwan.la \
|
|
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
|
|
|
|
check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la
|
2016-11-22 17:25:03 +00:00
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver"
|
2016-10-18 06:39:30 +00:00
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so)
|
2016-11-22 17:25:03 +00:00
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver"
|
2016-10-18 06:39:30 +00:00
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-devices-wwan
|
|
|
|
|
|
2019-08-12 10:42:10 +00:00
|
|
|
src_devices_wwan_tests_test_service_providers_SOURCES = \
|
|
|
|
|
src/devices/wwan/tests/test-service-providers.c \
|
|
|
|
|
src/devices/wwan/nm-service-providers.c \
|
|
|
|
|
src/devices/wwan/nm-service-providers.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_tests_test_service_providers_CPPFLAGS = \
|
|
|
|
|
$(src_cppflags_base_test) \
|
|
|
|
|
-I$(srcdir)/src/devices/wwan \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_tests_test_service_providers_LDFLAGS = \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_devices_wwan_tests_test_service_providers_LDADD = \
|
|
|
|
|
src/libNetworkManagerTest.la \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
check_programs += src/devices/wwan/tests/test-service-providers
|
|
|
|
|
|
2019-09-11 14:42:59 +00:00
|
|
|
$(src_devices_wwan_tests_test_service_providers_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 06:39:30 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/devices/wwan/libnm-wwan.ver \
|
2019-08-12 10:42:10 +00:00
|
|
|
src/devices/wwan/meson.build \
|
|
|
|
|
src/devices/wwan/tests/test-service-providers.xml \
|
|
|
|
|
$(NULL)
|
2016-10-18 06:39:30 +00:00
|
|
|
|
2016-10-18 06:50:40 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/bluetooth
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if WITH_MODEM_MANAGER_1
|
|
|
|
|
|
2019-08-24 12:27:11 +00:00
|
|
|
noinst_LTLIBRARIES += src/devices/bluetooth/libnm-bluetooth-utils.la
|
|
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES = \
|
|
|
|
|
src/devices/bluetooth/nm-bluez-common.h \
|
|
|
|
|
src/devices/bluetooth/nm-bt-error.c \
|
|
|
|
|
src/devices/bluetooth/nm-bt-error.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS = \
|
|
|
|
|
$(src_cppflags_base) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
if WITH_BLUEZ5_DUN
|
|
|
|
|
src_devices_bluetooth_libnm_bluetooth_utils_la_SOURCES += \
|
|
|
|
|
src/devices/bluetooth/nm-bluez5-dun.c \
|
|
|
|
|
src/devices/bluetooth/nm-bluez5-dun.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_bluetooth_utils_la_CPPFLAGS += $(BLUEZ5_CFLAGS)
|
|
|
|
|
src_devices_bluetooth_libnm_bluetooth_utils_la_LIBADD += $(BLUEZ5_LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
$(src_devices_bluetooth_libnm_bluetooth_utils_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/devices/bluetooth/libnm-device-plugin-bluetooth.la
|
2016-10-18 06:50:40 +00:00
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
|
2019-08-24 12:27:11 +00:00
|
|
|
src/devices/bluetooth/nm-bluez-manager.c \
|
bluetooth: refactor BlueZ handling and let NMBluezManager cache ObjectManager data
This is a complete refactoring of the bluetooth code.
Now that BlueZ 4 support was dropped, the separation of NMBluezManager
and NMBluez5Manager makes no sense. They should be merged.
At that point, notice that BlueZ 5's D-Bus API is fully centered around
D-Bus's ObjectManager interface. Using that interface, we basically only
call GetManagedObjects() once and register to InterfacesAdded,
InterfacesRemoved and PropertiesChanged signals. There is no need to
fetch individual properties ever.
Note how NMBluezDevice used to query the D-Bus properties itself by
creating a GDBusProxy. This is redundant, because when using the ObjectManager
interfaces, we have all information already.
Instead, let NMBluezManager basically become the client-side cache of
all of BlueZ's ObjectManager interface. NMBluezDevice was mostly concerned
about caching the D-Bus interface's state, tracking suitable profiles
(pan_connection), and moderate between bluez and NMDeviceBt.
These tasks don't get simpler by moving them to a seprate file. Let them
also be handled by NMBluezManager.
I mean, just look how it was previously: NMBluez5Manager registers to
ObjectManager interface and sees a device appearing. It creates a
NMBluezDevice object and registers to its "initialized" and
"notify:usable" signal. In the meantime, NMBluezDevice fetches the
relevant information from D-Bus (although it was already present in the
data provided by the ObjectManager) and eventually emits these usable
and initialized signals.
Then, NMBlue5Manager emits a "bdaddr-added" signal, for which NMBluezManager
creates the NMDeviceBt instance. NMBluezManager, NMBluez5Manager and
NMBluezDevice are strongly cooperating to the point that it is simpler
to merge them.
This is not mere refactoring. This patch aims to make everything
asynchronously and always cancellable. Also, it aims to fix races
and inconsistencies of the state.
- Registering to a NAP server now waits for the response and delays
activation of the NMDeviceBridge accordingly.
- For NAP connections we now watch the bnep0 interface in platform, and tear
down the device when it goes away. Bluez doesn't send us a notification
on D-Bus in that case.
- Rework establishing a DUN connection. It no longer uses blocking
connect() and does not block until rfcomm device appears. It's
all async now. It also watches the rfcomm file descriptor for
POLLERR/POLLHUP to notice disconnect.
- drop nm_device_factory_emit_component_added() and instead let
NMDeviceBt directly register to the WWan factory's "added" signal.
2019-08-11 08:43:53 +00:00
|
|
|
src/devices/bluetooth/nm-bluez-manager.h \
|
2016-10-18 06:50:40 +00:00
|
|
|
src/devices/bluetooth/nm-device-bt.c \
|
2019-08-10 08:39:46 +00:00
|
|
|
src/devices/bluetooth/nm-device-bt.h \
|
|
|
|
|
$(NULL)
|
2016-10-18 06:50:40 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
2016-10-18 06:50:40 +00:00
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2016-11-22 17:25:03 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
|
2016-10-18 06:50:40 +00:00
|
|
|
|
|
|
|
|
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \
|
2019-08-24 12:27:11 +00:00
|
|
|
src/devices/bluetooth/libnm-bluetooth-utils.la \
|
2016-10-18 06:50:40 +00:00
|
|
|
src/devices/wwan/libnm-wwan.la \
|
2019-08-24 12:27:11 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-18 06:50:40 +00:00
|
|
|
|
2019-08-24 12:27:11 +00:00
|
|
|
###############################################################################
|
2016-10-18 06:50:40 +00:00
|
|
|
|
2019-08-24 12:27:11 +00:00
|
|
|
check_programs_norun += \
|
|
|
|
|
src/devices/bluetooth/tests/nm-bt-test
|
|
|
|
|
|
|
|
|
|
src_devices_bluetooth_tests_nm_bt_test_CPPFLAGS = \
|
|
|
|
|
$(src_cppflags_test) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
src_devices_bluetooth_tests_nm_bt_test_LDADD = \
|
|
|
|
|
src/devices/bluetooth/libnm-bluetooth-utils.la \
|
|
|
|
|
src/libNetworkManager.la \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(src_devices_bluetooth_tests_nm_bt_test_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
2016-10-18 06:50:40 +00:00
|
|
|
|
|
|
|
|
check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la
|
2016-11-22 17:25:03 +00:00
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver"
|
2016-10-18 06:50:40 +00:00
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-devices-bluetooth
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
2019-09-24 10:56:09 +00:00
|
|
|
src/devices/bluetooth/meson.build \
|
|
|
|
|
$(NULL)
|
2018-01-08 12:06:54 +00:00
|
|
|
|
2016-10-18 07:06:00 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/wifi
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if WITH_WIFI
|
|
|
|
|
|
2020-01-04 12:55:07 +00:00
|
|
|
noinst_LTLIBRARIES += src/devices/wifi/libnm-wifi-base.la
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2020-01-04 12:55:07 +00:00
|
|
|
src_devices_wifi_libnm_wifi_base_la_SOURCES = \
|
2018-10-10 21:30:46 +00:00
|
|
|
src/devices/wifi/nm-device-olpc-mesh.c \
|
|
|
|
|
src/devices/wifi/nm-device-olpc-mesh.h \
|
2019-01-28 11:39:38 +00:00
|
|
|
src/devices/wifi/nm-device-wifi-p2p.c \
|
|
|
|
|
src/devices/wifi/nm-device-wifi-p2p.h \
|
2016-10-18 07:06:00 +00:00
|
|
|
src/devices/wifi/nm-device-wifi.c \
|
|
|
|
|
src/devices/wifi/nm-device-wifi.h \
|
|
|
|
|
src/devices/wifi/nm-wifi-ap.c \
|
|
|
|
|
src/devices/wifi/nm-wifi-ap.h \
|
core/dbus: rework D-Bus implementation to use lower layer GDBusConnection API
Previously, we used the generated GDBusInterfaceSkeleton types and glued
them via the NMExportedObject base class to our NM types. We also used
GDBusObjectManagerServer.
Don't do that anymore. The resulting code was more complicated despite (or
because?) using generated classes. It was hard to understand, complex, had
ordering-issues, and had a runtime and memory overhead.
This patch refactors this entirely and uses the lower layer API GDBusConnection
directly. It replaces the generated code, GDBusInterfaceSkeleton, and
GDBusObjectManagerServer. All this is now done by NMDbusObject and NMDBusManager
and static descriptor instances of type GDBusInterfaceInfo.
This adds a net plus of more then 1300 lines of hand written code. I claim
that this implementation is easier to understand. Note that previously we
also required extensive and complex glue code to bind our objects to the
generated skeleton objects. Instead, now glue our objects directly to
GDBusConnection. The result is more immediate and gets rid of layers of
code in between.
Now that the D-Bus glue us more under our control, we can address issus and
bottlenecks better, instead of adding code to bend the generated skeletons
to our needs.
Note that the current implementation now only supports one D-Bus connection.
That was effectively the case already, although there were places (and still are)
where the code pretends it could also support connections from a private socket.
We dropped private socket support mainly because it was unused, untested and
buggy, but also because GDBusObjectManagerServer could not export the same
objects on multiple connections. Now, it would be rather straight forward to
fix that and re-introduce ObjectManager on each private connection. But this
commit doesn't do that yet, and the new code intentionally supports only one
D-Bus connection.
Also, the D-Bus startup was simplified. There is no retry, either nm_dbus_manager_start()
succeeds, or it detects the initrd case. In the initrd case, bus manager never tries to
connect to D-Bus. Since the initrd scenario is not yet used/tested, this is good enough
for the moment. It could be easily extended later, for example with polling whether the
system bus appears (like was done previously). Also, restart of D-Bus daemon isn't
supported either -- just like before.
Note how NMDBusManager now implements the ObjectManager D-Bus interface
directly.
Also, this fixes race issues in the server, by no longer delaying
PropertiesChanged signals. NMExportedObject would collect changed
properties and send the signal out in idle_emit_properties_changed()
on idle. This messes up the ordering of change events w.r.t. other
signals and events on the bus. Note that not only NMExportedObject
messed up the ordering. Also the generated code would hook into
notify() and process change events in and idle handle, exhibiting the
same ordering issue too.
No longer do that. PropertiesChanged signals will be sent right away
by hooking into dispatch_properties_changed(). This means, changing
a property in quick succession will no longer be combined and is
guaranteed to emit signals for each individual state. Quite possibly
we emit now more PropertiesChanged signals then before.
However, we are now able to group a set of changes by using standard
g_object_freeze_notify()/g_object_thaw_notify(). We probably should
make more use of that.
Also, now that our signals are all handled in the right order, we
might find places where we still emit them in the wrong order. But that
is then due to the order in which our GObjects emit signals, not due
to an ill behavior of the D-Bus glue. Possibly we need to identify
such ordering issues and fix them.
Numbers (for contrib/rpm --without debug on x86_64):
- the patch changes the code size of NetworkManager by
- 2809360 bytes
+ 2537528 bytes (-9.7%)
- Runtime measurements are harder because there is a large variance
during testing. In other words, the numbers are not reproducible.
Currently, the implementation performs no caching of GVariants at all,
but it would be rather simple to add it, if that turns out to be
useful.
Anyway, without strong claim, it seems that the new form tends to
perform slightly better. That would be no surprise.
$ time (for i in {1..1000}; do nmcli >/dev/null || break; echo -n .; done)
- real 1m39.355s
+ real 1m37.432s
$ time (for i in {1..2000}; do busctl call org.freedesktop.NetworkManager /org/freedesktop org.freedesktop.DBus.ObjectManager GetManagedObjects > /dev/null || break; echo -n .; done)
- real 0m26.843s
+ real 0m25.281s
- Regarding RSS size, just looking at the processes in similar
conditions, doesn't give a large difference. On my system they
consume about 19MB RSS. It seems that the new version has a
slightly smaller RSS size.
- 19356 RSS
+ 18660 RSS
2018-02-26 12:51:52 +00:00
|
|
|
src/devices/wifi/nm-wifi-common.c \
|
|
|
|
|
src/devices/wifi/nm-wifi-common.h \
|
2018-10-10 21:30:46 +00:00
|
|
|
src/devices/wifi/nm-wifi-p2p-peer.c \
|
|
|
|
|
src/devices/wifi/nm-wifi-p2p-peer.h \
|
|
|
|
|
src/devices/wifi/nm-wifi-utils.c \
|
|
|
|
|
src/devices/wifi/nm-wifi-utils.h \
|
|
|
|
|
$(NULL)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2017-12-09 15:28:10 +00:00
|
|
|
if WITH_IWD
|
2020-01-04 12:55:07 +00:00
|
|
|
src_devices_wifi_libnm_wifi_base_la_SOURCES += \
|
2017-12-09 15:28:10 +00:00
|
|
|
src/devices/wifi/nm-device-iwd.c \
|
2017-12-09 15:28:11 +00:00
|
|
|
src/devices/wifi/nm-device-iwd.h \
|
|
|
|
|
src/devices/wifi/nm-iwd-manager.c \
|
2018-10-10 21:30:46 +00:00
|
|
|
src/devices/wifi/nm-iwd-manager.h \
|
|
|
|
|
$(NULL)
|
2017-12-09 15:28:10 +00:00
|
|
|
endif
|
|
|
|
|
|
2020-01-04 12:55:07 +00:00
|
|
|
src_devices_wifi_libnm_wifi_base_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
|
|
|
|
|
|
|
|
|
src_devices_wifi_libnm_wifi_base_la_LIBADD = \
|
|
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
|
|
|
|
$(src_devices_wifi_libnm_wifi_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
core_plugins += src/devices/wifi/libnm-device-plugin-wifi.la
|
|
|
|
|
|
|
|
|
|
src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
|
|
|
|
|
src/devices/wifi/nm-wifi-factory.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2016-11-22 17:25:03 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-devices.ver"
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
|
2020-01-04 12:55:07 +00:00
|
|
|
src/devices/wifi/libnm-wifi-base.la \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(GLIB_LIBS)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2020-01-04 12:55:07 +00:00
|
|
|
$(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 07:06:00 +00:00
|
|
|
check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
|
2016-11-22 17:25:03 +00:00
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver"
|
2016-10-18 07:06:00 +00:00
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-devices-wifi
|
|
|
|
|
|
2019-05-19 09:27:53 +00:00
|
|
|
check_programs += src/devices/wifi/tests/test-devices-wifi
|
2016-10-18 07:10:44 +00:00
|
|
|
|
2019-05-19 09:27:53 +00:00
|
|
|
src_devices_wifi_tests_test_devices_wifi_SOURCES = \
|
|
|
|
|
src/devices/wifi/tests/test-devices-wifi.c \
|
2020-01-04 12:55:07 +00:00
|
|
|
$(NULL)
|
2016-10-18 07:10:44 +00:00
|
|
|
|
2019-05-19 09:27:53 +00:00
|
|
|
src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
|
2016-10-18 07:10:44 +00:00
|
|
|
|
2020-01-04 12:55:07 +00:00
|
|
|
src_devices_wifi_tests_test_devices_wifi_LDADD = \
|
|
|
|
|
src/libNetworkManagerTest.la \
|
|
|
|
|
src/devices/wifi/libnm-wifi-base.la \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-05-19 09:27:53 +00:00
|
|
|
src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 07:10:44 +00:00
|
|
|
|
2019-05-19 09:27:53 +00:00
|
|
|
$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
|
2016-10-18 07:06:00 +00:00
|
|
|
endif
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/devices/wifi/meson.build \
|
2019-09-24 11:07:50 +00:00
|
|
|
$(NULL)
|
2018-01-08 12:06:54 +00:00
|
|
|
|
2016-10-18 07:06:00 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/team
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
Revert "Makefile: rework team compilation flags"
I don't think we should do this.
- renamining/dropping configure options is still an annoyance,
because it requires to different ./configure options depending
on the version. The rename from --enable-teamctl to --enable-team
might be theoretically nice, but more annoying then helpful.
- There is no strict dependency between --enable-team and
--enable-json-validation. At most, one could argue that
when enabling the team plugin (--enable-teamctl), then
libnm must also be build with --enable-json-validation.
But in fact, the team plugin will happily work with a
libnm that doesn't link against libjansson.
That is --enable-teamctl --disable-json-validation will work
in practice just fine.
On the other hand, libnm is a client library to create connection
profiles, fully supporting team profiles also makes sense if the
actual plugin is not installed (or build). Thus, --disable-teamctl
--enable-json-validation certainly makes sense.
At this point, one might ask whether libnm is even still complete without
libjansson. Maybe libnm should *require* --enable-json-validation.
But that is not what the patch was doing, and it would also need
some careful consideration before doing so.
This reverts commit 9d5cd7eae8edc8c558d26f04ffd163effafe57f9.
2017-12-08 07:56:46 +00:00
|
|
|
if WITH_TEAMDCTL
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2016-11-10 16:06:37 +00:00
|
|
|
core_plugins += src/devices/team/libnm-device-plugin-team.la
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
src_devices_team_libnm_device_plugin_team_la_SOURCES = \
|
|
|
|
|
src/devices/team/nm-team-factory.c \
|
|
|
|
|
src/devices/team/nm-device-team.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/devices/team/nm-device-team.h \
|
|
|
|
|
$(NULL)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(src_cppflags_device_plugin) \
|
2016-11-22 17:23:12 +00:00
|
|
|
$(LIBTEAMDCTL_CFLAGS) \
|
2017-02-21 15:26:49 +00:00
|
|
|
$(JANSSON_CFLAGS) \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(NULL)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2019-05-15 08:34:53 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-devices.ver" \
|
|
|
|
|
$(NULL)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
src_devices_team_libnm_device_plugin_team_la_LIBADD = \
|
|
|
|
|
$(LIBTEAMDCTL_LIBS) \
|
2017-02-21 15:26:49 +00:00
|
|
|
$(JANSSON_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
|
|
|
|
check-local-devices-team: src/devices/team/libnm-device-plugin-team.la
|
2016-11-22 17:25:03 +00:00
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver"
|
2016-10-18 07:06:00 +00:00
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so)
|
|
|
|
|
|
|
|
|
|
check_local += check-local-devices-team
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/devices/team/meson.build
|
|
|
|
|
|
2017-08-01 16:27:22 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/ovs
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if WITH_OPENVSWITCH
|
|
|
|
|
|
|
|
|
|
if HAVE_SYSTEMD
|
|
|
|
|
|
|
|
|
|
systemdnmunitdir = $(systemdsystemunitdir)/NetworkManager.service.d
|
|
|
|
|
systemdnmunit_DATA = \
|
|
|
|
|
data/NetworkManager-ovs.conf
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
core_plugins += src/devices/ovs/libnm-device-plugin-ovs.la
|
|
|
|
|
|
|
|
|
|
src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
|
|
|
|
|
src/devices/ovs/nm-ovsdb.c \
|
|
|
|
|
src/devices/ovs/nm-ovsdb.h \
|
|
|
|
|
src/devices/ovs/nm-ovs-factory.c \
|
|
|
|
|
src/devices/ovs/nm-device-ovs-interface.c \
|
|
|
|
|
src/devices/ovs/nm-device-ovs-interface.h \
|
|
|
|
|
src/devices/ovs/nm-device-ovs-port.c \
|
|
|
|
|
src/devices/ovs/nm-device-ovs-port.h \
|
|
|
|
|
src/devices/ovs/nm-device-ovs-bridge.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
src/devices/ovs/nm-device-ovs-bridge.h \
|
|
|
|
|
$(NULL)
|
2017-08-01 16:27:22 +00:00
|
|
|
|
|
|
|
|
src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(src_cppflags_device_plugin) \
|
2017-08-01 16:27:22 +00:00
|
|
|
$(JANSSON_CFLAGS) \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(NULL)
|
2017-08-01 16:27:22 +00:00
|
|
|
|
|
|
|
|
src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
|
|
|
|
|
-module -avoid-version \
|
2019-05-15 08:34:53 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-devices.ver" \
|
|
|
|
|
$(NULL)
|
2017-08-01 16:27:22 +00:00
|
|
|
|
|
|
|
|
src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \
|
|
|
|
|
$(JANSSON_LIBS) \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2017-08-01 16:27:22 +00:00
|
|
|
|
|
|
|
|
check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la
|
|
|
|
|
$(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver"
|
|
|
|
|
$(call check_so_symbols,$(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2017-10-31 08:11:43 +00:00
|
|
|
EXTRA_DIST += \
|
2018-01-08 12:06:54 +00:00
|
|
|
data/NetworkManager-ovs.conf \
|
|
|
|
|
src/devices/ovs/meson.build
|
2017-10-31 08:11:43 +00:00
|
|
|
|
2016-10-18 07:06:00 +00:00
|
|
|
###############################################################################
|
2016-11-20 23:35:32 +00:00
|
|
|
# src/dnsmasq/tests
|
2016-10-18 07:06:00 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-20 23:35:32 +00:00
|
|
|
check_programs += src/dnsmasq/tests/test-dnsmasq-utils
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2016-11-20 23:35:32 +00:00
|
|
|
src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-18 07:06:00 +00:00
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \
|
2018-05-30 08:23:17 +00:00
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2018-02-07 10:10:31 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/dnsmasq/tests/meson.build
|
|
|
|
|
|
2016-10-18 07:36:53 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/platform/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_platform_tests_ldflags = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
|
|
|
|
src_platform_tests_libadd = \
|
2016-10-22 13:44:19 +00:00
|
|
|
src/libNetworkManagerTest.la \
|
2016-10-18 07:36:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
2018-02-15 15:54:30 +00:00
|
|
|
$(LIBUDEV_LIBS)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2016-10-23 08:52:48 +00:00
|
|
|
check_programs_norun += \
|
2016-10-18 07:36:53 +00:00
|
|
|
src/platform/tests/monitor
|
|
|
|
|
|
|
|
|
|
check_programs += \
|
|
|
|
|
src/platform/tests/test-address-fake \
|
|
|
|
|
src/platform/tests/test-address-linux \
|
2019-05-18 09:28:26 +00:00
|
|
|
src/platform/tests/test-cleanup-fake \
|
|
|
|
|
src/platform/tests/test-cleanup-linux \
|
|
|
|
|
src/platform/tests/test-link-fake \
|
|
|
|
|
src/platform/tests/test-link-linux \
|
2016-10-18 07:36:53 +00:00
|
|
|
src/platform/tests/test-nmp-object \
|
2019-05-18 09:28:26 +00:00
|
|
|
src/platform/tests/test-platform-general \
|
2016-10-18 07:36:53 +00:00
|
|
|
src/platform/tests/test-route-fake \
|
|
|
|
|
src/platform/tests/test-route-linux \
|
2019-05-18 09:28:26 +00:00
|
|
|
$(NULL)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_address_fake_SOURCES = src/platform/tests/test-address.c
|
2016-10-22 14:56:37 +00:00
|
|
|
src_platform_tests_test_address_fake_CPPFLAGS = $(src_tests_cppflags_fake)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_platform_tests_test_address_fake_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_address_fake_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_address_linux_SOURCES = src/platform/tests/test-address.c
|
2016-10-22 14:56:37 +00:00
|
|
|
src_platform_tests_test_address_linux_CPPFLAGS = $(src_tests_cppflags_linux)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_platform_tests_test_address_linux_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_address_linux_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_cleanup_fake_SOURCES = src/platform/tests/test-cleanup.c
|
2016-10-22 14:56:37 +00:00
|
|
|
src_platform_tests_test_cleanup_fake_CPPFLAGS = $(src_tests_cppflags_fake)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_platform_tests_test_cleanup_fake_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_cleanup_fake_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_cleanup_linux_SOURCES = src/platform/tests/test-cleanup.c
|
2016-10-22 14:56:37 +00:00
|
|
|
src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
2019-05-18 09:28:26 +00:00
|
|
|
src_platform_tests_test_link_fake_SOURCES = src/platform/tests/test-link.c
|
|
|
|
|
src_platform_tests_test_link_fake_CPPFLAGS = $(src_tests_cppflags_fake)
|
|
|
|
|
src_platform_tests_test_link_fake_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_link_fake_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_link_linux_SOURCES = src/platform/tests/test-link.c
|
|
|
|
|
src_platform_tests_test_link_linux_CPPFLAGS = $(src_tests_cppflags_linux)
|
|
|
|
|
src_platform_tests_test_link_linux_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_link_linux_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
|
|
|
|
|
|
2019-05-18 09:28:26 +00:00
|
|
|
src_platform_tests_test_platform_general_CPPFLAGS = $(src_cppflags_test)
|
|
|
|
|
src_platform_tests_test_platform_general_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_platform_general_LDADD = src/libNetworkManagerTest.la
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_route_fake_SOURCES = src/platform/tests/test-route.c
|
|
|
|
|
src_platform_tests_test_route_fake_CPPFLAGS = $(src_tests_cppflags_fake)
|
|
|
|
|
src_platform_tests_test_route_fake_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_route_fake_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
src_platform_tests_test_route_linux_SOURCES = src/platform/tests/test-route.c
|
|
|
|
|
src_platform_tests_test_route_linux_CPPFLAGS = $(src_tests_cppflags_linux)
|
|
|
|
|
src_platform_tests_test_route_linux_LDFLAGS = $(src_platform_tests_ldflags)
|
|
|
|
|
src_platform_tests_test_route_linux_LDADD = $(src_platform_tests_libadd)
|
|
|
|
|
|
|
|
|
|
$(src_platform_tests_monitor_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_address_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_address_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_cleanup_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_link_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_link_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_platform_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_route_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_platform_tests_test_route_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
2019-05-18 09:28:26 +00:00
|
|
|
src/platform/tests/meson.build \
|
|
|
|
|
$(NULL)
|
2018-01-08 12:06:54 +00:00
|
|
|
|
2016-10-18 07:36:53 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/devices/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_devices_tests_ldflags = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
|
|
|
|
check_programs += \
|
|
|
|
|
src/devices/tests/test-lldp \
|
2018-04-05 13:19:27 +00:00
|
|
|
src/devices/tests/test-acd
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 07:36:53 +00:00
|
|
|
src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
|
|
|
|
|
src_devices_tests_test_lldp_LDADD = \
|
2016-10-22 13:44:19 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_devices_tests_test_acd_CPPFLAGS = $(src_cppflags_test)
|
2018-04-05 13:19:27 +00:00
|
|
|
src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags)
|
|
|
|
|
src_devices_tests_test_acd_LDADD = \
|
2016-10-22 13:44:19 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-04-05 13:19:27 +00:00
|
|
|
$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/devices/tests/meson.build
|
|
|
|
|
|
2016-10-18 07:36:53 +00:00
|
|
|
###############################################################################
|
2016-10-13 11:06:25 +00:00
|
|
|
# src/ndisc/tests
|
2016-10-18 07:36:53 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-13 11:06:25 +00:00
|
|
|
src_ndisc_tests_ldflags = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2016-10-13 11:06:25 +00:00
|
|
|
src_ndisc_tests_ldadd = \
|
2016-10-18 07:36:53 +00:00
|
|
|
src/libNetworkManagerTest.la \
|
|
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2016-10-13 11:06:25 +00:00
|
|
|
check_programs += src/ndisc/tests/test-ndisc-fake
|
|
|
|
|
check_programs_norun += src/ndisc/tests/test-ndisc-linux
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test)
|
2018-02-07 10:10:31 +00:00
|
|
|
src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags)
|
2016-10-13 11:06:25 +00:00
|
|
|
src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_cppflags_test)
|
2018-02-07 10:10:31 +00:00
|
|
|
src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags)
|
2016-10-13 11:06:25 +00:00
|
|
|
src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
|
2016-10-18 07:36:53 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/ndisc/tests/meson.build
|
|
|
|
|
|
2016-10-18 09:29:57 +00:00
|
|
|
###############################################################################
|
2016-11-20 23:24:54 +00:00
|
|
|
# src/supplicant/tests
|
2016-10-18 09:29:57 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-11-20 23:24:54 +00:00
|
|
|
check_programs += src/supplicant/tests/test-supplicant-config
|
2016-10-18 09:29:57 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:29:57 +00:00
|
|
|
|
2016-11-20 23:24:54 +00:00
|
|
|
src_supplicant_tests_test_supplicant_config_LDADD = \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-18 09:29:57 +00:00
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
src_supplicant_tests_test_supplicant_config_LDFLAGS = \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 09:29:57 +00:00
|
|
|
EXTRA_DIST += \
|
2016-11-20 23:24:54 +00:00
|
|
|
src/supplicant/tests/certs/test-ca-cert.pem \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/supplicant/tests/certs/test-cert.p12 \
|
|
|
|
|
src/supplicant/tests/meson.build
|
2016-10-18 09:29:57 +00:00
|
|
|
|
2016-10-18 09:54:58 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/tests/config
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
check_programs += src/tests/config/test-config
|
|
|
|
|
|
|
|
|
|
src_tests_config_test_config_SOURCES = \
|
|
|
|
|
src/tests/config/nm-test-device.c \
|
|
|
|
|
src/tests/config/nm-test-device.h \
|
|
|
|
|
src/tests/config/test-config.c
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
|
|
|
|
src_tests_config_test_config_LDADD = \
|
|
|
|
|
src/libNetworkManagerTest.la
|
|
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
src_tests_config_test_config_LDFLAGS = \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 09:54:58 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
src/tests/config/NetworkManager.conf \
|
2018-11-09 17:06:32 +00:00
|
|
|
src/tests/config/NetworkManager-warn.conf \
|
2016-10-18 09:54:58 +00:00
|
|
|
src/tests/config/NetworkManager.state \
|
|
|
|
|
src/tests/config/bad.conf \
|
|
|
|
|
src/tests/config/global-dns-invalid.conf \
|
|
|
|
|
src/tests/config/conf.d/00-overrides.conf \
|
|
|
|
|
src/tests/config/conf.d/10-more.conf \
|
|
|
|
|
src/tests/config/conf.d/20-config-enable-1.conf \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/tests/config/conf.d/90-last.conf \
|
|
|
|
|
src/tests/config/meson.build
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2016-10-18 09:54:58 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# src/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
src_tests_ldflags = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
|
|
|
|
src_tests_ldadd = \
|
2016-10-22 12:54:56 +00:00
|
|
|
src/libNetworkManagerTest.la
|
2016-10-18 09:54:58 +00:00
|
|
|
|
|
|
|
|
check_programs += \
|
2019-05-19 12:15:31 +00:00
|
|
|
src/tests/test-core \
|
|
|
|
|
src/tests/test-core-with-expect \
|
2016-10-18 09:54:58 +00:00
|
|
|
src/tests/test-ip4-config \
|
|
|
|
|
src/tests/test-ip6-config \
|
|
|
|
|
src/tests/test-dcb \
|
|
|
|
|
src/tests/test-systemd \
|
|
|
|
|
src/tests/test-wired-defname \
|
|
|
|
|
src/tests/test-utils
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:54:58 +00:00
|
|
|
src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_ip4_config_LDADD = $(src_tests_ldadd)
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:54:58 +00:00
|
|
|
src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:54:58 +00:00
|
|
|
src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_dcb_LDADD = $(src_tests_ldadd)
|
|
|
|
|
|
2019-05-19 12:15:31 +00:00
|
|
|
src_tests_test_core_CPPFLAGS = $(src_cppflags_test)
|
|
|
|
|
src_tests_test_core_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_core_LDADD = $(src_tests_ldadd)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2019-05-19 12:15:31 +00:00
|
|
|
src_tests_test_core_with_expect_CPPFLAGS = $(src_cppflags_test)
|
|
|
|
|
src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:54:58 +00:00
|
|
|
src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
|
|
|
|
|
|
2018-07-12 08:53:14 +00:00
|
|
|
src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
|
2016-10-18 09:54:58 +00:00
|
|
|
src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
|
|
|
|
|
src_tests_test_utils_LDADD = $(src_tests_ldadd)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2019-05-19 12:15:31 +00:00
|
|
|
$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2018-01-02 12:37:06 +00:00
|
|
|
src_tests_test_systemd_CPPFLAGS = \
|
2018-12-28 17:11:16 +00:00
|
|
|
$(src_libnm_systemd_core_la_cppflags) \
|
2019-05-15 08:34:53 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
$(NULL)
|
2019-04-08 15:38:44 +00:00
|
|
|
|
|
|
|
|
src_tests_test_systemd_LDFLAGS = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2019-04-08 15:38:44 +00:00
|
|
|
|
2016-10-18 09:54:58 +00:00
|
|
|
src_tests_test_systemd_LDADD = \
|
2018-12-28 17:11:16 +00:00
|
|
|
src/libnm-systemd-core.la \
|
|
|
|
|
shared/systemd/libnm-systemd-shared.la \
|
2018-05-30 11:19:07 +00:00
|
|
|
shared/libcsiphash.la \
|
2019-05-15 10:51:04 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
2018-05-30 11:19:07 +00:00
|
|
|
$(NULL)
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 09:54:58 +00:00
|
|
|
EXTRA_DIST += \
|
2018-01-08 12:06:54 +00:00
|
|
|
src/tests/test-secret-agent.py \
|
|
|
|
|
src/tests/meson.build
|
2016-10-18 09:54:58 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# dispatcher
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2019-05-23 10:38:19 +00:00
|
|
|
dispatcher_nmdbus_dispatcher_sources = \
|
|
|
|
|
dispatcher/nmdbus-dispatcher.h \
|
|
|
|
|
dispatcher/nmdbus-dispatcher.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml
|
|
|
|
|
@$(MKDIR_P) dispatcher/
|
|
|
|
|
$(AM_V_GEN) gdbus-codegen \
|
|
|
|
|
--generate-c-code $(basename $@) \
|
|
|
|
|
--c-namespace NMDBus \
|
|
|
|
|
--interface-prefix org.freedesktop \
|
|
|
|
|
$<
|
|
|
|
|
|
|
|
|
|
dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h
|
|
|
|
|
|
|
|
|
|
CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources)
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
libexec_PROGRAMS += dispatcher/nm-dispatcher
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES += \
|
2016-10-18 12:01:56 +00:00
|
|
|
dispatcher/libnm-dispatcher-core.la
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
dispatcher_cppflags = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
2018-01-02 12:37:06 +00:00
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/dispatcher \
|
|
|
|
|
-I$(builddir)/dispatcher \
|
2016-10-18 12:01:56 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
dispatcher_libnm_dispatcher_core_la_SOURCES = \
|
|
|
|
|
dispatcher/nm-dispatcher-utils.c \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
dispatcher/nm-dispatcher-utils.h \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags)
|
|
|
|
|
|
|
|
|
|
dispatcher_libnm_dispatcher_core_la_LIBADD = \
|
|
|
|
|
libnm/libnm.la \
|
|
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
|
|
|
|
dispatcher_nm_dispatcher_SOURCES = \
|
shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-core
"libnm-core" implements common functionality for "NetworkManager" and
"libnm".
Note that clients like "nmcli" cannot access the internal API provided
by "libnm-core". So, if nmcli wants to do something that is also done by
"libnm-core", , "libnm", or "NetworkManager", the code would have to be
duplicated.
Instead, such code can be in "libnm-libnm-core-{intern|aux}.la".
Note that:
0) "libnm-libnm-core-intern.la" is used by libnm-core itsself.
On the other hand, "libnm-libnm-core-aux.la" is not used by
libnm-core, but provides utilities on top of it.
1) they both extend "libnm-core" with utlities that are not public
API of libnm itself. Maybe part of the code should one day become
public API of libnm. On the other hand, this is code for which
we may not want to commit to a stable interface or which we
don't want to provide as part of the API.
2) "libnm-libnm-core-intern.la" is statically linked by "libnm-core"
and thus directly available to "libnm" and "NetworkManager".
On the other hand, "libnm-libnm-core-aux.la" may be used by "libnm"
and "NetworkManager".
Both libraries may be statically linked by libnm clients (like
nmcli).
3) it must only use glib, libnm-glib-aux.la, and the public API
of libnm-core.
This is important: it must not use "libnm-core/nm-core-internal.h"
nor "libnm-core/nm-utils-private.h" so the static library is usable
by nmcli which couldn't access these.
Note that "shared/nm-meta-setting.c" is an entirely different case,
because it behaves differently depending on whether linking against
"libnm-core" or the client programs. As such, this file must be compiled
twice.
2019-04-15 07:26:53 +00:00
|
|
|
dispatcher/nm-dispatcher.c \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags)
|
|
|
|
|
|
|
|
|
|
dispatcher_nm_dispatcher_LDFLAGS = \
|
2016-11-22 17:25:03 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
dispatcher_nm_dispatcher_LDADD = \
|
|
|
|
|
dispatcher/libnm-dispatcher-core.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
libnm/libnm.la \
|
2016-10-18 12:01:56 +00:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
|
|
|
|
dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in
|
|
|
|
|
@sed \
|
|
|
|
|
-e 's|@sbindir[@]|$(sbindir)|g' \
|
|
|
|
|
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
|
|
|
|
|
-e 's|@localstatedir[@]|$(localstatedir)|g' \
|
|
|
|
|
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
|
|
|
|
$< >$@
|
|
|
|
|
|
|
|
|
|
dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service
|
|
|
|
|
CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service
|
|
|
|
|
|
|
|
|
|
install-data-hook-dispatcher:
|
2018-11-15 18:18:46 +00:00
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-down.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-up.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/no-wait.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-down.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-up.d
|
|
|
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
install_data_hook += install-data-hook-dispatcher
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dbusservice_DATA += dispatcher/nm-dispatcher.conf
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
dispatcher/nm-dispatcher.conf \
|
|
|
|
|
dispatcher/org.freedesktop.nm_dispatcher.service.in \
|
2018-01-08 12:06:54 +00:00
|
|
|
dispatcher/nm-dispatcher.xml \
|
|
|
|
|
dispatcher/meson.build
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# dispatcher/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
check_programs += dispatcher/tests/test-dispatcher-envp
|
|
|
|
|
|
|
|
|
|
dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
2018-01-02 12:37:06 +00:00
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/dispatcher \
|
2019-05-23 10:38:19 +00:00
|
|
|
-I$(builddir)/dispatcher \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
2018-05-30 08:23:17 +00:00
|
|
|
$(SANITIZER_EXEC_CFLAGS) \
|
|
|
|
|
$(NULL)
|
2018-02-07 10:10:31 +00:00
|
|
|
|
2019-05-23 10:38:19 +00:00
|
|
|
dispatcher_tests_test_dispatcher_envp_SOURCES = \
|
|
|
|
|
dispatcher/tests/test-dispatcher-envp.c \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
nodist_dispatcher_tests_test_dispatcher_envp_SOURCES = $(dispatcher_nmdbus_dispatcher_sources)
|
|
|
|
|
|
|
|
|
|
$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources)
|
|
|
|
|
|
2018-02-07 10:10:31 +00:00
|
|
|
dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
dispatcher_tests_test_dispatcher_envp_LDADD = \
|
|
|
|
|
dispatcher/libnm-dispatcher-core.la \
|
2019-04-15 06:16:00 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
libnm/libnm.la \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
dispatcher/tests/dispatcher-connectivity-full \
|
|
|
|
|
dispatcher/tests/dispatcher-connectivity-unknown \
|
|
|
|
|
dispatcher/tests/dispatcher-down \
|
|
|
|
|
dispatcher/tests/dispatcher-external \
|
|
|
|
|
dispatcher/tests/dispatcher-up \
|
|
|
|
|
dispatcher/tests/dispatcher-vpn-down \
|
2018-01-08 12:06:54 +00:00
|
|
|
dispatcher/tests/dispatcher-vpn-up \
|
2019-05-15 08:34:53 +00:00
|
|
|
dispatcher/tests/meson.build \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# clients
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
bin_PROGRAMS += clients/nm-online
|
|
|
|
|
|
|
|
|
|
clients_nm_online_CPPFLAGS = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
2016-10-18 12:01:56 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""nm-online"\" \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
clients_nm_online_LDFLAGS = \
|
2016-11-22 17:25:03 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
clients_nm_online_LDADD = \
|
2019-12-06 16:09:18 +00:00
|
|
|
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
2016-10-18 12:01:56 +00:00
|
|
|
libnm/libnm.la \
|
|
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2019-03-05 09:18:03 +00:00
|
|
|
$(clients_nm_online_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
2017-03-28 20:37:19 +00:00
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/meson.build
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
2017-04-04 08:31:07 +00:00
|
|
|
# clients/common
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2017-04-04 08:31:07 +00:00
|
|
|
clients_cppflags = \
|
build: pass -std=gnu99 to compiler
With --enable-more-warnings, we already used -std=gnu99, see
commit ba2b2de3adcf3e8286249523e3841858e0c2655c.
Compilation may behave differently depending on the selected
C standard that we choose. It seems wrong, with more-warnings,
to build against a C standard, while otherwise leaving it undefind.
Indeed, one might argue, that our build system should not use
such compiler specific options. At least, not without detecting
support for the compiler option during ./configure.
However:
- we already did this for --enable-more-warnings.
- we should not program against a theoretical compiler. In practice,
only gcc and clang works to build NetworkManager. Both these compilers
support this option, so there is no reason to not use it. If we ever
come into the situation to support another compiler, adjusting -std=gnu99
will be the smallest problem. Until that happens (and that's far from
imminent), don't pretend to be portable to non-existing compilers and
use the flag that in practice is available.
See-also: https://gcc.gnu.org/onlinedocs/gcc/Standards.html
2018-07-12 08:23:35 +00:00
|
|
|
$(dflt_cppflags) \
|
2017-04-04 08:31:07 +00:00
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-I$(builddir)/libnm \
|
|
|
|
|
-I$(srcdir)/clients/common \
|
2018-07-12 08:53:14 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
2017-04-04 08:31:07 +00:00
|
|
|
$(GLIB_CFLAGS) \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(SANITIZER_EXEC_CFLAGS) \
|
2018-01-02 12:37:06 +00:00
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2017-04-04 08:31:07 +00:00
|
|
|
check_ltlibraries += clients/common/libnmc-base.la
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2017-04-04 08:31:07 +00:00
|
|
|
clients_common_libnmc_base_la_SOURCES = \
|
|
|
|
|
clients/common/nm-secret-agent-simple.c \
|
|
|
|
|
clients/common/nm-secret-agent-simple.h \
|
|
|
|
|
clients/common/nm-vpn-helpers.c \
|
2017-10-12 13:04:58 +00:00
|
|
|
clients/common/nm-vpn-helpers.h \
|
|
|
|
|
clients/common/nm-client-utils.c \
|
2019-05-15 08:34:53 +00:00
|
|
|
clients/common/nm-client-utils.h \
|
2019-12-17 15:42:05 +00:00
|
|
|
clients/common/nm-polkit-listener.c \
|
|
|
|
|
clients/common/nm-polkit-listener.h \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(NULL)
|
2017-04-04 08:31:07 +00:00
|
|
|
|
2019-09-11 14:45:12 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/common/qrcodegen.c \
|
|
|
|
|
clients/common/qrcodegen.h
|
|
|
|
|
|
2017-04-04 08:31:07 +00:00
|
|
|
clients_common_libnmc_base_la_CPPFLAGS = \
|
|
|
|
|
$(clients_cppflags) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DG_LOG_DOMAIN=\""libnmc"\" \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(NULL)
|
2017-04-04 08:31:07 +00:00
|
|
|
|
|
|
|
|
clients_common_libnmc_base_la_LIBADD = \
|
|
|
|
|
libnm/libnm.la \
|
2018-05-30 11:19:07 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2017-04-04 08:31:07 +00:00
|
|
|
|
|
|
|
|
$(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-05-05 13:27:39 +00:00
|
|
|
$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
2017-10-19 12:00:02 +00:00
|
|
|
$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
|
2017-04-04 08:31:07 +00:00
|
|
|
|
2018-01-11 16:02:13 +00:00
|
|
|
clients_common_settings_doc_h = clients/common/settings-docs.h
|
2017-04-04 08:31:07 +00:00
|
|
|
if HAVE_INTROSPECTION
|
2018-01-11 16:02:13 +00:00
|
|
|
$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
|
2017-04-04 08:31:07 +00:00
|
|
|
$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
|
2018-01-11 16:02:13 +00:00
|
|
|
DISTCLEANFILES += $(clients_common_settings_doc_h)
|
|
|
|
|
check-local-settings-docs: $(clients_common_settings_doc_h)
|
2018-12-06 14:36:55 +00:00
|
|
|
$(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
|
build: commit pre-generated "settings-docs.c" in git
nmcli has documentation strings embedded. Those strings are extracted
from gtk-doc comments, using pygobject and put in the generated file
"clients/common/settings-docs.c".
This file "clients/common/settings-docs.c" is disted, so from
a source tarball you can build nmcli without enabling introspection.
However, when building from a git-tree, the file is missing and
thus one cannot build --with-nmcli unless also using at least
--enable-introspection to generate "clients/common/settings-docs.c".
That is inconvenient. Especially during cross-compilation, where
one also needs python and pygobject in the foreign architecture (because
the generation of "settings-docs.c" loads the built libnm.so via
pygobject). It is bad because nmcli is an essential part of
NetworkManager, so building --without-nmcli is not a great option.
Previously, the only alternative was to pre-generate a source tarball
on a separate machine and build that. This however complicates efforts
to automatically build git snapshots of NetworkManager.
Fix that by commiting "clients/common/settings-docs.c.in" to git.
When building with --disable-introspection, the pre-generated
file is used instead. This is fine, because the file only depends
on static, checked-in documentation strings that seldomly change.
Also add a check target to notice when the pre-generated file differs
from what we are about to generate during --enable-introspection.
That happens when editing one of the gtk-doc entires. In this case,
`make check` will notify that the pre-generated "settings-docs.c.in"
file needs updating too.
Yes, when changing gtk-doc comments you need to updte the file manually.
At least, the check failure notifies you.
2017-04-05 08:50:09 +00:00
|
|
|
check_local += check-local-settings-docs
|
2017-04-04 08:31:07 +00:00
|
|
|
else
|
2018-01-11 16:02:13 +00:00
|
|
|
$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
|
|
|
|
|
$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
|
build: commit pre-generated "settings-docs.c" in git
nmcli has documentation strings embedded. Those strings are extracted
from gtk-doc comments, using pygobject and put in the generated file
"clients/common/settings-docs.c".
This file "clients/common/settings-docs.c" is disted, so from
a source tarball you can build nmcli without enabling introspection.
However, when building from a git-tree, the file is missing and
thus one cannot build --with-nmcli unless also using at least
--enable-introspection to generate "clients/common/settings-docs.c".
That is inconvenient. Especially during cross-compilation, where
one also needs python and pygobject in the foreign architecture (because
the generation of "settings-docs.c" loads the built libnm.so via
pygobject). It is bad because nmcli is an essential part of
NetworkManager, so building --without-nmcli is not a great option.
Previously, the only alternative was to pre-generate a source tarball
on a separate machine and build that. This however complicates efforts
to automatically build git snapshots of NetworkManager.
Fix that by commiting "clients/common/settings-docs.c.in" to git.
When building with --disable-introspection, the pre-generated
file is used instead. This is fine, because the file only depends
on static, checked-in documentation strings that seldomly change.
Also add a check target to notice when the pre-generated file differs
from what we are about to generate during --enable-introspection.
That happens when editing one of the gtk-doc entires. In this case,
`make check` will notify that the pre-generated "settings-docs.c.in"
file needs updating too.
Yes, when changing gtk-doc comments you need to updte the file manually.
At least, the check failure notifies you.
2017-04-05 08:50:09 +00:00
|
|
|
check-local-settings-docs:
|
2017-04-04 08:31:07 +00:00
|
|
|
endif
|
build: commit pre-generated "settings-docs.c" in git
nmcli has documentation strings embedded. Those strings are extracted
from gtk-doc comments, using pygobject and put in the generated file
"clients/common/settings-docs.c".
This file "clients/common/settings-docs.c" is disted, so from
a source tarball you can build nmcli without enabling introspection.
However, when building from a git-tree, the file is missing and
thus one cannot build --with-nmcli unless also using at least
--enable-introspection to generate "clients/common/settings-docs.c".
That is inconvenient. Especially during cross-compilation, where
one also needs python and pygobject in the foreign architecture (because
the generation of "settings-docs.c" loads the built libnm.so via
pygobject). It is bad because nmcli is an essential part of
NetworkManager, so building --without-nmcli is not a great option.
Previously, the only alternative was to pre-generate a source tarball
on a separate machine and build that. This however complicates efforts
to automatically build git snapshots of NetworkManager.
Fix that by commiting "clients/common/settings-docs.c.in" to git.
When building with --disable-introspection, the pre-generated
file is used instead. This is fine, because the file only depends
on static, checked-in documentation strings that seldomly change.
Also add a check target to notice when the pre-generated file differs
from what we are about to generate during --enable-introspection.
That happens when editing one of the gtk-doc entires. In this case,
`make check` will notify that the pre-generated "settings-docs.c.in"
file needs updating too.
Yes, when changing gtk-doc comments you need to updte the file manually.
At least, the check failure notifies you.
2017-04-05 08:50:09 +00:00
|
|
|
EXTRA_DIST += \
|
2018-01-11 16:02:13 +00:00
|
|
|
$(clients_common_settings_doc_h) \
|
|
|
|
|
$(clients_common_settings_doc_h).in
|
2017-04-04 08:31:07 +00:00
|
|
|
|
|
|
|
|
if HAVE_INTROSPECTION
|
|
|
|
|
check_ltlibraries += clients/common/libnmc.la
|
|
|
|
|
else
|
|
|
|
|
EXTRA_LTLIBRARIES += clients/common/libnmc.la
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
clients_common_libnmc_la_SOURCES = \
|
2017-03-28 09:38:00 +00:00
|
|
|
shared/nm-meta-setting.c \
|
|
|
|
|
shared/nm-meta-setting.h \
|
libnm, cli, ifcfg-rh: add NMSettingEthtool setting
Note that in NetworkManager API (D-Bus, libnm, and nmcli),
the features are called "feature-xyz". The "feature-" prefix
is used, because NMSettingEthtool possibly will gain support
for options that are not only -K|--offload|--features, for
example -C|--coalesce.
The "xzy" suffix is either how ethtool utility calls the feature
("tso", "rx"). Or, if ethtool utility specifies no alias for that
feature, it's the name from kernel's ETH_SS_FEATURES ("tx-tcp6-segmentation").
If possible, we prefer ethtool utility's naming.
Also note, how the features "feature-sg", "feature-tso", and
"feature-tx" actually refer to multiple underlying kernel features
at once. This too follows what ethtool utility does.
The functionality is not yet implemented server-side.
2018-07-16 21:37:55 +00:00
|
|
|
\
|
2017-03-28 09:38:00 +00:00
|
|
|
clients/common/nm-meta-setting-desc.c \
|
|
|
|
|
clients/common/nm-meta-setting-desc.h \
|
2017-03-31 12:45:46 +00:00
|
|
|
clients/common/nm-meta-setting-access.c \
|
|
|
|
|
clients/common/nm-meta-setting-access.h \
|
2017-04-04 08:31:07 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_common_libnmc_la_CPPFLAGS = \
|
|
|
|
|
$(clients_cppflags) \
|
2019-05-03 09:01:33 +00:00
|
|
|
-I$(builddir)/clients/common \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DG_LOG_DOMAIN=\""libnmc"\" \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(NULL)
|
2017-04-04 08:31:07 +00:00
|
|
|
|
|
|
|
|
clients_common_libnmc_la_LIBADD = \
|
2019-05-15 11:18:05 +00:00
|
|
|
libnm/libnm.la \
|
2019-05-15 08:34:53 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
2017-04-04 08:31:07 +00:00
|
|
|
|
|
|
|
|
$(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-01-11 16:02:13 +00:00
|
|
|
$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
|
2017-04-04 08:31:07 +00:00
|
|
|
$(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
|
|
|
|
|
|
2017-04-04 08:41:22 +00:00
|
|
|
if HAVE_INTROSPECTION
|
2019-05-19 11:54:17 +00:00
|
|
|
check_programs += clients/common/tests/test-clients-common
|
2017-04-04 08:41:22 +00:00
|
|
|
else
|
|
|
|
|
if BUILD_NMCLI
|
2019-05-19 11:54:17 +00:00
|
|
|
check_programs += clients/common/tests/test-clients-common
|
2017-04-04 08:41:22 +00:00
|
|
|
endif
|
|
|
|
|
endif
|
|
|
|
|
|
2019-05-19 11:54:17 +00:00
|
|
|
clients_common_tests_test_clients_common_CPPFLAGS = \
|
2017-04-04 08:41:22 +00:00
|
|
|
-I$(srcdir)/clients/common/tests \
|
|
|
|
|
$(clients_cppflags) \
|
2018-01-02 12:37:06 +00:00
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(NULL)
|
2018-02-07 10:10:31 +00:00
|
|
|
|
2019-05-19 11:54:17 +00:00
|
|
|
clients_common_tests_test_clients_common_LDFLAGS = \
|
2018-02-07 10:10:31 +00:00
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2017-04-04 08:41:22 +00:00
|
|
|
|
2019-05-19 11:54:17 +00:00
|
|
|
clients_common_tests_test_clients_common_LDADD = \
|
2017-04-04 08:41:22 +00:00
|
|
|
clients/common/libnmc.la \
|
2019-05-15 11:40:21 +00:00
|
|
|
clients/common/libnmc-base.la \
|
|
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
|
|
|
|
shared/libcsiphash.la \
|
|
|
|
|
libnm/libnm.la \
|
2017-04-04 08:41:22 +00:00
|
|
|
$(GLIB_LIBS)
|
|
|
|
|
|
2019-05-19 11:54:17 +00:00
|
|
|
$(clients_common_tests_test_clients_common_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2017-04-04 08:41:22 +00:00
|
|
|
|
2019-04-21 08:11:16 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2019-03-06 15:59:53 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/common/tests/wg-test0.conf \
|
|
|
|
|
clients/common/tests/wg-test1.conf \
|
|
|
|
|
clients/common/tests/wg-test2.conf \
|
|
|
|
|
clients/common/tests/wg-test3.conf \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2019-04-21 08:11:16 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
check_programs += clients/common/tests/test-libnm-core-aux
|
|
|
|
|
|
|
|
|
|
clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
|
|
|
|
|
$(dflt_cppflags) \
|
|
|
|
|
-I$(builddir)/shared \
|
|
|
|
|
-I$(srcdir)/shared \
|
|
|
|
|
-I$(builddir)/libnm-core \
|
|
|
|
|
-I$(srcdir)/libnm-core \
|
|
|
|
|
-I$(builddir)/libnm \
|
|
|
|
|
-I$(srcdir)/libnm \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION_TEST \
|
|
|
|
|
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(GLIB_CFLAGS) \
|
|
|
|
|
$(SANITIZER_LIB_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_common_tests_test_libnm_core_aux_LDFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_LDFLAGS) \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_common_tests_test_libnm_core_aux_LDADD = \
|
|
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
|
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
2019-05-15 09:53:55 +00:00
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
libnm/libnm.la \
|
2019-04-21 08:11:16 +00:00
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(clients_common_tests_test_libnm_core_aux_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
|
2017-04-04 08:31:07 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# clients/cli
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if BUILD_NMCLI
|
|
|
|
|
|
|
|
|
|
bin_PROGRAMS += clients/cli/nmcli
|
|
|
|
|
|
|
|
|
|
clients_cli_nmcli_SOURCES = \
|
2016-10-18 12:01:56 +00:00
|
|
|
clients/cli/common.c \
|
|
|
|
|
clients/cli/common.h \
|
2017-04-04 08:41:22 +00:00
|
|
|
clients/cli/utils.c \
|
|
|
|
|
clients/cli/utils.h \
|
|
|
|
|
clients/cli/agent.c \
|
|
|
|
|
clients/cli/agent.h \
|
|
|
|
|
clients/cli/general.c \
|
|
|
|
|
clients/cli/general.h \
|
2016-10-18 12:01:56 +00:00
|
|
|
clients/cli/connections.c \
|
|
|
|
|
clients/cli/connections.h \
|
|
|
|
|
clients/cli/devices.c \
|
|
|
|
|
clients/cli/devices.h \
|
|
|
|
|
clients/cli/settings.c \
|
|
|
|
|
clients/cli/settings.h \
|
|
|
|
|
clients/cli/nmcli.c \
|
|
|
|
|
clients/cli/nmcli.h \
|
|
|
|
|
clients/cli/polkit-agent.c \
|
|
|
|
|
clients/cli/polkit-agent.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_cli_nmcli_CPPFLAGS = \
|
2016-11-21 11:59:31 +00:00
|
|
|
-I$(srcdir)/clients/cli \
|
2017-04-04 08:31:07 +00:00
|
|
|
$(clients_cppflags) \
|
2016-10-18 12:01:56 +00:00
|
|
|
-DG_LOG_DOMAIN=\""nmcli"\" \
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
clients_cli_nmcli_LDADD = \
|
2017-04-04 08:31:07 +00:00
|
|
|
clients/common/libnmc.la \
|
2019-05-15 11:40:21 +00:00
|
|
|
clients/common/libnmc-base.la \
|
|
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2019-12-06 16:09:18 +00:00
|
|
|
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
libnm/libnm.la \
|
2016-10-18 12:01:56 +00:00
|
|
|
$(GLIB_LIBS) \
|
2017-04-04 08:31:07 +00:00
|
|
|
$(READLINE_LIBS)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
clients_cli_nmcli_LDFLAGS = \
|
2018-02-07 10:10:31 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2017-04-04 08:31:07 +00:00
|
|
|
$(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
2018-05-05 13:27:39 +00:00
|
|
|
$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
install-data-hook-nmcli:
|
|
|
|
|
$(mkinstalldirs) $(DESTDIR)$(completiondir)
|
|
|
|
|
$(INSTALL_DATA) $(srcdir)/clients/cli/nmcli-completion $(DESTDIR)$(completiondir)/nmcli
|
|
|
|
|
|
|
|
|
|
install_data_hook += install-data-hook-nmcli
|
|
|
|
|
|
|
|
|
|
uninstall-hook-nmcli:
|
|
|
|
|
rm -f $(DESTDIR)$(completiondir)/nmcli
|
|
|
|
|
|
|
|
|
|
uninstall_hook += uninstall-hook-nmcli
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/cli/nmcli-completion \
|
2018-01-08 12:06:54 +00:00
|
|
|
clients/cli/meson.build \
|
|
|
|
|
clients/common/settings-docs.xsl \
|
|
|
|
|
clients/common/meson.build \
|
|
|
|
|
clients/common/tests/meson.build
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# clients/tui
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if BUILD_NMTUI
|
|
|
|
|
|
|
|
|
|
noinst_LIBRARIES += clients/tui/newt/libnmt-newt.a
|
|
|
|
|
|
|
|
|
|
clients_tui_newt_libnmt_newt_a_SOURCES = \
|
|
|
|
|
clients/tui/newt/nmt-newt.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-types.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-button.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-button.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-button-box.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-button-box.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-checkbox.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-checkbox.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-component.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-component.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-container.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-container.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-entry.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-entry.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-entry-numeric.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-entry-numeric.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-form.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-form.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-grid.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-grid.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-hacks.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-hacks.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-label.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-label.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-listbox.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-listbox.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-popup.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-popup.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-section.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-section.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-separator.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-separator.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-stack.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-stack.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-textbox.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-textbox.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-toggle-button.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-toggle-button.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-utils.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-utils.h \
|
|
|
|
|
clients/tui/newt/nmt-newt-widget.c \
|
|
|
|
|
clients/tui/newt/nmt-newt-widget.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(clients_cppflags) \
|
2016-10-18 12:01:56 +00:00
|
|
|
-DG_LOG_DOMAIN=\""nmtui"\" \
|
|
|
|
|
$(NEWT_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2018-05-02 11:03:59 +00:00
|
|
|
$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
bin_PROGRAMS += clients/tui/nmtui
|
|
|
|
|
|
|
|
|
|
clients_tui_nmtui_SOURCES = \
|
|
|
|
|
clients/tui/nmtui.c \
|
|
|
|
|
clients/tui/nmtui.h \
|
|
|
|
|
clients/tui/nmtui-connect.c \
|
|
|
|
|
clients/tui/nmtui-connect.h \
|
|
|
|
|
clients/tui/nmtui-edit.c \
|
|
|
|
|
clients/tui/nmtui-edit.h \
|
|
|
|
|
clients/tui/nmtui-hostname.c \
|
|
|
|
|
clients/tui/nmtui-hostname.h \
|
|
|
|
|
\
|
|
|
|
|
clients/tui/nm-editor-bindings.c \
|
|
|
|
|
clients/tui/nm-editor-bindings.h \
|
|
|
|
|
clients/tui/nm-editor-utils.c \
|
|
|
|
|
clients/tui/nm-editor-utils.h \
|
|
|
|
|
\
|
|
|
|
|
clients/tui/nmt-address-list.c \
|
|
|
|
|
clients/tui/nmt-address-list.h \
|
|
|
|
|
clients/tui/nmt-connect-connection-list.c \
|
|
|
|
|
clients/tui/nmt-connect-connection-list.h \
|
|
|
|
|
clients/tui/nmt-device-entry.c \
|
|
|
|
|
clients/tui/nmt-device-entry.h \
|
|
|
|
|
clients/tui/nmt-edit-connection-list.c \
|
|
|
|
|
clients/tui/nmt-edit-connection-list.h \
|
|
|
|
|
clients/tui/nmt-editor-grid.c \
|
|
|
|
|
clients/tui/nmt-editor-grid.h \
|
|
|
|
|
clients/tui/nmt-editor-page.c \
|
|
|
|
|
clients/tui/nmt-editor-page.h \
|
|
|
|
|
clients/tui/nmt-editor-page-device.c \
|
|
|
|
|
clients/tui/nmt-editor-page-device.h \
|
|
|
|
|
clients/tui/nmt-editor-section.c \
|
|
|
|
|
clients/tui/nmt-editor-section.h \
|
|
|
|
|
clients/tui/nmt-editor.c \
|
|
|
|
|
clients/tui/nmt-editor.h \
|
|
|
|
|
clients/tui/nmt-ip-entry.c \
|
|
|
|
|
clients/tui/nmt-ip-entry.h \
|
|
|
|
|
clients/tui/nmt-mac-entry.c \
|
|
|
|
|
clients/tui/nmt-mac-entry.h \
|
|
|
|
|
clients/tui/nmt-mtu-entry.c \
|
|
|
|
|
clients/tui/nmt-mtu-entry.h \
|
|
|
|
|
clients/tui/nmt-page-bond.c \
|
|
|
|
|
clients/tui/nmt-page-bond.h \
|
|
|
|
|
clients/tui/nmt-page-bridge.c \
|
|
|
|
|
clients/tui/nmt-page-bridge.h \
|
|
|
|
|
clients/tui/nmt-page-bridge-port.c \
|
|
|
|
|
clients/tui/nmt-page-bridge-port.h \
|
|
|
|
|
clients/tui/nmt-page-dsl.c \
|
|
|
|
|
clients/tui/nmt-page-dsl.h \
|
|
|
|
|
clients/tui/nmt-page-ethernet.c \
|
|
|
|
|
clients/tui/nmt-page-ethernet.h \
|
|
|
|
|
clients/tui/nmt-page-infiniband.c \
|
|
|
|
|
clients/tui/nmt-page-infiniband.h \
|
2016-11-04 13:00:04 +00:00
|
|
|
clients/tui/nmt-page-ip-tunnel.c \
|
|
|
|
|
clients/tui/nmt-page-ip-tunnel.h \
|
2016-10-18 12:01:56 +00:00
|
|
|
clients/tui/nmt-page-ip4.c \
|
|
|
|
|
clients/tui/nmt-page-ip4.h \
|
|
|
|
|
clients/tui/nmt-page-ip6.c \
|
|
|
|
|
clients/tui/nmt-page-ip6.h \
|
|
|
|
|
clients/tui/nmt-page-ppp.c \
|
|
|
|
|
clients/tui/nmt-page-ppp.h \
|
|
|
|
|
clients/tui/nmt-page-team.c \
|
|
|
|
|
clients/tui/nmt-page-team.h \
|
|
|
|
|
clients/tui/nmt-page-team-port.c \
|
|
|
|
|
clients/tui/nmt-page-team-port.h \
|
|
|
|
|
clients/tui/nmt-page-vlan.c \
|
|
|
|
|
clients/tui/nmt-page-vlan.h \
|
|
|
|
|
clients/tui/nmt-page-wifi.c \
|
|
|
|
|
clients/tui/nmt-page-wifi.h \
|
|
|
|
|
clients/tui/nmt-password-dialog.c \
|
|
|
|
|
clients/tui/nmt-password-dialog.h \
|
|
|
|
|
clients/tui/nmt-password-fields.c \
|
|
|
|
|
clients/tui/nmt-password-fields.h \
|
|
|
|
|
clients/tui/nmt-route-editor.c \
|
|
|
|
|
clients/tui/nmt-route-editor.h \
|
|
|
|
|
clients/tui/nmt-route-entry.c \
|
|
|
|
|
clients/tui/nmt-route-entry.h \
|
|
|
|
|
clients/tui/nmt-route-table.c \
|
|
|
|
|
clients/tui/nmt-route-table.h \
|
|
|
|
|
clients/tui/nmt-slave-list.c \
|
|
|
|
|
clients/tui/nmt-slave-list.h \
|
|
|
|
|
clients/tui/nmt-utils.c \
|
|
|
|
|
clients/tui/nmt-utils.h \
|
|
|
|
|
clients/tui/nmt-widget-list.c \
|
|
|
|
|
clients/tui/nmt-widget-list.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_tui_nmtui_CPPFLAGS = \
|
|
|
|
|
-I$(srcdir)/clients/tui/newt \
|
2017-04-04 08:31:07 +00:00
|
|
|
$(clients_cppflags) \
|
2016-10-18 12:01:56 +00:00
|
|
|
-DG_LOG_DOMAIN=\""nmtui"\" \
|
2018-07-12 08:53:14 +00:00
|
|
|
$(NEWT_CFLAGS) \
|
build: create "config-extra.h" header instead of passing directory variables via CFLAGS
1) the command line gets shorter. I frequently run `make V=1` to see
the command line arguments for the compiler, and there is a lot
of noise.
2) define each of these variables at one place. This makes it easy
to verify that for all compilation units, a particular
define has the same value. Previously that was not obvious or
even not the case (see commit e5d1a71396e107d1909744d26ad401f206c0c915
and commit d63cf1ef2faba57595112a82e962b9643cce4718).
The point is to avoid redundancy.
3) not all compilation units need all defines. In fact, most modules
would only need a few of these defines. We aimed to pass the necessary
minium of defines to each compilation unit, but that was non-obvious
to get right and often we set a define that wasn't used. See for example
"src_settings_plugins_ibft_cppflags" which needlessly had "-DSYSCONFDIR".
This question is now entirely avoided by just defining all variables in
a header. We don't care to find the minimum, because every component
gets anyway all defines from the header.
4) this also avoids the situation, where a module that previously did
not use a particular define gets modified to require it. Previously,
that would have required to identify the missing define, and add
it to the CFLAGS of the complation unit. Since every compilation
now includes "config-extra.h", all defines are available everywhere.
5) the fact that each define is now available in all compilation units
could be perceived as a downside. But it isn't, because these defines
should have a unique name and one specific value. Defining the same
name with different values, or refer to the same value by different
names is a bug, not a desirable feature. Since these defines should
be unique accross the entire tree, there is no problem in providing
them to every compilation unit.
6) the reason why we generate "config-extra.h" this way, instead of using
AC_DEFINE() in configure.ac, is due to the particular handling of
autoconf for directory variables. See [1].
With meson, it would be trivial to put them into "config.h.meson".
While that is not easy with autoconf, the "config-extra.h" workaround
seems still preferable to me.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
2018-07-12 08:58:23 +00:00
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
clients_tui_nmtui_LDFLAGS = \
|
2018-02-07 10:10:31 +00:00
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
clients_tui_nmtui_LDADD = \
|
|
|
|
|
clients/tui/newt/libnmt-newt.a \
|
2019-03-31 09:36:09 +00:00
|
|
|
clients/common/libnmc.la \
|
2019-05-15 11:40:21 +00:00
|
|
|
clients/common/libnmc-base.la \
|
2019-12-06 12:02:31 +00:00
|
|
|
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
2019-05-15 11:40:21 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
2019-05-15 08:39:08 +00:00
|
|
|
shared/libcsiphash.la \
|
2019-05-15 11:18:05 +00:00
|
|
|
libnm/libnm.la \
|
2016-10-18 12:01:56 +00:00
|
|
|
$(GLIB_LIBS) \
|
2017-03-12 14:54:02 +00:00
|
|
|
$(NEWT_LIBS) \
|
2016-10-18 12:01:56 +00:00
|
|
|
$(NULL)
|
|
|
|
|
|
2017-03-28 20:37:19 +00:00
|
|
|
$(clients_tui_nmtui_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
nmtui_links = nmtui-edit nmtui-connect nmtui-hostname
|
|
|
|
|
|
|
|
|
|
install-exec-hook-nmtui:
|
|
|
|
|
for link in $(nmtui_links); do \
|
|
|
|
|
$(LN_S) -f nmtui "$(DESTDIR)$(bindir)/$$link"; \
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
install_exec_hook += install-exec-hook-nmtui
|
|
|
|
|
|
|
|
|
|
uninstall-hook-nmtui:
|
|
|
|
|
for link in $(nmtui_links); do \
|
|
|
|
|
rm -f "$(DESTDIR)$(bindir)/$$link"; \
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
uninstall_hook += uninstall-hook-nmtui
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/tui/meson.build \
|
|
|
|
|
clients/tui/newt/meson.build
|
|
|
|
|
|
2019-11-12 14:54:22 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# clients/nm-cloud-setup
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if BUILD_NM_CLOUD_SETUP
|
|
|
|
|
|
|
|
|
|
libexec_PROGRAMS += clients/cloud-setup/nm-cloud-setup
|
|
|
|
|
|
|
|
|
|
clients_cloud_setup_nm_cloud_setup_SOURCES = \
|
|
|
|
|
clients/cloud-setup/main.c \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup-utils.c \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup-utils.h \
|
|
|
|
|
clients/cloud-setup/nm-http-client.c \
|
|
|
|
|
clients/cloud-setup/nm-http-client.h \
|
|
|
|
|
clients/cloud-setup/nmcs-provider.c \
|
|
|
|
|
clients/cloud-setup/nmcs-provider.h \
|
|
|
|
|
clients/cloud-setup/nmcs-provider-ec2.c \
|
|
|
|
|
clients/cloud-setup/nmcs-provider-ec2.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_cloud_setup_nm_cloud_setup_CPPFLAGS = \
|
|
|
|
|
$(clients_cppflags) \
|
|
|
|
|
-DG_LOG_DOMAIN=\""nm-cloud-setup"\" \
|
|
|
|
|
$(LIBCURL_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_cloud_setup_nm_cloud_setup_LDFLAGS = \
|
|
|
|
|
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
|
|
|
|
$(SANITIZER_EXEC_LDFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients_cloud_setup_nm_cloud_setup_LDADD = \
|
2019-12-06 12:52:29 +00:00
|
|
|
shared/nm-libnm-aux/libnm-libnm-aux.la \
|
2019-11-12 14:54:22 +00:00
|
|
|
shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \
|
|
|
|
|
shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \
|
|
|
|
|
shared/nm-glib-aux/libnm-glib-aux.la \
|
|
|
|
|
shared/nm-std-aux/libnm-std-aux.la \
|
|
|
|
|
shared/libcsiphash.la \
|
|
|
|
|
libnm/libnm.la \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(LIBCURL_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|
|
|
|
$(clients_cloud_setup_nm_cloud_setup_OBJECTS): $(libnm_lib_h_pub_mkenums)
|
|
|
|
|
|
|
|
|
|
if HAVE_SYSTEMD
|
|
|
|
|
|
|
|
|
|
systemdsystemunit_DATA += \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup.service \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup.timer \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup.service: $(srcdir)/clients/cloud-setup/nm-cloud-setup.service.in
|
|
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
|
|
|
|
|
|
|
|
|
install-data-hook-cloud-setup: install-data-hook-dispatcher
|
|
|
|
|
$(INSTALL_SCRIPT) "$(srcdir)/clients/cloud-setup/90-nm-cloud-setup.sh" "$(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d/"
|
|
|
|
|
ln -fs no-wait.d/90-nm-cloud-setup.sh "$(DESTDIR)$(nmlibdir)/dispatcher.d/90-nm-cloud-setup.sh"
|
|
|
|
|
|
|
|
|
|
install_data_hook += install-data-hook-cloud-setup
|
|
|
|
|
|
|
|
|
|
uninstall-hook-cloud-setup:
|
|
|
|
|
rm -f "$(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh"
|
|
|
|
|
rm -f "$(DESTDIR)$(nmlibdir)/dispatcher.d/90-nm-cloud-setup.sh"
|
|
|
|
|
|
|
|
|
|
uninstall_hook += uninstall-hook-cloud-setup
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/cloud-setup/90-nm-cloud-setup.sh \
|
|
|
|
|
clients/cloud-setup/meson.build \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup.service.in \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup.timer \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
CLEANFILES += \
|
|
|
|
|
clients/cloud-setup/nm-cloud-setup.service
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2018-05-04 07:02:53 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# clients/tests
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py
|
|
|
|
|
mkdir -p "$(builddir)/clients/tests/"
|
|
|
|
|
GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \
|
|
|
|
|
LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
|
|
|
|
|
NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \
|
|
|
|
|
NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \
|
2018-05-21 08:14:04 +00:00
|
|
|
"$(PYTHON)" \
|
2018-05-04 07:02:53 +00:00
|
|
|
$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
|
|
|
|
|
cat "$(builddir)/clients/tests/test-client.log"; \
|
|
|
|
|
test "$$r" == ok
|
|
|
|
|
|
|
|
|
|
check_local += check-local-clients-tests-test-client
|
|
|
|
|
|
|
|
|
|
CLEANFILES += clients/tests/test-client.log
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
clients/tests/test-client.py \
|
2018-07-20 14:32:07 +00:00
|
|
|
clients/tests/test-client.check-on-disk/test_001.expected \
|
|
|
|
|
clients/tests/test-client.check-on-disk/test_002.expected \
|
|
|
|
|
clients/tests/test-client.check-on-disk/test_003.expected \
|
|
|
|
|
clients/tests/test-client.check-on-disk/test_004.expected \
|
|
|
|
|
$(NULL)
|
2018-05-04 07:02:53 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# data
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if HAVE_SYSTEMD
|
|
|
|
|
|
2019-11-21 14:27:21 +00:00
|
|
|
systemdsystemunit_DATA += \
|
2016-10-18 12:01:56 +00:00
|
|
|
data/NetworkManager.service \
|
|
|
|
|
data/NetworkManager-wait-online.service \
|
2019-11-21 14:27:21 +00:00
|
|
|
data/NetworkManager-dispatcher.service \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
data/NetworkManager.service: $(srcdir)/data/NetworkManager.service.in
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
if HAVE_SYSTEMD_200
|
|
|
|
|
data/NetworkManager-wait-online.service: $(srcdir)/data/NetworkManager-wait-online.service.in
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
2016-10-18 12:01:56 +00:00
|
|
|
else
|
|
|
|
|
data/NetworkManager-wait-online.service: $(srcdir)/data/NetworkManager-wait-online-systemd-pre200.service.in
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
2016-10-18 12:01:56 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
examples_DATA += data/server.conf
|
|
|
|
|
|
|
|
|
|
if WITH_UDEV_DIR
|
|
|
|
|
udevrulesdir = $(UDEV_DIR)/rules.d
|
|
|
|
|
udevrules_DATA = \
|
|
|
|
|
data/84-nm-drivers.rules \
|
2018-04-19 12:05:52 +00:00
|
|
|
data/85-nm-unmanaged.rules \
|
|
|
|
|
data/90-nm-thunderbolt.rules
|
2016-10-18 12:01:56 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
data/server.conf: $(srcdir)/data/server.conf.in
|
2017-02-16 14:55:23 +00:00
|
|
|
@$(MKDIR_P) data/
|
2016-11-16 19:03:16 +00:00
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
data/84-nm-drivers.rules \
|
|
|
|
|
data/85-nm-unmanaged.rules \
|
2018-04-19 12:05:52 +00:00
|
|
|
data/90-nm-thunderbolt.rules \
|
2019-11-21 14:27:21 +00:00
|
|
|
data/NetworkManager-dispatcher.service.in \
|
|
|
|
|
data/NetworkManager-wait-online-systemd-pre200.service.in \
|
|
|
|
|
data/NetworkManager-wait-online.service.in \
|
|
|
|
|
data/NetworkManager.service.in \
|
|
|
|
|
data/meson.build \
|
2018-01-08 12:06:54 +00:00
|
|
|
data/server.conf.in \
|
2019-11-21 14:27:21 +00:00
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
|
|
|
|
CLEANFILES += \
|
|
|
|
|
data/NetworkManager-dispatcher.service \
|
2019-11-21 14:27:21 +00:00
|
|
|
data/NetworkManager-wait-online.service \
|
|
|
|
|
data/NetworkManager.service \
|
|
|
|
|
data/server.conf \
|
|
|
|
|
$(NULL)
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# man
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2017-02-15 17:02:52 +00:00
|
|
|
man/common.ent: man/common.ent.in
|
2017-02-16 14:55:23 +00:00
|
|
|
@$(MKDIR_P) man/
|
2017-02-15 17:02:52 +00:00
|
|
|
$(AM_V_GEN) $(data_edit) $< >$@
|
|
|
|
|
|
2016-11-23 17:26:57 +00:00
|
|
|
xsltproc_flags = \
|
|
|
|
|
--path man \
|
|
|
|
|
--xinclude \
|
|
|
|
|
--nonet \
|
2016-10-18 13:53:05 +00:00
|
|
|
--stringparam man.output.quietly 1 \
|
|
|
|
|
--stringparam funcsynopsis.style ansi \
|
|
|
|
|
--stringparam man.th.extra1.suppress 1 \
|
|
|
|
|
--stringparam man.authors.section.enabled 0 \
|
2017-03-06 12:47:26 +00:00
|
|
|
--stringparam man.copyright.section.enabled 0 \
|
|
|
|
|
--stringparam man.th.title.max.length 30
|
2016-10-18 13:53:05 +00:00
|
|
|
|
build: combine handling of setting docs and man pages
Building the man pages via xsltproc requires "docbook.xsl"
which is part of docbook.
Previously, we would build the man pages solely based on
"--enable-introspection", which checks for the presence of
xsltproc, but not docbook. This can lead to build failure
when docbook is not available, but "--enable-introspection"
is given.
Instead of adding yet another configure option to fine-tune
and say "--with-docbook --disable-gtk-doc", just simplify it.
Now, documentation (both man pages and setting docs) will be generated
with "--enable-gtk-doc" and "--enable-introspection".
If the documentation is not about to be generated, pre-generated docs
will be installed if they are available. That is commonly the case
with a source tarball, but not with a git checkout.
Finally, if documentation is nither generated nor pre-generated,
no documentation will be installed *duh*.
This removes the possibility to treat man pages separate from settings
docs. Now you either generate both, install both pre-generated, or don't
get any of them.
https://bugzilla.gnome.org/show_bug.cgi?id=778551
2017-02-13 15:26:20 +00:00
|
|
|
if BUILD_DOCS
|
2016-10-18 13:53:05 +00:00
|
|
|
|
2016-11-23 17:26:57 +00:00
|
|
|
man/%.1 man/%.5 man/%.7 man/%.8: man/%.xml man/common.ent
|
2016-11-24 17:04:33 +00:00
|
|
|
$(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
|
2016-10-18 13:53:05 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2016-11-23 17:50:05 +00:00
|
|
|
man_nm_settings_xml = \
|
|
|
|
|
man/nm-settings.xml \
|
|
|
|
|
man/nm-settings-keyfile.xml \
|
|
|
|
|
man/nm-settings-ifcfg-rh.xml
|
|
|
|
|
|
2016-11-28 11:42:04 +00:00
|
|
|
if HAVE_INTROSPECTION
|
2016-10-18 13:53:05 +00:00
|
|
|
|
2018-04-26 21:32:11 +00:00
|
|
|
man/nm-setting%.xml: man/common.ent
|
|
|
|
|
|
2016-11-24 10:32:34 +00:00
|
|
|
man/nm-setting%.xml: man/nm-setting%.xsl libnm/nm-setting%-docs.xml
|
2016-11-24 17:04:33 +00:00
|
|
|
$(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $^
|
2016-10-18 13:53:05 +00:00
|
|
|
|
2016-11-23 17:50:05 +00:00
|
|
|
CLEANFILES += $(man_nm_settings_xml)
|
2016-10-18 13:53:05 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
man_pages += \
|
2017-02-13 16:07:38 +00:00
|
|
|
man/NetworkManager.8 \
|
2016-10-18 13:53:05 +00:00
|
|
|
man/NetworkManager.conf.5 \
|
2017-02-13 16:07:38 +00:00
|
|
|
man/nm-online.1 \
|
2018-04-28 18:36:15 +00:00
|
|
|
man/nm-initrd-generator.8 \
|
2016-10-18 13:53:05 +00:00
|
|
|
man/nmcli-examples.7 \
|
2017-02-13 16:07:38 +00:00
|
|
|
man/nmcli.1 \
|
|
|
|
|
man/nmtui.1
|
2016-10-18 13:53:05 +00:00
|
|
|
|
|
|
|
|
man_pages_autogen += \
|
2017-02-13 16:07:38 +00:00
|
|
|
man/nm-settings-keyfile.5 \
|
|
|
|
|
man/nm-settings.5
|
2016-10-18 13:53:05 +00:00
|
|
|
|
2017-10-30 16:32:30 +00:00
|
|
|
if WITH_OPENVSWITCH
|
|
|
|
|
man_pages += man/nm-openvswitch.7
|
|
|
|
|
else
|
|
|
|
|
EXTRA_DIST += man/nm-openvswitch.7
|
|
|
|
|
dist_dependencies += man/nm-openvswitch.7
|
|
|
|
|
endif
|
|
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
if CONFIG_PLUGIN_IFCFG_RH
|
|
|
|
|
man_pages_autogen += man/nm-settings-ifcfg-rh.5
|
|
|
|
|
else
|
|
|
|
|
EXTRA_DIST += man/nm-settings-ifcfg-rh.5
|
2016-11-15 09:50:19 +00:00
|
|
|
dist_dependencies += man/nm-settings-ifcfg-rh.5
|
2016-10-18 13:53:05 +00:00
|
|
|
endif
|
|
|
|
|
|
2017-02-15 22:10:13 +00:00
|
|
|
CLEANFILES += \
|
|
|
|
|
man/common.ent
|
|
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
EXTRA_DIST += \
|
2017-02-15 21:43:00 +00:00
|
|
|
man/common.ent.in \
|
2016-11-23 17:50:05 +00:00
|
|
|
$(man_nm_settings_xml) \
|
|
|
|
|
$(addsuffix .xsl,$(basename $(man_nm_settings_xml))) \
|
2016-10-18 13:53:05 +00:00
|
|
|
$(man_pages) \
|
2016-11-23 17:50:05 +00:00
|
|
|
$(addsuffix .xml,$(basename $(man_pages))) \
|
2016-10-18 13:53:05 +00:00
|
|
|
$(man_pages_autogen)
|
|
|
|
|
|
|
|
|
|
|
2017-02-13 23:17:32 +00:00
|
|
|
if HAVE_DOCS
|
|
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
install-data-hook-man:
|
2017-02-13 23:17:32 +00:00
|
|
|
for link in $(nmtui_links); do \
|
|
|
|
|
ln -f $(DESTDIR)$(mandir)/man1/nmtui.1 $(DESTDIR)$(mandir)/man1/$$link.1; \
|
|
|
|
|
done; \
|
|
|
|
|
ln -f $(DESTDIR)$(mandir)/man5/NetworkManager.conf.5 $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5;
|
2016-10-18 13:53:05 +00:00
|
|
|
|
|
|
|
|
install_data_hook += install-data-hook-man
|
|
|
|
|
|
|
|
|
|
uninstall-hook-man:
|
2017-02-13 23:17:32 +00:00
|
|
|
for link in $(nmtui_links); do \
|
|
|
|
|
rm -f $(DESTDIR)$(mandir)/man1/$$link.1; \
|
|
|
|
|
done; \
|
|
|
|
|
rm -f $(DESTDIR)$(mandir)/man5/nm-system-settings.conf.5;
|
2016-10-18 13:53:05 +00:00
|
|
|
|
|
|
|
|
uninstall_hook += uninstall-hook-man
|
|
|
|
|
|
|
|
|
|
man_MANS += $(man_pages)
|
|
|
|
|
man_MANS += $(man_pages_autogen)
|
2017-02-13 23:17:32 +00:00
|
|
|
|
2016-10-18 13:53:05 +00:00
|
|
|
endif
|
build: combine handling of setting docs and man pages
Building the man pages via xsltproc requires "docbook.xsl"
which is part of docbook.
Previously, we would build the man pages solely based on
"--enable-introspection", which checks for the presence of
xsltproc, but not docbook. This can lead to build failure
when docbook is not available, but "--enable-introspection"
is given.
Instead of adding yet another configure option to fine-tune
and say "--with-docbook --disable-gtk-doc", just simplify it.
Now, documentation (both man pages and setting docs) will be generated
with "--enable-gtk-doc" and "--enable-introspection".
If the documentation is not about to be generated, pre-generated docs
will be installed if they are available. That is commonly the case
with a source tarball, but not with a git checkout.
Finally, if documentation is nither generated nor pre-generated,
no documentation will be installed *duh*.
This removes the possibility to treat man pages separate from settings
docs. Now you either generate both, install both pre-generated, or don't
get any of them.
https://bugzilla.gnome.org/show_bug.cgi?id=778551
2017-02-13 15:26:20 +00:00
|
|
|
|
|
|
|
|
if BUILD_DOCS
|
|
|
|
|
CLEANFILES += $(man_pages)
|
|
|
|
|
CLEANFILES += $(man_pages_autogen)
|
2016-10-18 13:53:05 +00:00
|
|
|
endif
|
|
|
|
|
|
2016-11-15 09:50:19 +00:00
|
|
|
dist_dependencies += $(man_pages)
|
|
|
|
|
dist_dependencies += $(man_pages_autogen)
|
|
|
|
|
|
2018-01-08 12:06:54 +00:00
|
|
|
EXTRA_DIST += \
|
|
|
|
|
man/meson.build
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
###############################################################################
|
|
|
|
|
# vapi
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
|
|
|
|
if ENABLE_VAPIGEN
|
|
|
|
|
|
2016-10-27 10:40:27 +00:00
|
|
|
VAPIGEN_VAPIS += \
|
|
|
|
|
vapi/libnm.vapi
|
|
|
|
|
|
2016-11-22 17:25:03 +00:00
|
|
|
vapi/libnm.vapi: $(builddir)/libnm/NM-1.0.gir vapi/libnm.deps vapi/NM-1.0.metadata
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2016-10-27 10:40:27 +00:00
|
|
|
vapi_libnm_vapi_METADATADIRS = $(srcdir)/vapi
|
2016-11-22 17:25:03 +00:00
|
|
|
vapi_libnm_vapi_FILES = $(builddir)/libnm/NM-1.0.gir
|
2016-11-03 13:00:04 +00:00
|
|
|
vapi_libnm_vapi_DEPS = gio-2.0
|
2016-10-27 10:40:27 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
vapi_DATA += \
|
|
|
|
|
$(VAPIGEN_VAPIS) \
|
|
|
|
|
$(VAPIGEN_VAPIS:.vapi=.deps)
|
|
|
|
|
|
|
|
|
|
CLEANFILES += $(VAPIGEN_VAPIS)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
2016-11-03 13:00:04 +00:00
|
|
|
vapi/NM-1.0.metadata \
|
2016-11-03 12:49:09 +00:00
|
|
|
vapi/libnm.deps \
|
2018-01-08 12:06:54 +00:00
|
|
|
vapi/meson.build
|
2016-10-18 12:01:56 +00:00
|
|
|
|
2016-10-15 14:24:59 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
girdir = $(datadir)/gir-1.0
|
|
|
|
|
gir_DATA = $(INTROSPECTION_GIRS)
|
2016-11-22 18:30:06 +00:00
|
|
|
BUILT_SOURCES += $(gir_DATA)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
|
|
|
|
typelibdir = $(libdir)/girepository-1.0
|
|
|
|
|
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
|
2016-11-22 18:30:06 +00:00
|
|
|
BUILT_SOURCES += $(typelib_DATA)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
dbusservicedir = $(DBUS_SYS_DIR)
|
2016-10-15 20:28:34 +00:00
|
|
|
dbusservice_DATA += src/org.freedesktop.NetworkManager.conf
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-16 14:50:04 +00:00
|
|
|
if ENABLE_TESTS
|
2016-10-18 07:36:53 +00:00
|
|
|
noinst_PROGRAMS += $(check_programs) $(check_programs_norun)
|
2016-10-16 14:50:04 +00:00
|
|
|
noinst_LTLIBRARIES += $(check_ltlibraries)
|
|
|
|
|
else
|
2016-10-18 07:36:53 +00:00
|
|
|
check_PROGRAMS += $(check_programs) $(check_programs_norun)
|
2016-10-16 14:50:04 +00:00
|
|
|
check_LTLIBRARIES += $(check_ltlibraries)
|
|
|
|
|
endif
|
|
|
|
|
|
2018-03-18 19:38:49 +00:00
|
|
|
plugin_LTLIBRARIES += $(core_plugins)
|
2016-11-10 16:06:37 +00:00
|
|
|
|
2016-10-16 14:50:04 +00:00
|
|
|
TESTS += $(check_programs)
|
2016-10-14 13:54:40 +00:00
|
|
|
|
2016-10-14 10:13:50 +00:00
|
|
|
EXTRA_DIST += \
|
2009-02-15 16:20:25 +00:00
|
|
|
CONTRIBUTING \
|
2019-09-07 16:11:34 +00:00
|
|
|
COPYING.LGPL \
|
|
|
|
|
COPYING.GFDL \
|
|
|
|
|
\
|
2009-02-15 16:20:25 +00:00
|
|
|
NetworkManager.pc.in \
|
|
|
|
|
intltool-extract.in \
|
|
|
|
|
intltool-merge.in \
|
2012-02-08 17:56:52 +00:00
|
|
|
intltool-update.in \
|
2016-10-12 09:16:20 +00:00
|
|
|
linker-script-binary.ver \
|
2016-10-13 11:02:49 +00:00
|
|
|
linker-script-devices.ver \
|
2016-10-12 09:09:21 +00:00
|
|
|
linker-script-settings.ver \
|
2016-11-03 17:38:27 +00:00
|
|
|
src/ppp/nm-ppp-plugin.ver \
|
2013-03-12 20:43:43 +00:00
|
|
|
Makefile.glib \
|
2013-04-10 14:36:32 +00:00
|
|
|
autogen.sh \
|
2016-10-13 11:29:35 +00:00
|
|
|
valgrind.suppressions \
|
2018-01-08 12:06:54 +00:00
|
|
|
meson.build \
|
|
|
|
|
meson_options.txt \
|
|
|
|
|
config.h.meson \
|
2018-09-10 14:26:57 +00:00
|
|
|
config-extra.h.meson \
|
2018-01-08 12:06:54 +00:00
|
|
|
docs/meson.build \
|
|
|
|
|
\
|
|
|
|
|
po/meson.build \
|
2016-10-13 11:29:35 +00:00
|
|
|
\
|
|
|
|
|
shared/nm-default.h \
|
|
|
|
|
shared/nm-test-libnm-utils.h \
|
|
|
|
|
shared/nm-test-utils-impl.c \
|
2017-11-20 16:02:42 +00:00
|
|
|
shared/nm-utils/nm-compat.c \
|
|
|
|
|
shared/nm-utils/nm-compat.h \
|
2016-10-13 11:29:35 +00:00
|
|
|
shared/nm-utils/nm-test-utils.h \
|
|
|
|
|
shared/nm-utils/nm-vpn-editor-plugin-call.h \
|
|
|
|
|
shared/nm-utils/nm-vpn-plugin-macros.h \
|
|
|
|
|
shared/nm-utils/nm-vpn-plugin-utils.c \
|
|
|
|
|
shared/nm-utils/nm-vpn-plugin-utils.h \
|
|
|
|
|
shared/nm-version-macros.h.in \
|
2018-01-08 12:06:54 +00:00
|
|
|
shared/meson.build \
|
2016-10-13 11:29:35 +00:00
|
|
|
\
|
2018-11-09 17:08:45 +00:00
|
|
|
tools/check-config-options.sh \
|
2018-06-26 10:02:33 +00:00
|
|
|
tools/check-docs.sh \
|
2016-10-17 12:36:16 +00:00
|
|
|
tools/check-exports.sh \
|
2018-12-06 14:36:55 +00:00
|
|
|
tools/check-settings-docs.sh \
|
2016-10-17 12:36:16 +00:00
|
|
|
tools/create-exports-NetworkManager.sh \
|
|
|
|
|
tools/debug-helper.py \
|
2018-09-13 15:24:58 +00:00
|
|
|
tools/meson-post-install.sh \
|
2016-10-17 12:36:16 +00:00
|
|
|
tools/run-nm-test.sh \
|
|
|
|
|
tools/test-networkmanager-service.py \
|
|
|
|
|
tools/test-sudo-wrapper.sh \
|
|
|
|
|
tools/enums-to-docbook.pl \
|
|
|
|
|
\
|
2018-01-10 15:37:23 +00:00
|
|
|
src/settings/plugins/meson.build \
|
2016-10-15 20:28:34 +00:00
|
|
|
\
|
2016-10-13 11:29:35 +00:00
|
|
|
$(NULL)
|
2007-08-13 07:54:28 +00:00
|
|
|
|
2016-10-14 10:13:50 +00:00
|
|
|
CLEANFILES += \
|
2016-11-22 18:30:06 +00:00
|
|
|
$(GLIB_GENERATED) \
|
|
|
|
|
$(INTROSPECTION_GIRS) \
|
|
|
|
|
$(typelib_DATA) \
|
2016-10-14 10:13:50 +00:00
|
|
|
\
|
2016-10-13 11:29:35 +00:00
|
|
|
cscope.in.out \
|
|
|
|
|
cscope.out \
|
|
|
|
|
cscope.po.out \
|
|
|
|
|
\
|
|
|
|
|
$(NULL)
|
2011-11-14 12:35:30 +00:00
|
|
|
|
2016-10-13 11:39:30 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
include Makefile.examples
|
|
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
check-local: $(check_local)
|
|
|
|
|
|
2016-10-17 13:50:56 +00:00
|
|
|
dist-hook: $(dist_hook)
|
|
|
|
|
|
2016-10-14 13:54:40 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
install-exec-hook: $(install_exec_hook)
|
|
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
install-data-hook: $(install_data_hook)
|
2016-10-15 16:25:13 +00:00
|
|
|
|
2016-10-18 12:01:56 +00:00
|
|
|
uninstall-hook: $(uninstall_hook)
|
|
|
|
|
|
2016-10-15 16:25:13 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2011-11-14 12:35:30 +00:00
|
|
|
cscope:
|
2019-03-05 07:44:57 +00:00
|
|
|
cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -sclients;
|
2013-04-26 20:42:54 +00:00
|
|
|
|
2016-10-13 11:39:30 +00:00
|
|
|
###############################################################################
|
|
|
|
|
|
2017-05-23 18:45:39 +00:00
|
|
|
.PRECIOUS: test-suite.log
|
2017-03-16 15:53:01 +00:00
|
|
|
.DELETE_ON_ERROR:
|
2016-11-15 09:50:19 +00:00
|
|
|
.PHONY: cscope dist-configure-check $(check_local) $(dist_hook)
|
