Thomas Haller
c5786f3839
libnm/tests: extend tests for handling invalid connections in NMClient
2016-03-26 12:10:53 +01:00
Thomas Haller
72216f7359
shared: move NM_UTILS_ERROR to shared-utils
...
NM_UTILS_ERROR is our way to say, that we don't care about
the GError domain and code. nmcli sometimes passes domain "1"
and code "0" to g_set_error(), which could be considered
a bug.
We usually don't care about the error but only about the error
message, so let's have a universally available error quark around.
2016-03-26 12:10:53 +01:00
Thomas Haller
fafc90526b
shared: move _nm_utils_ascii_str_to_int64() to "shared/nm-shared-utils.h"
...
_nm_utils_ascii_str_to_int64() was declared in libnm-core's internal
header "nm-core-internal.h" and thus available for libnm-core, libnm,
NetworkManager and related.
It also means, the function was not available in libnm-util, libnm-glib,
clients or dispatcher. So, we either reimplemented it (nmc_string_to_int_base)
or struggle with the awkward strtol* API.
2016-03-26 12:10:53 +01:00
Thomas Haller
5de30dd029
shared: include "nm-shared-utils.h"
...
Include it via "nm-default.h" to all projects.
2016-03-26 12:10:53 +01:00
Thomas Haller
330026db90
shared: add "nm-shared-utils"
2016-03-26 12:10:53 +01:00
Thomas Haller
3025bfc8b2
shared: add nm_auto_unset_gvalue macro
2016-03-26 12:10:53 +01:00
Thomas Haller
2c8ef153a1
nmtst: add nmtst_variant_new_vardict() function
2016-03-26 12:10:53 +01:00
Thomas Haller
d45107c1de
nmtst: fix memleak when using NMTST_VARIANT_DROP_SETTING()
2016-03-26 12:10:53 +01:00
Thomas Haller
ce6fdc3e5e
libnm-util: verify connection also for self-assignment in replace_settings_from_connection()
...
nm_connection_replace_settings_from_connection() would return whether the
connection verifies at the end of the operation. While that is not very
useful, the API is like that and cannot be changed.
For consistency, also perform the verification step in case of self-assignment.
Self-assigment is anyway a case that probably never happens.
2016-03-26 12:10:53 +01:00
Lubomir Rintel
bbc941245d
merge: branch 'lr/virtual-parent-bgo762731'
...
https://bugzilla.gnome.org/show_bug.cgi?id=762731
2016-03-26 11:31:45 +01:00
Lubomir Rintel
b26159b149
manager: allow delaying the device activation when the parent is not real
...
Don't try to realize our device when the parent device is not real.
Instead, enqueue the activation and wait until it is active before
realizing our device and progressing the device to DISCONNECTED so that
it can get connected.
2016-03-26 11:31:21 +01:00
Lubomir Rintel
da226ae137
manager: separate the traversal to disconected to a separate routine
...
Will be useful when we'll be able to defer the realization of the
device.
2016-03-26 11:31:20 +01:00
Lubomir Rintel
6e382ea91d
active-connection: add parent active connection tracking
...
Make it possible to let active connection know about an active
connection it depends on and emit a signal when the parent is active.
2016-03-26 11:31:18 +01:00
Lubomir Rintel
ce745e098a
device: delay the activation if the backing device is not yet there
2016-03-26 11:29:41 +01:00
Lubomir Rintel
2a45d30cc5
device: only clear the activate request when the device disconnects
...
If it's traversing from unavailable to disconnected (e.g. realizing
of the device was delayed because it was awaiting the parent connection),
then we just want to progress the activation.
2016-03-26 11:29:41 +01:00
Lubomir Rintel
6219759490
device: _get_available_connections() with _get_best_connection()
...
We'll need to share the best conneciton logic and it's the only caller
of nm_device_get_available_connections(). Let's just move it all to
NMDevice and provide the best connection from there instead.
2016-03-26 11:29:41 +01:00
Lubomir Rintel
b37418157b
merge: branch 'lr/developer-gnome'
...
https://bugzilla.gnome.org/show_bug.cgi?id=764145
2016-03-26 11:28:44 +01:00
Beniamino Galvani
f67bf52046
man: use replace <programlisting> with <synopsis>
...
It makes more sense and actually looks good in rendered HTML.
[lkundrak@v3.sk: wrote the commit message]
2016-03-26 11:28:19 +01:00
Lubomir Rintel
5ce4c9fd84
docs: add manual pages to docbook documentation
...
This way they will make it to developer.gnome.org.
2016-03-26 11:28:19 +01:00
Lubomir Rintel
8f8c15fb3a
docs: remove some outdated documentation
...
The migration guide and the old D-Bus API are not needed anymore.
2016-03-26 11:28:19 +01:00
Lubomir Rintel
3a2803b42c
docs: replace spec.html with docbook D-Bus API reference
...
May use a lot of improvement (actually documenting the names and
objects that use the interfaces in question), but at least this looks a
lot better on developer.gnome.org.
2016-03-26 11:28:19 +01:00
Lubomir Rintel
618373a14f
dbus: use the annotations for documentation
...
gdbus only understands those (and gtk docstrings, which we should eventually
use) when generating the documentation.
2016-03-26 11:28:19 +01:00
Lubomir Rintel
f88dd66e6d
introspection: build docbook when generating the code
2016-03-26 11:28:19 +01:00
Christian Kirbach
96f937bb3d
po: update German (de) translation (bgo #764175 )
...
https://bugzilla.gnome.org/show_bug.cgi?id=764175
2016-03-25 21:04:09 +01:00
Thomas Haller
12e6984b87
platform/tests: fix bug in netns test which can cause mounting tmpfs over /run
...
The root-test "/general/netns/bind-to-path" mounts a tmpfs
over /var/run for the duration of the test and unmounts it at
the end.
Due to a bug, we first mount the tmpfs, then switch to another
namespace, and finally unmount /var/run on that other namespace.
That means, when you run the tests as root, it will bork /run
on your system.
Fixes: 46f5c07643
2016-03-24 17:49:15 +01:00
Beniamino Galvani
76b79df155
dhcp: don't fail assertions when a DHCP client is not available
...
If no configured client is available, gracefully fail the activation
without throwing runtime errors.
2016-03-24 15:03:04 +01:00
Beniamino Galvani
fd971567b9
dhcp: fall back to other clients when an invalid one is specified
...
If the user specifies an invalid 'dhcp' option in configuration,
currently we disable DHCP. Instead, fall back to other available
clients, as we do for other options.
2016-03-24 15:03:04 +01:00
Beniamino Galvani
519787e1e4
core: accept zero @wait_before_kill_msec in nm_utils_kill_process_sync()
...
A zero @wait_before_kill_msec argument should disable the generation
of a SIGKILL signal (after a different signal has been sent).
2016-03-24 15:03:04 +01:00
Beniamino Galvani
3b3a4e1c8b
dns: fix error cleanup in kill_existing()
...
Fixes: 3e66813db2
2016-03-24 10:21:53 +01:00
Thomas Haller
2c11e23c34
shared: include <stdlib.h> in "nm-macros-internal.h"
...
"nm-macros-internal.h" uses free() for the "nm_auto_free"
macro. Thus, as long as that code is there, we anyway must
include <stdlib.h> along the line.
Do it in "nm-macros-internal.h" to make the header self-contained.
2016-03-24 10:10:53 +01:00
Thomas Haller
2f6517df43
dns: merge branch 'th/dns-resolv-conf-file-bgo764004'
...
https://mail.gnome.org/archives/networkmanager-list/2016-March/msg00123.html
https://bugzilla.gnome.org/show_bug.cgi?id=764004
2016-03-23 09:12:04 +01:00
Thomas Haller
a0f7967386
dns: always reload the dns configuration mode on SIGHUP
2016-03-23 09:09:06 +01:00
Thomas Haller
0c4b2d8c89
dns: enable dns plugins also with immutable resolv.conf
...
We check whether /etc/resolv.conf is set as immutable. But even then
we still want to support our dns plugins like dnsmasq and unbound.
2016-03-23 09:09:06 +01:00
Thomas Haller
288799713d
dns: add new "rc-manager=file"
2016-03-23 09:09:06 +01:00
Thomas Haller
22df466ed3
dns: split create_resolv_conf() out of write_resolv_conf()
2016-03-23 09:09:06 +01:00
Thomas Haller
f73621a545
dns: refactor NMDnsManagerResolvConfMode to string conversion
2016-03-23 09:09:06 +01:00
Thomas Haller
4faaa3eb0b
dns: fix _NMLOG() macro
...
The buffer was too small to contain _NMLOG_PREFIX_NAME and the pointer,
resulting in truncated messages like:
dns-mgr[0x561d1183d: set resolv-conf-mode: none
2016-03-23 09:08:35 +01:00
Thomas Haller
3bcc0e5cea
dnsmasq: use _LOG() macros
...
The _LOG*() macros based on _NMLOG() prefix each line with a
context. Since we no longer log the location of the logging line,
this is the more important.
2016-03-22 16:50:50 +01:00
Thomas Haller
3e66813db2
dns: refactor kill_existing() to always unlink pidfile
...
When a pidfile exists, it is always stale after this point
and kill_existing() should always unlink it.
Also, refactor kill_existing() to use nm_utils_kill_process_sync()
which waits for the process to be gone.
2016-03-22 16:45:00 +01:00
Thomas Haller
ca733526e6
dns: cleanup disposing of NMDnsPlugin
2016-03-22 16:45:00 +01:00
Thomas Haller
6673d3ad7a
dns: refactor cleanup and unlink of pidfile
2016-03-22 16:45:00 +01:00
Mathieu Trudel-Lapierre
2bb769cf10
dns: cleanup pid file when dnsmasq process terminated
...
[thaller@redhat.com: extracted the patch from a larger one]
https://mail.gnome.org/archives/networkmanager-list/2016-March/msg00144.html
Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2016-03-22 16:44:33 +01:00
Thomas Haller
99ef0d26e2
dns/trivial: fix indention
2016-03-22 16:30:38 +01:00
Thomas Haller
8c3295f447
systemd: merge branch systemd into master
...
Update systemd code from upstream. In the meantime, two
patches that we applied early in NetworkManager core were
applied in upstream systemd too. So, resync.
2016-03-22 14:03:39 +01:00
Thomas Haller
a558dc99d6
systemd: update code from upstream
...
This is a direct dump from systemd git on 2016-03-22, git commit
99d91109a6ed7f8bcdeef164fe9497112128944a.
======
SYSTEMD_DIR=../systemd
COMMIT=99d91109a6ed7f8bcdeef164fe9497112128944a
(
cd "$SYSTEMD_DIR"
git checkout "$COMMIT"
git reset --hard
git clean -fdx
)
git ls-files :/src/systemd/src/ | xargs -d '\n' rm -f
nm_copy_sd() {
mkdir -p "./src/systemd/$(dirname "$1")"
cp "$SYSTEMD_DIR/$1" "./src/systemd/$1"
}
nm_copy_sd "src/basic/alloc-util.c"
nm_copy_sd "src/basic/alloc-util.h"
nm_copy_sd "src/basic/async.h"
nm_copy_sd "src/basic/escape.c"
nm_copy_sd "src/basic/escape.h"
nm_copy_sd "src/basic/ether-addr-util.c"
nm_copy_sd "src/basic/ether-addr-util.h"
nm_copy_sd "src/basic/fileio.c"
nm_copy_sd "src/basic/fileio.h"
nm_copy_sd "src/basic/fd-util.c"
nm_copy_sd "src/basic/fd-util.h"
nm_copy_sd "src/basic/fs-util.c"
nm_copy_sd "src/basic/fs-util.h"
nm_copy_sd "src/basic/hash-funcs.c"
nm_copy_sd "src/basic/hash-funcs.h"
nm_copy_sd "src/basic/hashmap.c"
nm_copy_sd "src/basic/hashmap.h"
nm_copy_sd "src/basic/hexdecoct.c"
nm_copy_sd "src/basic/hexdecoct.h"
nm_copy_sd "src/basic/hostname-util.c"
nm_copy_sd "src/basic/hostname-util.h"
nm_copy_sd "src/basic/in-addr-util.c"
nm_copy_sd "src/basic/in-addr-util.h"
nm_copy_sd "src/basic/io-util.c"
nm_copy_sd "src/basic/io-util.h"
nm_copy_sd "src/basic/list.h"
nm_copy_sd "src/basic/log.h"
nm_copy_sd "src/basic/macro.h"
nm_copy_sd "src/basic/mempool.h"
nm_copy_sd "src/basic/mempool.c"
nm_copy_sd "src/basic/parse-util.c"
nm_copy_sd "src/basic/parse-util.h"
nm_copy_sd "src/basic/path-util.c"
nm_copy_sd "src/basic/path-util.h"
nm_copy_sd "src/basic/prioq.h"
nm_copy_sd "src/basic/prioq.c"
nm_copy_sd "src/basic/random-util.c"
nm_copy_sd "src/basic/random-util.h"
nm_copy_sd "src/basic/refcnt.h"
nm_copy_sd "src/basic/set.h"
nm_copy_sd "src/basic/siphash24.c"
nm_copy_sd "src/basic/siphash24.h"
nm_copy_sd "src/basic/socket-util.c"
nm_copy_sd "src/basic/socket-util.h"
nm_copy_sd "src/basic/sparse-endian.h"
nm_copy_sd "src/basic/stdio-util.h"
nm_copy_sd "src/basic/string-table.c"
nm_copy_sd "src/basic/string-table.h"
nm_copy_sd "src/basic/string-util.c"
nm_copy_sd "src/basic/string-util.h"
nm_copy_sd "src/basic/strv.c"
nm_copy_sd "src/basic/strv.h"
nm_copy_sd "src/basic/time-util.c"
nm_copy_sd "src/basic/time-util.h"
nm_copy_sd "src/basic/umask-util.h"
nm_copy_sd "src/basic/unaligned.h"
nm_copy_sd "src/basic/utf8.c"
nm_copy_sd "src/basic/utf8.h"
nm_copy_sd "src/basic/util.c"
nm_copy_sd "src/basic/util.h"
nm_copy_sd "src/libsystemd-network/arp-util.c"
nm_copy_sd "src/libsystemd-network/arp-util.h"
nm_copy_sd "src/libsystemd-network/dhcp6-internal.h"
nm_copy_sd "src/libsystemd-network/dhcp6-lease-internal.h"
nm_copy_sd "src/libsystemd-network/dhcp6-network.c"
nm_copy_sd "src/libsystemd-network/dhcp6-option.c"
nm_copy_sd "src/libsystemd-network/dhcp6-protocol.h"
nm_copy_sd "src/libsystemd-network/dhcp-identifier.c"
nm_copy_sd "src/libsystemd-network/dhcp-identifier.h"
nm_copy_sd "src/libsystemd-network/dhcp-internal.h"
nm_copy_sd "src/libsystemd-network/dhcp-lease-internal.h"
nm_copy_sd "src/libsystemd-network/dhcp-network.c"
nm_copy_sd "src/libsystemd-network/dhcp-option.c"
nm_copy_sd "src/libsystemd-network/dhcp-packet.c"
nm_copy_sd "src/libsystemd-network/dhcp-protocol.h"
nm_copy_sd "src/libsystemd-network/lldp.h"
nm_copy_sd "src/libsystemd-network/lldp-internal.h"
nm_copy_sd "src/libsystemd-network/lldp-neighbor.c"
nm_copy_sd "src/libsystemd-network/lldp-neighbor.h"
nm_copy_sd "src/libsystemd-network/lldp-network.c"
nm_copy_sd "src/libsystemd-network/lldp-network.h"
nm_copy_sd "src/libsystemd-network/network-internal.c"
nm_copy_sd "src/libsystemd-network/network-internal.h"
nm_copy_sd "src/libsystemd-network/sd-dhcp6-client.c"
nm_copy_sd "src/libsystemd-network/sd-dhcp6-lease.c"
nm_copy_sd "src/libsystemd-network/sd-dhcp-client.c"
nm_copy_sd "src/libsystemd-network/sd-dhcp-lease.c"
nm_copy_sd "src/libsystemd-network/sd-ipv4ll.c"
nm_copy_sd "src/libsystemd-network/sd-ipv4acd.c"
nm_copy_sd "src/libsystemd-network/sd-lldp.c"
nm_copy_sd "src/libsystemd/sd-event/sd-event.c"
nm_copy_sd "src/libsystemd/sd-id128/sd-id128.c"
nm_copy_sd "src/shared/dns-domain.c"
nm_copy_sd "src/shared/dns-domain.h"
nm_copy_sd "src/systemd/_sd-common.h"
nm_copy_sd "src/systemd/sd-dhcp6-client.h"
nm_copy_sd "src/systemd/sd-dhcp6-lease.h"
nm_copy_sd "src/systemd/sd-dhcp-client.h"
nm_copy_sd "src/systemd/sd-dhcp-lease.h"
nm_copy_sd "src/systemd/sd-event.h"
nm_copy_sd "src/systemd/sd-ndisc.h"
nm_copy_sd "src/systemd/sd-id128.h"
nm_copy_sd "src/systemd/sd-ipv4acd.h"
nm_copy_sd "src/systemd/sd-ipv4ll.h"
nm_copy_sd "src/systemd/sd-lldp.h"
2016-03-22 13:57:06 +01:00
Lubomir Rintel
f29d90115f
dbus: fix a typo in the comment
2016-03-21 14:05:54 +01:00
Thomas Haller
7f98169cff
build: dist $(docbook_generated_man_pages)
...
Otherwise, the pre-generated manual pages from docbook
are not part of the source tarball.
2016-03-21 13:31:40 +01:00
Thomas Haller
acf9496ccf
main: create parent directories of NMSTATEDIR with permissions 755
...
In case, "$PREFIX/var/lib" does not exist, we want to create those
directories with permissions 755, not 700.
2016-03-21 13:31:40 +01:00
Thomas Haller
8297683605
main: create NMSTATEDIR with permissions 700
...
"NMSTATEDIR" is "nmstatedir" is "'${localstatedir}'/lib/$PACKAGE" is
usually "/var/lib/NetworkManager".
The "install-data-hook" in "src/Makefile.am" properly installs the
directory with permissions 700. When creating the directory at startup,
we must also use those permissions.
2016-03-21 11:41:51 +01:00
Robby Workman
b907d90f61
src/Makefile.am: create $rundir mode 0755 instead of 0700
...
Otherwise, $NMRUNDIR/resolv.conf isn't readable by unprivileged
users.
https://mail.gnome.org/archives/networkmanager-list/2016-March/msg00124.html
2016-03-21 11:33:15 +01:00