summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--src/libsystemd-network/network-internal.c (renamed from src/shared/net-util.c)2
-rw-r--r--src/libsystemd-network/network-internal.h (renamed from src/shared/net-util.h)1
-rw-r--r--src/network/network-util.h1
-rw-r--r--src/network/networkd-address.c2
-rw-r--r--src/network/networkd-link.c2
-rw-r--r--src/network/networkd-netdev-gperf.gperf2
-rw-r--r--src/network/networkd-netdev.c2
-rw-r--r--src/network/networkd-network-gperf.gperf2
-rw-r--r--src/network/networkd-network.c2
-rw-r--r--src/network/networkd-route.c2
-rw-r--r--src/udev/net/link-config-gperf.gperf2
-rw-r--r--src/udev/net/link-config.c2
13 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 65a7ffeb27..54cd1c6bdf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -779,8 +779,6 @@ libsystemd_shared_la_SOURCES = \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
- src/shared/net-util.c \
- src/shared/net-util.h \
src/shared/errno-list.c \
src/shared/errno-list.h \
src/shared/af-list.c \
@@ -2460,7 +2458,9 @@ libsystemd_network_la_SOURCES = \
src/libsystemd-network/sd-ipv4ll.c \
src/libsystemd-network/ipv4ll-network.c \
src/libsystemd-network/ipv4ll-packet.c \
- src/libsystemd-network/ipv4ll-internal.h
+ src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/network-internal.c \
+ src/libsystemd-network/network-internal.h
libsystemd_network_la_LIBADD = \
libsystemd-label.la \
@@ -2720,6 +2720,7 @@ libudev_core_la_LIBADD = \
libudev-internal.la \
libsystemd-label.la \
libsystemd-internal.la \
+ libsystemd-network.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
diff --git a/src/shared/net-util.c b/src/libsystemd-network/network-internal.c
index 1c223117b8..eed0fda92d 100644
--- a/src/shared/net-util.c
+++ b/src/libsystemd-network/network-internal.c
@@ -27,7 +27,7 @@
#include "strv.h"
#include "siphash24.h"
#include "libudev-private.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "log.h"
#include "utf8.h"
#include "util.h"
diff --git a/src/shared/net-util.h b/src/libsystemd-network/network-internal.h
index 4a8d3f9fdf..65cd0d72a0 100644
--- a/src/shared/net-util.h
+++ b/src/libsystemd-network/network-internal.h
@@ -25,6 +25,7 @@
#include <netinet/in.h>
#include <stdbool.h>
+#include "udev.h"
#include "condition-util.h"
bool net_match_config(const struct ether_addr *match_mac,
diff --git a/src/network/network-util.h b/src/network/network-util.h
index 9979e6d906..139efc7677 100644
--- a/src/network/network-util.h
+++ b/src/network/network-util.h
@@ -22,6 +22,7 @@
***/
#include "util.h"
+#include "sd-network.h"
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_network_monitor*, sd_network_monitor_unref);
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 414b3bccfa..dd4c822c67 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -26,7 +26,7 @@
#include "utf8.h"
#include "util.h"
#include "conf-parser.h"
-#include "net-util.h"
+#include "network-internal.h"
int address_new_static(Network *network, unsigned section, Address **ret) {
_cleanup_address_free_ Address *address = NULL;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 4044f0b5a5..aa59dd7cf4 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -26,7 +26,7 @@
#include "libudev-private.h"
#include "util.h"
#include "bus-util.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "dhcp-lease-internal.h"
diff --git a/src/network/networkd-netdev-gperf.gperf b/src/network/networkd-netdev-gperf.gperf
index 2793d77a79..ea7ba5734b 100644
--- a/src/network/networkd-netdev-gperf.gperf
+++ b/src/network/networkd-netdev-gperf.gperf
@@ -2,7 +2,7 @@
#include <stddef.h>
#include "conf-parser.h"
#include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
%}
struct ConfigPerfItem;
%null_strings
diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 298bf277f3..3a670b3f0e 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -20,7 +20,7 @@
***/
#include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "path-util.h"
#include "conf-files.h"
#include "conf-parser.h"
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 7e3829a4a1..6ba890ff9b 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -2,7 +2,7 @@
#include <stddef.h>
#include "conf-parser.h"
#include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
%}
struct ConfigPerfItem;
%null_strings
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 6e9915b75d..776a9d3040 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -20,7 +20,7 @@
***/
#include "networkd.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "path-util.h"
#include "conf-files.h"
#include "conf-parser.h"
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 0cb7239ca0..8b020adba4 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -26,7 +26,7 @@
#include "utf8.h"
#include "util.h"
#include "conf-parser.h"
-#include "net-util.h"
+#include "network-internal.h"
int route_new_static(Network *network, unsigned section, Route **ret) {
_cleanup_route_free_ Route *route = NULL;
diff --git a/src/udev/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index 819e93c4d7..f562498f6d 100644
--- a/src/udev/net/link-config-gperf.gperf
+++ b/src/udev/net/link-config-gperf.gperf
@@ -1,7 +1,7 @@
%{
#include <stddef.h>
#include "conf-parser.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "link-config.h"
#include "ethtool-util.h"
%}
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 472a4150c3..5bb6b02c1b 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -38,7 +38,7 @@
#include "fileio.h"
#include "hashmap.h"
#include "rtnl-util.h"
-#include "net-util.h"
+#include "network-internal.h"
#include "siphash24.h"
struct link_config_ctx {