summaryrefslogtreecommitdiff
path: root/dispatcher
Commit message (Collapse)AuthorAgeFilesLines
* all: SPDX header conversionLubomir Rintel2019-09-104-56/+4
| | | | | $ find * -type f |xargs perl contrib/scripts/spdx.pl $ git rm contrib/scripts/spdx.pl
* build: fix meson warning about 'install' arg in 'configure_file'Beniamino Galvani2019-08-051-1/+0
| | | | | | | | | | | | | | | | | WARNING: Project targetting '>= 0.44.0' but tried to use feature introduced in '0.50.0': install arg in configure_file From the documentation: "install (added 0.50.0) When true, this generated file is installed during the install step, and install_dir must be set and not empty. When false, this generated file is not installed regardless of the value of install_dir. When omitted it defaults to true when install_dir is set and not empty, false otherwise." The parameter can be omitted because install_dir is set. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/216
* dispatcher: tolerate lack of connection pathLubomir Rintel2019-07-241-6/+2
| | | | | | | | If the dispatcher is being invoked because the connection was removed (e.g. device going down), it doesn't have a path or a filename anymore. Don't abort in such cases. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/205
* dispatcher: add MS Azure endpoint env var expected by cloud-initfg/dhcp_options2env-rh1663253Francesco Giudici2019-07-051-0/+35
| | | | | | | | | | | | | | Some linux distros (e.g., RHEL, CentOS and Fedora) ship a dispatcher script with their dhclient package in order to run user dhclient hook scripts also when connections are run by NetworkManager. The scripts convert the var names in the environment to the ones expected in the dhclient hook scripts. This feature is currently use by cloud-init to retrieve the MS Azure server endpoint address, which is sent in the private dhcp option 245. We just redefined the default dhclient var names for the private options from "unknown_xyz" to "private_xyz". In order to let current cloud-init version to be able to retrieve the Azure server endpoint address, add the legacy var name "unknown_245" to the dispatcher script environment.
* dispatcher/trivial: fix typo in commentFrancesco Giudici2019-07-051-1/+1
|
* all: drop emacs file variables from source filesThomas Haller2019-06-114-4/+0
| | | | | | | | | | | | | | | | | | | | | | We no longer add these. If you use Emacs, configure it yourself. Also, due to our "smart-tab" usage the editor anyway does a subpar job handling our tabs. However, on the upside every user can choose whatever tab-width he/she prefers. If "smart-tabs" are used properly (like we do), every tab-width will work. No manual changes, just ran commands: F=($(git grep -l -e '-\*-')) sed '1 { /\/\* *-\*- *[mM]ode.*\*\/$/d }' -i "${F[@]}" sed '1,4 { /^\(#\|--\|dnl\) *-\*- [mM]ode/d }' -i "${F[@]}" Check remaining lines with: git grep -e '-\*-' The ultimate purpose of this is to cleanup our files and eventually use SPDX license identifiers. For that, first get rid of the boilerplate lines.
* build/meson: depend test-dispatcher-envp on libnmThomas Haller2019-06-021-1/+4
| | | | | | Otherwise we can get a build failiure: ../libnm/NetworkManager.h:61:27: fatal error: nm-enum-types.h: No such file or directory
* dispatcher: log warning when nm-dispatcher quits with requests pendingThomas Haller2019-05-271-0/+15
|
* build: don't link dispatcher with generated nmdbus-dispatcher bindingsThomas Haller2019-05-273-2/+17
| | | | | | | | We don't need it anymore. Still, for tests let gdbus-codegen run and generate the sources and compile them. We want to keep "dispatcher/nm-dispatcher.xml" and ensure that it is still valid.
* dispatcher: unown dispatcher D-Bus name on exitThomas Haller2019-05-271-6/+10
|
* dispatcher: drop GDBusInterfaceSkeleton and generate GDBus bindingsThomas Haller2019-05-271-57/+141
| | | | | | | | | | | Just hook into GDBusConnection directly. No need for this additional layer that provides nothing. It doesn't even provide extra type-safety, because you still need to get the arguments of the signal handler right. That that point, it's as hard as getting the format string for g_variant_get() right. It still adds lines of code, because the "Action" method has such a large argument list.
* dispatcher: drop Handler GObjectThomas Haller2019-05-271-98/+42
| | | | | | | | | | | | | | | | | | | | | | | | | "nm-dispatcher.c" does something rather simple. It is natural that it has a bit of global data to keep track of that it's doing ("gl"). But this does not lend itself to pack the job of dispatcher into an object. In fact, the Handler object was little more about packaging the GDBus interface skeleton and a bit of state. Global variables are often problematic because they makes unit testing hard. But first of all, we have no test for this (we should). But it's not said that you need an "object" to make testing easier. If we want to make individual bits easier testable, we can just as well pass all required parameters explicitly instead of accessing global variables. Since we package global variables neatly in "gl", this is very simple to refactor. Also, global variables can make code harder to understand. But the problem is the amount of state that is accessible. This is not alleviated by packaging the state in a Handler object. As there is always only one handler instance, this provides very little benefit. I will drop the GDBus interface skeleton soon. So this Handler object will have even less purpose. Drop it.
* dispatcher: keep the GDBusConnection instance in the global variableThomas Haller2019-05-271-7/+6
| | | | | | | | | | | | | | | | It's anyway a singleton that is still referenced by other components. So unrefing it in the mainloop does not actually release any memory. However, the GDBusConnection singleton is fundamental for the run of the program. Keep it accessible in the global variables. Note that soon I will drop the GDBusInterfaceSkeleton and only operate on the GDBusConnection. Then it makes more sense to keep it around. Note that usually we want to keep the amount of global state small. But this connection is anyway a singleton (that we already implicitly use). So, it doesn't change the amount of global state nor does it really have much state (we either have a reference to the singleton or we don't).
* dispatcher: parse command line arguments in a seprate functionThomas Haller2019-05-271-11/+22
| | | | | | | | Split command line parsing out of the main() function. For one, it's an self-contained step, so we can make main() simpler. Also, we don't need the GOptionEntry on the stack of the main() function for the remainder of the program.
* dispatcher: don't just exit() but always shutdown before exitingThomas Haller2019-05-271-19/+27
| | | | | | | | It's ugly to uncoordinated just call exit(). We should quit the mainloop and clean up everything we had going. Note that since Handler has no dispose() function, we also need to hack a g_signal_handlers_disconnect_by_func(). This will change soon.
* dispatcher: move global variable ever_aquired_name into "gl" structThomas Haller2019-05-271-5/+4
|
* dispatcher: unref main loop at exit and remove signal handler sourcesThomas Haller2019-05-271-4/+12
|
* dispatcher: namespace global variables in a struct "gl"Thomas Haller2019-05-271-20/+22
|
* dispatcher: use logging macros instead of g_log() directlyThomas Haller2019-05-271-46/+75
| | | | Also cleanup the logging macros.
* dispatcher: silence message about non-existing dispatcher directoryThomas Haller2019-05-271-2/+4
| | | | | | | | Silence messages like find-scripts: Failed to open dispatcher directory '/usr/lib/NetworkManager/dispatcher.d': Error opening directory “/usr/lib/NetworkManager/dispatcher.d”: No such file or directory find-scripts: Failed to open dispatcher directory '/usr/lib/NetworkManager/dispatcher.d/pre-up.d': Error opening directory “/usr/lib/NetworkManager/dispatcher.d/pre-up.d”: No such file or directory
* dispatcher: log messages about loading scripts per-requestThomas Haller2019-05-271-15/+17
| | | | | | | | The messages about loading the scripts are releated to a particular request. Hence, they should be logged with that context. Also, we should avoid using g_log() directly. Use our logging macros instead.
* dispatcher: don't print debug messages of dispatcher in regular modeThomas Haller2019-05-271-3/+4
| | | | | | | | | | | | | | Previously, we would log several messages with level "debug" / g_info(). _LOG_R_D (request, "start running ordered scripts..."); _LOG_R_D (request, "new request (%u scripts)", request->scripts->len); _LOG_R_D (request, "completed: no scripts"); Note that this effectively logs a message for every event. I think that is to verbose and not suitable for regular logging. Only enable these messages if debug logging is enabled. As such, these debug level messsages now are enabled together with the trace level messages.
* dispatcher/trivial: rename logging levelsThomas Haller2019-05-271-14/+14
| | | | | | | | | | | What we currently print as "info" level is too verbose for regular operation. It prints two messages for every dispatcher event. That's already for debugging. Next that will be downgraded, so rename "debug" to "trace" and "info" to "debug". There is only renaming, no change in behavior.
* dispatcher: look for the scripts in /usr/lib as wellLubomir Rintel2019-04-291-32/+71
| | | | | This makes it possible for packages that ship dispatcher scripts to use the correct location.
* build/meson: rename "nm_core_dep" to "libnm_core_dep"Thomas Haller2019-04-182-2/+2
| | | | | | | The library is called "libnm_core". So the dependency should be called "libnm_core_dep", like in all other cases. (cherry picked from commit c27ad37c278461fd783b6db56844683ab3088345)
* shared: build helper "libnm-libnm-core-{intern|aux}.la" library for libnm-coreThomas Haller2019-04-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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. (cherry picked from commit af07ed01c04867e281cc3982a7ab0d244d4f8e2e)
* dispatcher/tests: cleanup testsThomas Haller2019-04-121-136/+124
| | | | | | | | | | | | | | - use cleanup macros everywhere. - In particular use nm_auto_clear_variant_builder to free the GVariantBuilder in the error cases. Note that the error cases anyway are asserted against, so during a normal test run there was no leak. But we should not write software like that. - use nm_utils_strsplit_set_with_empty() instead of g_strsplit_set(). We should use our variant also in unit-tests, because that way the function gets more test coverage. And it likely performs better anyway.
* all: drop unnecessary includes of <errno.h> and <string.h>Thomas Haller2019-02-123-6/+1
| | | | | "nm-macros-interal.h" already includes <errno.h> and <string.h>. No need to include it everywhere else too.
* all: don't use "static inline" in source filesThomas Haller2019-02-061-1/+1
| | | | | | | | For static functions inside a module, the compiler determines on its own whether to inline the function. Also, "inline" was used at some places that don't immediatly look like candidates for inlining. It was most likely a copy&paste error.
* build: meson: Add trailing commasIñigo Martínez2018-12-202-9/+9
| | | | | | | Add missing trailing commas that avoids getting noise when another file/parameter is added and eases reviewing changes[0]. [0] https://gitlab.gnome.org/GNOME/dconf/merge_requests/11#note_291585
* build: create "config-extra.h" header instead of passing directory variables ↵Thomas Haller2018-07-172-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* all: don't use gchar/gshort/gint/glong but C typesThomas Haller2018-07-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We commonly don't use the glib typedefs for char/short/int/long, but their C types directly. $ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l 587 $ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l 21114 One could argue that using the glib typedefs is preferable in public API (of our glib based libnm library) or where it clearly is related to glib, like during g_object_set (obj, PROPERTY, (gint) value, NULL); However, that argument does not seem strong, because in practice we don't follow that argument today, and seldomly use the glib typedefs. Also, the style guide for this would be hard to formalize, because "using them where clearly related to a glib" is a very loose suggestion. Also note that glib typedefs will always just be typedefs of the underlying C types. There is no danger of glib changing the meaning of these typedefs (because that would be a major API break of glib). A simple style guide is instead: don't use these typedefs. No manual actions, I only ran the bash script: FILES=($(git ls-files '*.[hc]')) sed -i \ -e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \ -e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \ -e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \ "${FILES[@]}"
* dispatcher/tests: fix test after adding NM_DISPATCHER_ACTIONThomas Haller2018-06-188-19/+10
| | | | | | | Also, fix existing tests regarding connectivity action. Fixes: ce9619047c5daac9a006d16d07453d50e0520e71 (cherry picked from commit 6dec8ea9f3df5089325cafeb4848bcb004cb7c79)
* dispatcher: add NM_DISPATCHER_ACTION environment variableThomas Haller2018-06-181-0/+2
| | | | | | | | | | | | | | | | | | | | Previously, the action was only passed as the first command line argument to the dispatcher scripts. Now, also set it via the "$NM_DISPATCHER_ACTION" environment variable. The main purpose is to have a particular, nm-dispatcher specific variable that is always set inside the dispatcher scripts. For example, imagine you have a script that can be either called by dispatcher or some other means (manually, or spawned via /etc/NetworkManager/dispatcher.d/11-dhclient). Then it might make sense to differenciate from inside the script whether you are called by nm-dispatcher. But previously, there was no specific environment variable that was always set inside the dispatcher event. For example, with the "hostname" action there are no other environment variables. Now (with version 1.12), you can check for `test -n "$NM_DISPATCHER_ACTION"`. (cherry picked from commit ce9619047c5daac9a006d16d07453d50e0520e71)
* build: use default NM_BUILD_* defines for testsThomas Haller2018-05-312-9/+8
| | | | | | | | | Use two common defines NM_BUILD_SRCDIR and NM_BUILD_BUILDDIR for specifying the location of srcdir and builddir. Note that this is only relevant for tests, as they expect a certain layout of the directories, to find files that concern them.
* dispatcher: rework creating dispatcher environmentThomas Haller2018-05-242-350/+374
| | | | | | | | | | | | | | - don't use GSList as intermediate data type to construct the environment, especially when all we want is to get a strv array at the end. This reverts the order of elements compared to previously. - add and use helper methods _items_add_*() which assert against sensible input. - merge IPv4 and IPv6 implementations for creating the environment. https://github.com/NetworkManager/NetworkManager/pull/112
* dispatcher: fix leak in construct_device_dhcp4_items()Thomas Haller2018-05-161-10/+10
| | | | Fixes: c86d0b47229c036e1c1c39e81d7d125dcd8e74b9
* dispatcher: extra sanitize names of environment variablesThomas Haller2018-05-161-2/+26
| | | | | The DHCP options should already be sanitized. Still, make sure we don't create a bogus environment.
* all: use the elvis operator wherever possibleLubomir Rintel2018-05-102-6/+4
| | | | | | | | | | | | | | | | | | | | | Coccinelle: @@ expression a, b; @@ -a ? a : b +a ?: b Applied with: spatch --sp-file ternary.cocci --in-place --smpl-spacing --dir . With some manual adjustments on spots that Cocci didn't catch for reasons unknown. Thanks to the marvelous effort of the GNU compiler developer we can now spare a couple of bits that could be used for more important things, like this commit message. Standards commitees yet have to catch up.
* all: remove consecutive empty linesBeniamino Galvani2018-04-302-3/+0
| | | | | | | Normalize coding style by removing consecutive empty lines from C sources and headers. https://github.com/NetworkManager/NetworkManager/pull/108
* build: meson: add prefix to test namesBeniamino Galvani2018-04-121-1/+1
| | | | | | There are multiple tests with the same in different directories; add a unique prefix to test names so that it is clear from the output which one is running.
* build: meson: use run-nm-test.sh to run testsBeniamino Galvani2018-04-121-1/+5
| | | | | Like autotools, use the wrapper script 'run-nm-test.sh' that starts a separate D-Bus session when needed.
* all: replace non-leading tabs with spacesThomas Haller2018-02-071-1/+1
| | | | | | We commonly only allow tabs at the beginning of a line, not afterwards. The reason for this style is so that the code looks formated right with tabstop=4 and tabstop=8.
* all: require glib 2.40lr/glib-2-40Lubomir Rintel2018-01-181-2/+0
| | | | | | RHEL 7.1 and Ubuntu 14.04 LTS both have this. https://bugzilla.gnome.org/show_bug.cgi?id=792323
* build/meson: use variables for ldflags and linker-scriptThomas Haller2018-01-111-5/+1
|
* build/meson: unconditionally use linker version scriptsThomas Haller2018-01-101-4/+3
| | | | | | | We also unconditionally use them with autotools. Also, the detection for have_version_script does not seem correct to me. At least, it didn't work with clang.
* meson: Improve dependency systemIñigo Martínez2018-01-102-17/+6
| | | | | | | | | | | | | | | | | | | | Some targets are missing dependencies on some generated sources in the meson port. These makes the build to fail due to missing source files on a highly parallelized build. These dependencies have been resolved by taking advantage of meson's internal dependencies which can be used to pass source files, include directories, libraries and compiler flags. One of such internal dependencies called `core_dep` was already in use. However, in order to avoid any confusion with another new internal dependency called `nm_core_dep`, which is used to include directories and source files from the `libnm-core` directory, the `core_dep` dependency has been renamed to `nm_dep`. These changes have allowed minimizing the build details which are inherited by using those dependencies. The parallelized build has also been improved.
* build: refine the NETWORKMANAGER_COMPILATION defineThomas Haller2018-01-083-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Note that: - we compile some source files multiple times. Most notably those under "shared/". - we include a default header "shared/nm-default.h" in every source file. This header is supposed to setup a common environment by defining and including parts that are commonly used. As we always include the same header, the header must behave differently depending one whether the compilation is for libnm-core, NetworkManager or libnm-glib. E.g. it must include <glib/gi18n.h> or <glib/gi18n-lib.h> depending on whether we compile a library or an application. For that, the source files need the NETWORKMANAGER_COMPILATION #define to behave accordingly. Extend the define to be composed of flags. These flags are all named NM_NETWORKMANAGER_COMPILATION_WITH_*, they indicate which part of the build are available. E.g. when building libnm-core.la itself, then WITH_LIBNM_CORE, WITH_LIBNM_CORE_INTERNAL, and WITH_LIBNM_CORE_PRIVATE are available. When building NetworkManager, WITH_LIBNM_CORE_PRIVATE is not available but the internal parts are still accessible. When building nmcli, only WITH_LIBNM_CORE (the public part) is available. This granularily controls the build.
* build: use template files for enum types' sources generationIñigo Martínez2017-12-181-1/+1
| | | | | | | | | | Source files for enum types are generated by passing segments of the source code of the files to the `glib-mkenums` command. This patch removes those parameters where source code is used from meson build files by moving those segmeents to template files. https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00057.html
* build: add initial support for meson build systemIñigo Martínez2017-12-132-0/+103
| | | | | | | | | | meson is a build system focused on speed an ease of use, which helps speeding up the software development. This patch adds meson support along autotools. [thaller@redhat.com: rebased patch and adjusted for iwd support] https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00022.html
View Lorry Controller Status