summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-25 13:14:12 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-25 13:19:18 +0100
commit3ffd4af22052963e7a29431721ee204e634bea75 (patch)
treefe60142dfddd37cfc02b7a135542107e772b36c3 /src/network
parent04c0136989b7eb896bfb0fb176e11233d69e1453 (diff)
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.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-link.c6
-rw-r--r--src/network/networkd-manager.c1
-rw-r--r--src/network/networkd-netdev-tuntap.c1
-rw-r--r--src/network/networkd-netdev.c3
-rw-r--r--src/network/networkd-network.c3
5 files changed, 9 insertions, 5 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 09f4bd7029..1144c82c17 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -25,18 +25,18 @@
#include "bus-util.h"
#include "dhcp-lease-internal.h"
+#include "fd-util.h"
#include "fileio.h"
#include "netlink-util.h"
#include "network-internal.h"
+#include "networkd-link.h"
+#include "networkd-netdev.h"
#include "set.h"
#include "socket-util.h"
#include "udev-util.h"
#include "util.h"
#include "virt.h"
-#include "networkd-link.h"
-#include "networkd-netdev.h"
-
bool link_dhcp6_enabled(Link *link) {
if (link->flags & IFF_LOOPBACK)
return false;
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 23d3aac694..febfe2ff81 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -28,6 +28,7 @@
#include "bus-util.h"
#include "conf-parser.h"
#include "def.h"
+#include "fd-util.h"
#include "libudev-private.h"
#include "local-addresses.h"
#include "netlink-util.h"
diff --git a/src/network/networkd-netdev-tuntap.c b/src/network/networkd-netdev-tuntap.c
index 6a808b6205..3096c4f72a 100644
--- a/src/network/networkd-netdev-tuntap.c
+++ b/src/network/networkd-netdev-tuntap.c
@@ -24,6 +24,7 @@
#include <linux/if_tun.h>
#include "networkd-netdev-tuntap.h"
+#include "fd-util.h"
#define TUN_DEV "/dev/net/tun"
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index d9ccc19d3d..bd1129a09b 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -23,13 +23,14 @@
#include "conf-files.h"
#include "conf-parser.h"
+#include "fd-util.h"
#include "list.h"
#include "netlink-util.h"
#include "network-internal.h"
+#include "networkd-netdev.h"
#include "networkd.h"
#include "siphash24.h"
#include "string-util.h"
-#include "networkd-netdev.h"
const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9f9a6911e3..150fd052c2 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -25,12 +25,13 @@
#include "conf-files.h"
#include "conf-parser.h"
#include "dns-domain.h"
+#include "fd-util.h"
#include "hostname-util.h"
#include "network-internal.h"
+#include "networkd-network.h"
#include "networkd.h"
#include "string-util.h"
#include "util.h"
-#include "networkd-network.h"
static int network_load_one(Manager *manager, const char *filename) {
_cleanup_network_free_ Network *network = NULL;