diff options
author | Thomas Haller <thaller@redhat.com> | 2018-12-28 21:30:03 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-01-02 17:08:41 +0100 |
commit | c4512f839fd1c22251fa3779eb799a471e5af4a6 (patch) | |
tree | 8f0f0b6585d450411d795e21395ac2021c6355f1 /shared | |
parent | 0298d540782b910bab15dd112eab6c006ed6b8bc (diff) | |
download | NetworkManager-c4512f839fd1c22251fa3779eb799a471e5af4a6.tar.gz |
libnm: use "libnm-systemd-shared.a" in "libnm-core.la" (and "libnm.so")
It's not yet used, but it will be. We will need nm_sd_utils_unbase64mem()
to strictly validate WireGuard settings, which contain keys in base64 encoding.
Note that we also need a stub implementation for logging. This will do
nothing for all logging from "libnm-systemd-shared.a". This makes
sense because "libnm.so" as a library should not log directly. Also,
"libnm.so" will only use a small portion of "libnm-systemd-shared.a" which
doesn't log anything. Thus this code is unused and dropped by the linker
with "--gc-sections".
Diffstat (limited to 'shared')
-rw-r--r-- | shared/meson.build | 25 | ||||
-rw-r--r-- | shared/systemd/nm-logging-stub.c | 45 |
2 files changed, 70 insertions, 0 deletions
diff --git a/shared/meson.build b/shared/meson.build index 76f09ee8c0..54ef3a2e31 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -207,3 +207,28 @@ libnm_systemd_shared_dep = declare_dependency( libnm_systemd_shared, ], ) + +libnm_systemd_logging_stub = static_library( + 'nm-systemd-logging-stub', + sources: files( + 'systemd/nm-logging-stub.c', + ), + include_directories: include_directories( + 'systemd/sd-adapt-shared', + 'systemd/src/basic', + ), + dependencies: shared_dep, + c_args: [ + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED', + '-DG_LOG_DOMAIN="libnm"', + ], +) + +libnm_systemd_shared_no_logging_dep = declare_dependency( + dependencies: [ + libnm_systemd_shared_dep, + ], + link_with: [ + libnm_systemd_logging_stub, + ], +) diff --git a/shared/systemd/nm-logging-stub.c b/shared/systemd/nm-logging-stub.c new file mode 100644 index 0000000000..80d4360783 --- /dev/null +++ b/shared/systemd/nm-logging-stub.c @@ -0,0 +1,45 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-utils/nm-logging-fwd.h" + +/*****************************************************************************/ + +gboolean +_nm_log_enabled (NMLogLevel level, + NMLogDomain domain) +{ + return FALSE; +} + +void +_nm_log_impl (const char *file, + guint line, + const char *func, + NMLogLevel level, + NMLogDomain domain, + int error, + const char *ifname, + const char *con_uuid, + const char *fmt, + ...) +{ +} |