tree-wide: remove Emacs lines from all files This should be handled fine now by .dir-locals.el, so need to carry that stuff in every file.

siphash24: change result argument to uint64_t Change the "out" parameter from uint8_t[8] to uint64_t. On architectures which enforce pointer alignment this fixes crashes when we previously cast an unaligned array to uint64_t*, and on others this should at least improve performance as the compiler now aligns these properly. This also simplifies the code in most cases by getting rid of typecasts. The only place which we can't change is struct duid's en.id, as that is _packed_ and public API, so we can't enforce alignment of the "id" field and have to use memcpy instead.

util-lib: split out allocation calls into alloc-util.[ch]

util-lib: move /proc/cmdline parsing code to proc-cmdline.[ch]

util-lib: move string table stuff into its own string-table.[ch]

util-lib: split stat()/statfs()/stavfs() related calls into stat-util.[ch]

util-lib: split string parsing related calls from util.[ch] into parse-util.[ch]

util-lib: split out fd-related operations into fd-util.[ch] There are more than enough to deserve their own .c file, hence move them over.

util-lib: split our string related calls from util.[ch] into its own file string-util.[ch] There are more than enough calls doing string manipulations to deserve its own files, hence do something about it. This patch also sorts the #include blocks of all files that needed to be updated, according to the sorting suggestions from CODING_STYLE. Since pretty much every file needs our string manipulation functions this effectively means that most files have sorted #include blocks now. Also touches a few unrelated include files.

document ability to disable MACAddressPolicy While it is currently possible to either not set MACAddressPolicy or set it to a value different from "persistent" or "random", it is not obvious that a user can do so. Add a policy, "none", which simply retains kernel MAC addresses (same as not filling in the policy at all) and document it so that users are aware of this setting. Signed-off-by: Jacob Keller <jacob.keller@gmail.com>

sd-netlink: rename from sd-rtnl

udev: add some asserts Mostly for documentation purposes.

udev: link-config - fix corruption The parser used for MTU and Speed expects them to be size_t, not unsigned int. This caused a corruption in the rest of the structure. Reported by David O Neill <david.m.oneill@intel.com>.

udevd: net - fix leak in .link config Path, Driver and Type are now strv rather than strings, so free them properly.

shared: add random-util.[ch]

fix gcc warnings about uninitialized variables like: src/shared/install.c: In function ‘unit_file_lookup_state’: src/shared/install.c:1861:16: warning: ‘r’ may be used uninitialized in this function [-Wmaybe-uninitialized] return r < 0 ? r : state; ^ src/shared/install.c:1796:13: note: ‘r’ was declared here int r; ^

Use space after a silencing (void) We were using a space more often than not, and this way is codified in CODING_STYLE.

remove unused includes This patch removes includes that are not used. The removals were found with include-what-you-use which checks if any of the symbols from a header is in use.

udev: net_setup - clarify reason for failure of persistent mac address policy

udev: link_config - modernize a bit and fix leakes Not all of the link_config struct was getting freed.

udev: link-config - simplify net-match

net_setup/networkd: warn if matching is done on possibly unstable ifname

udev: net_setup - allow matching on OriginalName= This has been requested repeatedly, so let's give it a go. We explicitly do not allow matching on names that have already been changed (from a previous udev run, or otherwise), and matching on unpredictable names (ethX) is discouraged (but not currently disallowed). We also currently allow: [Match] Name=veth0 [Link] Name=my-name0 SomeOtherSetting=true Which means that the link file will be applied the first time it is invoked, but not on subsequent invocations, which may be surprising.

treewide: yet more log_*_errno + return simplifications Using: find . -name '*.[ch]' | while read f; do perl -i.mmm -e \ 'local $/; local $_=<>; s/(if\s*\([^\n]+\))\s*{\n(\s*)(log_[a-z_]*_errno\(\s*([->a-zA-Z_]+)\s*,[^;]+);\s*return\s+\g4;\s+}/\1\n\2return \3;/msg; print;' $f done And a couple of manual whitespace fixups.

udev,update-done: more log_xyz_errno() conversions

treewide: no need to negate errno for log_*_errno() It corrrectly handles both positive and negative errno values.

treewide: auto-convert the simple cases to log_*_errno() As a followup to 086891e5c1 "log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers", use sed to convert the simple cases to use the new macros: find . -name '*.[ch]' | xargs sed -r -i -e \ 's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/' Multi-line log_*() invocations are not covered. And we also should add log_unit_*_errno().

util: simplify proc_cmdline() to reuse get_process_cmdline() Also, make all parsing of the kernel cmdline non-fatal.

s/commandline/command line/g

udev: link-config: remove unneded linux/netdevice.h include

udev: net_setup_link - open ethtool and rtnl connections lazily

udev: link-config - only set *name on success

udev: link-config - fix crash due to missing hwaddr Reported by: master.nosferatu@gmail.com

networkd: link - split out dhcp4 handling

udev: link-config - fix naming policy Don't exit the name-finding loop when the 'kernel' policy is detected. We should still find a fallback name if possible in the (very likely) case that no kernel name is set at all.

udev: link-config - whitespace Don't overflow 80 cols unneccessarily (we are ok with doing it when it improves readability, but that's not the case here).

udev: link_setup - respect kernel name assign policy Newer kernels export meta-information about the origin of an ifname. Respect this from the ifname rename logic. We do not rename any interfaces that was originally named by userspace, nor once which have already been renamed from userspace. Moreover, we optionally do not (the default) rename interfaces which the kernel claims to have named in a predictable way.

Reject invalid quoted strings String which ended in an unfinished quote were accepted, potentially with bad memory accesses. Reject anything which ends in a unfished quote, or contains non-whitespace characters right after the closing quote. _FOREACH_WORD now returns the invalid character in *state. But this return value is not checked anywhere yet. Also, make 'word' and 'state' variables const pointers, and rename 'w' to 'word' in various places. Things are easier to read if the same name is used consistently. mbiebl_> am I correct that something like this doesn't work mbiebl_> ExecStart=/usr/bin/encfs --extpass='/bin/systemd-ask-passwd "Unlock EncFS"' mbiebl_> systemd seems to strip of the quotes mbiebl_> systemctl status shows mbiebl_> ExecStart=/usr/bin/encfs --extpass='/bin/systemd-ask-password Unlock EncFS $RootDir $MountPoint mbiebl_> which is pretty weird

Be more careful when checking for empty files If we want to avoid reading a totally empty file, it seems better to check after we have opened the file, not before.

Let config_parse open file where applicable Special care is needed so that we get an error message if the file failed to parse, but not when it is missing. To avoid duplicating the same error check in every caller, add an additional 'warn' boolean to tell config_parse whether a message should be issued. This makes things both shorter and more robust wrt. to error reporting.

Constify ConfigTableItem tables

udev: link_config - ignore errors due to missing MAC address Otherwis, we get misleading error messages on links with MACs. Reported by Leonid Isaev.

udev: net_setup_link - add a bit more logging

udev: fix invalid free() in enable_name_policy() static bool enable_name_policy(...) in ./src/udev/net/link-config.c calls proc_cmdline(...) to get "line" initialized, but proc_cmdline(...) does not guarantee that atleast when both conditions (detect_container(NULL) > 0) and read_full_file(...) returned < 0.

udev: link-config - fix mem leak Reported by Kay.

silence warnings

udev: link-config - treat any non-random mac address as persistent The address may be already changed by other processes, or set when creating the netdev from userspace.

network: implement masking of .link, .network and .netdev files

networkd: tie links to rtnl rather than udev This essentially swaps the roles of rtnl and udev in networkd. After this change libudev is only used for waiting for udev to initialize devices and to get udev-specific information needed for some [Match] attributes. This in particular simplifies the code in containers where udev is not really useful, but also simplifies things and reduces round-trips in the non-container case.

Fix a few return codes in error paths

libsystemd-network: move network-utils from src/shared This does not belong in shared as it is mostly a detail of our networking subsystem. Moreover, now we can use libudev here, which will simplify things.

sd-ipv4ll/networkd: generate predictable addresses Increase the chance of using the same link local address between reboots. The pseudo random sequence of addresses we attempt is now seeded with data that is very likely to stay the same between reboots, but at the same time be unique to the specific machine/nic. First we try to use the ID_NET_NAME_* data from the udev db combined with the machin-id, which is guaranteed to be unique and persistent, if available. If that is not possible (e.g., in containers where we don't have access to the udev db) we fallback to using the MAC address of the interface, which is guaranteed to be unique, and likely to be persistent. [tomegun: three minor changes: - don't expose HASH_KEY in the siphash24 header - get rid of some compile-warnings (and some casts at the same time), by using uint8_t[8] rather than uint64_t in the api - added commit message]

util: replace close_nointr_nofail() by a more useful safe_close() safe_close() automatically becomes a NOP when a negative fd is passed, and returns -1 unconditionally. This makes it easy to write lines like this: fd = safe_close(fd); Which will close an fd if it is open, and reset the fd variable correctly. By making use of this new scheme we can drop a > 200 lines of code that was required to test for non-negative fds or to reset the closed fd variable afterwards.

Make tables for DEFINE_STRING_TABLE_LOOKUP consistent Bring some arrays that are used for DEFINE_STRING_TABLE_LOOKUP() in the same order than the enums they reference. Also, pass the corresponding _MAX value to the array initalizer where appropriate.

udev: net - allow MTU and Speed to be specified with units This also changes the names to MTUBytes and BitsPerSecond, respectively. Notice that the speed was mistakenly documented to be in bytes before this change.

net-util: match on the driver as exposed by ethtool if DRIVER not set Also fix a copy-paste error that broke matching on interface name.

udev - link-setup - expose ID_NET_DRIVER This is the same as shown by 'ethtool -i <ifname>', and is sometimes set even though DRIVER is not.

.network/.netdev/.link: allow to match on architecture

network/link: Match - filter on kernel cmdline, host and virt

api: in constructor function calls, always put the returned object pointer first (or second) Previously the returned object of constructor functions where sometimes returned as last, sometimes as first and sometimes as second parameter. Let's clean this up a bit. Here are the new rules: 1. The object the new object is derived from is put first, if there is any 2. The object we are creating will be returned in the next arguments 3. This is followed by any additional arguments Rationale: For functions that operate on an object we always put that object first. Constructors should probably not be too different in this regard. Also, if the additional parameters might want to use varargs which suggests to put them last. Note that this new scheme only applies to constructor functions, not to all other functions. We do give a lot of freedom for those. Note that this commit only changes the order of the new functions we added, for old ones we accept the wrong order and leave it like that.

udev: net-config - allow interface names to be set from the hwdb

net-match: fix Driver= match It should match on the driver of the parent device.

No need to canonicalize fixed paths

log: log_error() and friends add a newline after each line anyway, so avoid including it in the log strings

shared: switch our hash table implementation over to SipHash SipHash appears to be the new gold standard for hashing smaller strings for hashtables these days, so let's make use of it.

udev link-config: add asserts to silence scan-build

Fix a few resource leaks in error paths https://bugzilla.redhat.com/show_bug.cgi?id=1043304

trivial coding style clean ups - Add space between if/for and the opening parentheses - Place the opening brace on same line as the function (not for udev) From the CODING_STYLE Try to use this: void foo() { } instead of this: void foo() { }

Revert "link-config: match length for kernel commandline option" This reverts commit da66338e17f4df04d9d7cc22ec971b416d57761e. It is superseeded by 70f75a523b16ad495a7791d595ee3eececf75953

udev: net_setup_link - don't use Description as Alias Use Description only internally, and allow Alias to be set as a separate option. For instance SNMP uses ifalias for a specific purpose, so let's not write to it by default.

link-config: Fix typo in log_warning

link-config: match length for kernel commandline option This prevents enable_name_policy() from invariably returning false when it matches a zero length string at the end of /proc/cmdline.

util: unify reading of /proc/cmdline Instead of individually checking for containers in each user do this once in a new call proc_cmdline() that read the file only if we are not in a container.

net-util: don't use libudev Should fix linking with old toolchain.

net-config: start split out matching and parsing logic Move this to src/share/net-util.c, so it can be used elsewhere.

link-config: support --enable-split-usr

udev: config-link - one less log_info

udev: link-config - less verbose logging Also reinstate print to kmsg when renaming netif.

udev: link-config - let udevd set the ifname

rtnl: move set_link_properties to rtnl-utils

udev: link-config - split connection to sockets from loading of configs We want to load the config in _init, but not connect to the sockets before we are forked.

rtnl: introduce default timeout We set it to 10 secs (as we are only communicating with the kernel, it seems we should be able to bail out sooner than sd-bus, which uses 25). When passing timout 0, the default is used, use this in link-config.

udev: link-config - use safe_atou instead of strtoul

udev: link-config - use proper return values Not sure if -ENOENT is the correct return value for when no persistent network name is set, but couldn't think of anything better.

udev: link-config - use _cleanup_ macro locally

path_check_timestamp: only keep the most recent timestamp There is no point in keeping one timestamp for each directory, as we only ever care about the most recent one.

udev: link-config - add proper parsing

network: move configuration to /etc/systemd/network This is private configuraiton, so let's not pollute the namespace (and hence make Debian happy :) ).

udev: link-config - add mac address policy This introduces a new key MACAddressPolicy. The possible policies are 'persistent' and 'random'. 'persistent' will do nothing if the current address is the hardware address, but if the hardware does not have an address (or another address is set for whatever reason), we will generate an address which will be random, but persistent between boots (based on machineid and persistent netif name). 'random' will do nothing if the kernel already set a random address, otherwise it will generate a random one and use that instead. This patch sets MACAddressPolicy=persistent in the default .link file.

udev: link-config - move naming policy from udev rules This introduces a new key NamePolicy, which takes an ordered list of naming policies. The first successful one is applide. If all fail the value of Name (if any) is used. The possible policies are 'onboard', 'slot', 'path' and 'mac'. This patch introduces a default link file, which replaces the equivalent udev rule.

udev: link-config - sanity check the ifname and mac address

udev: link-config: add rtnl support This adds support for setting the mac address, name and mtu. Example: [Link] MTU=1450 MACAddress=98:76:54:32:10:ab Name=wireless0

udev: link-config: add ethtool support This adds support for setting the link speed, duplex and WakeOnLan settings. Example: [Link] SpeedMBytes=100 Duplex=half WakeOnLan=magic

udev: add network link configuration tool This tool applies hardware specific settings to network devices before they are announced via libudev. Settings that will probably eventually be supported are MTU, Speed, DuplexMode, WakeOnLan, MACAddress, MACAddressPolicy (e.g., 'hardware', 'synthetic' or 'random'), Name and NamePolicy (replacing our current interface naming logic). This patch only introduces support for Description, as a proof of concept. Some of these settings may later be overriden by a network management daemon/script. However, these tools should always listen and wait on libudev before touching a device (listening on netlink is not enough). This is no different from how things used to be, as we always supported changing the network interface name from udev rules, which does not work if someone has already started using it. The tool is configured by .link files in /etc/net/links/ (with the usual overriding logic in /run and /lib). The first (in lexicographical order) matching .link file is applied to a given device, and all others are ignored. The .link files contain a [Match] section with (currently) the keys MACAddress, Driver, Type (see DEVTYPE in udevadm info) and Path (this matches on the stable device path as exposed as ID_PATH, and not the unstable DEVPATH). A .link file matches a given device if all of the specified keys do. Currently the keys are treated as plain strings, but some limited globbing may later be added to the keys where it makes sense. Example: /etc/net/links/50-wireless.link [Match] MACAddress=98:f2:e4:42:c6:92 Path=pci-0000:02:00.0-bcma-0 Type=wlan [Link] Description=The wireless link