diff options
51 files changed, 81 insertions, 80 deletions
diff --git a/config.mk.in b/config.mk.in index b1698d1db3..5caa2599bb 100644 --- a/config.mk.in +++ b/config.mk.in @@ -111,8 +111,8 @@ libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared/include $(li libshared.DEPENDS = $(topoutdir)/src/libshared/src/libshared.la libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/src/libsystemd-internal.la -libsystemd-network.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-network -I$(topsrcdir)/src/libudev/src $(libsystemd.CPPFLAGS) -libsystemd-network.DEPENDS = $(topoutdir)/src/libsystemd-network/libsystemd-network.la +libsystemd-network.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-network/include +libsystemd-network.DEPENDS = $(topoutdir)/src/libsystemd-network/src/libsystemd-network.la libsystemd.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/include libsystemd.DEPENDS = $(topoutdir)/src/libsystemd/libsystemd.la libudev.CPPFLAGS = -I$(topsrcdir)/src/libudev/include diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c index 384dae624f..e022e313e1 100644 --- a/src/grp-network/libnetworkd-core/networkd-conf.c +++ b/src/grp-network/libnetworkd-core/networkd-conf.c @@ -21,7 +21,7 @@ #include "shared/conf-parser.h" #include "basic/def.h" -#include "dhcp-identifier.h" +#include "systemd-network/dhcp-identifier.h" #include "basic/hexdecoct.h" #include "networkd-conf.h" #include "basic/string-table.h" diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c index 438ffd0842..4fbd9644cd 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c @@ -21,9 +21,9 @@ #include <linux/if.h> #include "basic/alloc-util.h" -#include "dhcp-lease-internal.h" +#include "systemd-network/dhcp-lease-internal.h" #include "basic/hostname-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m, diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp6.c b/src/grp-network/libnetworkd-core/networkd-dhcp6.c index c5a3c52e94..4b0f93a222 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp6.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp6.c @@ -22,7 +22,7 @@ #include <systemd/sd-dhcp6-client.h> -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link); diff --git a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c index ae323d595b..c82525788d 100644 --- a/src/grp-network/libnetworkd-core/networkd-ipv4ll.c +++ b/src/grp-network/libnetworkd-core/networkd-ipv4ll.c @@ -20,7 +20,7 @@ #include <netinet/ether.h> #include <linux/if.h> -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static int ipv4ll_address_lost(Link *link) { diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index cb59a8e07c..45ff76c5ec 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -23,11 +23,11 @@ #include "basic/alloc-util.h" #include "shared/bus-util.h" -#include "dhcp-lease-internal.h" +#include "systemd-network/dhcp-lease-internal.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" #include "networkd-lldp-tx.h" #include "basic/set.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf index 37f6884656..cfbff05578 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf @@ -1,7 +1,7 @@ %{ #include <stddef.h> #include "shared/conf-parser.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-netdev-bond.h" #include "networkd-netdev-ipvlan.h" #include "networkd-netdev-macvlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c index 33204753c8..dc4cad9c33 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev.c @@ -25,7 +25,7 @@ #include "basic/fd-util.h" #include "basic/list.h" #include "netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-netdev.h" #include "networkd.h" #include "basic/siphash24.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf index 9436e11b66..50e5d1c19e 100644 --- a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf @@ -3,7 +3,7 @@ #include "shared/conf-parser.h" #include "networkd.h" #include "networkd-conf.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" %} struct ConfigPerfItem; %null_strings diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c index e9132d4618..715be97d13 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.c +++ b/src/grp-network/libnetworkd-core/networkd-network.c @@ -26,7 +26,7 @@ #include "shared/dns-domain.h" #include "basic/fd-util.h" #include "basic/hostname-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-network.h" #include "networkd.h" #include "basic/parse-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h index 33c97416f8..3d77524bba 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.h +++ b/src/grp-network/libnetworkd-core/networkd-network.h @@ -23,7 +23,7 @@ #include "udev.h" #include "shared/condition.h" -#include "dhcp-identifier.h" +#include "systemd-network/dhcp-identifier.h" #include "basic/hashmap.h" #include "shared/resolve-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h index cabd43b8e1..a3ae0b988b 100644 --- a/src/grp-network/libnetworkd-core/networkd.h +++ b/src/grp-network/libnetworkd-core/networkd.h @@ -26,7 +26,7 @@ #include <systemd/sd-netlink.h> #include "udev.h" -#include "dhcp-identifier.h" +#include "systemd-network/dhcp-identifier.h" #include "basic/hashmap.h" #include "basic/list.h" diff --git a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c index fbf7a96f45..d905590936 100644 --- a/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c +++ b/src/grp-network/systemd-networkd-wait-online/networkd-wait-online-manager.c @@ -23,7 +23,7 @@ #include "basic/alloc-util.h" #include "netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "networkd-wait-online-link.h" #include "networkd-wait-online.h" #include "basic/time-util.h" diff --git a/src/grp-network/test-network-tables.c b/src/grp-network/test-network-tables.c index 1b7eee8a03..2bdc2cee7a 100644 --- a/src/grp-network/test-network-tables.c +++ b/src/grp-network/test-network-tables.c @@ -1,5 +1,5 @@ -#include "dhcp6-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp6-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "ethtool-util.h" #include "netlink-internal.h" #include "networkd-netdev-bond.h" diff --git a/src/grp-network/test-network.c b/src/grp-network/test-network.c index 7e94cff59e..b33965286d 100644 --- a/src/grp-network/test-network.c +++ b/src/grp-network/test-network.c @@ -18,8 +18,8 @@ ***/ #include "basic/alloc-util.h" -#include "dhcp-lease-internal.h" -#include "network-internal.h" +#include "systemd-network/dhcp-lease-internal.h" +#include "systemd-network/network-internal.h" #include "networkd.h" static void test_deserialize_in_addr(void) { diff --git a/src/grp-network/test-networkd-conf.c b/src/grp-network/test-networkd-conf.c index 91863d8a9e..56e9b48f01 100644 --- a/src/grp-network/test-networkd-conf.c +++ b/src/grp-network/test-networkd-conf.c @@ -25,7 +25,7 @@ #include "networkd-conf.h" #include "networkd-network.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" static void test_config_parse_duid_type_one(const char *rvalue, int ret, DUIDType expected) { DUIDType actual = 0; diff --git a/src/grp-resolve/systemd-resolved/resolved-manager.c b/src/grp-resolve/systemd-resolved/resolved-manager.c index b2b3daaf5c..b5bd140a54 100644 --- a/src/grp-resolve/systemd-resolved/resolved-manager.c +++ b/src/grp-resolve/systemd-resolved/resolved-manager.c @@ -28,7 +28,7 @@ #include "basic/fileio-label.h" #include "basic/hostname-util.h" #include "basic/io-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "basic/ordered-set.h" #include "basic/parse-util.h" #include "basic/random-util.h" diff --git a/src/grp-udev/libudev-core/net/link-config-gperf.gperf b/src/grp-udev/libudev-core/net/link-config-gperf.gperf index 46fa4ed03d..20cbdf1f5f 100644 --- a/src/grp-udev/libudev-core/net/link-config-gperf.gperf +++ b/src/grp-udev/libudev-core/net/link-config-gperf.gperf @@ -1,7 +1,7 @@ %{ #include <stddef.h> #include "shared/conf-parser.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "link-config.h" #include "ethtool-util.h" %} diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index 872b9ba209..7c93c561b3 100644 --- a/src/grp-udev/libudev-core/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -31,7 +31,7 @@ #include "basic/log.h" #include "basic/missing.h" #include "sd-netlink/netlink-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "basic/parse-util.h" #include "basic/path-util.h" #include "basic/proc-cmdline.h" diff --git a/src/libsystemd-network/include/systemd-network/dhcp-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-internal.h index 4cfa831faf..dbfa4c93e6 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp-internal.h @@ -27,7 +27,7 @@ #include <systemd/sd-dhcp-client.h> -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-protocol.h" #include "basic/socket-util.h" int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, diff --git a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h index dee424294a..0fb58c763e 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp-lease-internal.h @@ -25,7 +25,7 @@ #include <systemd/sd-dhcp-client.h> -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-protocol.h" #include "basic/list.h" #include "basic/util.h" diff --git a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h index 7591db43e9..ecb8d35dde 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp-server-internal.h @@ -23,7 +23,7 @@ #include <systemd/sd-dhcp-server.h> #include <systemd/sd-event.h> -#include "dhcp-internal.h" +#include "systemd-network/dhcp-internal.h" #include "basic/hashmap.h" #include "basic/log.h" #include "basic/util.h" diff --git a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h index 8e9a6f8e8c..a3e442e6ee 100644 --- a/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/include/systemd-network/dhcp6-lease-internal.h @@ -24,7 +24,7 @@ #include <systemd/sd-dhcp6-lease.h> -#include "dhcp6-internal.h" +#include "systemd-network/dhcp6-internal.h" struct sd_dhcp6_lease { unsigned n_ref; diff --git a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h index b45ebc2b04..600431e775 100644 --- a/src/libsystemd-network/include/systemd-network/lldp-neighbor.h +++ b/src/libsystemd-network/include/systemd-network/lldp-neighbor.h @@ -26,7 +26,7 @@ #include <systemd/sd-lldp.h> #include "basic/hash-funcs.h" -#include "lldp-internal.h" +#include "systemd-network/lldp-internal.h" #include "basic/time-util.h" typedef struct LLDPNeighborID { diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile index 674d5d5273..c228fb6e6f 100644 --- a/src/libsystemd-network/src/Makefile +++ b/src/libsystemd-network/src/Makefile @@ -78,6 +78,7 @@ libsystemd_network_la_SOURCES = \ libsystemd_network_la_LIBADD = \ $(KMOD_LIBS) +systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src diff --git a/src/libsystemd-network/src/arp-util.c b/src/libsystemd-network/src/arp-util.c index 8de71764e1..a254fe7c62 100644 --- a/src/libsystemd-network/src/arp-util.c +++ b/src/libsystemd-network/src/arp-util.c @@ -21,7 +21,7 @@ #include <linux/filter.h> #include <arpa/inet.h> -#include "arp-util.h" +#include "systemd-network/arp-util.h" #include "basic/fd-util.h" #include "basic/util.h" diff --git a/src/libsystemd-network/src/dhcp-identifier.c b/src/libsystemd-network/src/dhcp-identifier.c index f263635040..fce44636bc 100644 --- a/src/libsystemd-network/src/dhcp-identifier.c +++ b/src/libsystemd-network/src/dhcp-identifier.c @@ -20,9 +20,9 @@ #include "libudev.h" #include <systemd/sd-id128.h> -#include "dhcp-identifier.h" -#include "dhcp6-protocol.h" -#include "network-internal.h" +#include "systemd-network/dhcp-identifier.h" +#include "systemd-network/dhcp6-protocol.h" +#include "systemd-network/network-internal.h" #include "basic/siphash24.h" #include "basic/sparse-endian.h" #include "shared/udev-util.h" diff --git a/src/libsystemd-network/src/dhcp-network.c b/src/libsystemd-network/src/dhcp-network.c index 4b08bf0ed8..a310e9e88e 100644 --- a/src/libsystemd-network/src/dhcp-network.c +++ b/src/libsystemd-network/src/dhcp-network.c @@ -27,7 +27,7 @@ #include <linux/if_infiniband.h> #include <linux/if_packet.h> -#include "dhcp-internal.h" +#include "systemd-network/dhcp-internal.h" #include "basic/fd-util.h" #include "basic/socket-util.h" diff --git a/src/libsystemd-network/src/dhcp-option.c b/src/libsystemd-network/src/dhcp-option.c index d3f977cb17..bd0ecd11e6 100644 --- a/src/libsystemd-network/src/dhcp-option.c +++ b/src/libsystemd-network/src/dhcp-option.c @@ -25,7 +25,7 @@ #include "basic/alloc-util.h" #include "basic/utf8.h" -#include "dhcp-internal.h" +#include "systemd-network/dhcp-internal.h" static int option_append(uint8_t options[], size_t size, size_t *offset, uint8_t code, size_t optlen, const void *optval) { diff --git a/src/libsystemd-network/src/dhcp-packet.c b/src/libsystemd-network/src/dhcp-packet.c index 8be774061d..cdb54caedc 100644 --- a/src/libsystemd-network/src/dhcp-packet.c +++ b/src/libsystemd-network/src/dhcp-packet.c @@ -23,8 +23,8 @@ #include <net/if_arp.h> #include <string.h> -#include "dhcp-internal.h" -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-internal.h" +#include "systemd-network/dhcp-protocol.h" #define DHCP_CLIENT_MIN_OPTIONS_SIZE 312 diff --git a/src/libsystemd-network/src/dhcp6-network.c b/src/libsystemd-network/src/dhcp6-network.c index db748a56e2..53019977fd 100644 --- a/src/libsystemd-network/src/dhcp6-network.c +++ b/src/libsystemd-network/src/dhcp6-network.c @@ -27,8 +27,8 @@ #include <unistd.h> #include <linux/if_packet.h> -#include "dhcp6-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp6-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "basic/fd-util.h" #include "basic/socket-util.h" diff --git a/src/libsystemd-network/src/dhcp6-option.c b/src/libsystemd-network/src/dhcp6-option.c index a90587295c..aba31afd97 100644 --- a/src/libsystemd-network/src/dhcp6-option.c +++ b/src/libsystemd-network/src/dhcp6-option.c @@ -24,8 +24,8 @@ #include <systemd/sd-dhcp6-client.h> #include "basic/alloc-util.h" -#include "dhcp6-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp6-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "shared/dns-domain.h" #include "basic/sparse-endian.h" #include "basic/strv.h" diff --git a/src/libsystemd-network/src/icmp6-util.c b/src/libsystemd-network/src/icmp6-util.c index 9978bf8af9..582e5d89c1 100644 --- a/src/libsystemd-network/src/icmp6-util.c +++ b/src/libsystemd-network/src/icmp6-util.c @@ -29,7 +29,7 @@ #include <linux/if_packet.h> #include "basic/fd-util.h" -#include "icmp6-util.h" +#include "systemd-network/icmp6-util.h" #include "basic/socket-util.h" #define IN6ADDR_ALL_ROUTERS_MULTICAST_INIT \ diff --git a/src/libsystemd-network/src/lldp-neighbor.c b/src/libsystemd-network/src/lldp-neighbor.c index bae1c64cb0..520d0090af 100644 --- a/src/libsystemd-network/src/lldp-neighbor.c +++ b/src/libsystemd-network/src/lldp-neighbor.c @@ -22,8 +22,8 @@ #include "basic/ether-addr-util.h" #include "basic/hexdecoct.h" #include "basic/in-addr-util.h" -#include "lldp-internal.h" -#include "lldp-neighbor.h" +#include "systemd-network/lldp-internal.h" +#include "systemd-network/lldp-neighbor.h" #include "basic/unaligned.h" static void lldp_neighbor_id_hash_func(const void *p, struct siphash *state) { diff --git a/src/libsystemd-network/src/lldp-network.c b/src/libsystemd-network/src/lldp-network.c index 086a5c133e..9af66bdcb5 100644 --- a/src/libsystemd-network/src/lldp-network.c +++ b/src/libsystemd-network/src/lldp-network.c @@ -22,7 +22,7 @@ #include <netinet/if_ether.h> #include "basic/fd-util.h" -#include "lldp-network.h" +#include "systemd-network/lldp-network.h" #include "basic/socket-util.h" int lldp_network_bind_raw_socket(int ifindex) { diff --git a/src/libsystemd-network/src/network-internal.c b/src/libsystemd-network/src/network-internal.c index e64f87a608..ffc449d24b 100644 --- a/src/libsystemd-network/src/network-internal.c +++ b/src/libsystemd-network/src/network-internal.c @@ -26,11 +26,11 @@ #include "basic/alloc-util.h" #include "shared/condition.h" #include "shared/conf-parser.h" -#include "dhcp-lease-internal.h" +#include "systemd-network/dhcp-lease-internal.h" #include "basic/ether-addr-util.h" #include "basic/hexdecoct.h" #include "basic/log.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "basic/parse-util.h" #include "basic/siphash24.h" #include "basic/socket-util.h" diff --git a/src/libsystemd-network/src/sd-dhcp-client.c b/src/libsystemd-network/src/sd-dhcp-client.c index bebf21689c..b1f2364689 100644 --- a/src/libsystemd-network/src/sd-dhcp-client.c +++ b/src/libsystemd-network/src/sd-dhcp-client.c @@ -30,10 +30,10 @@ #include "basic/alloc-util.h" #include "basic/async.h" -#include "dhcp-identifier.h" -#include "dhcp-internal.h" -#include "dhcp-lease-internal.h" -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-identifier.h" +#include "systemd-network/dhcp-internal.h" +#include "systemd-network/dhcp-lease-internal.h" +#include "systemd-network/dhcp-protocol.h" #include "shared/dns-domain.h" #include "basic/hostname-util.h" #include "basic/random-util.h" diff --git a/src/libsystemd-network/src/sd-dhcp-lease.c b/src/libsystemd-network/src/sd-dhcp-lease.c index b8107faf6f..034924c529 100644 --- a/src/libsystemd-network/src/sd-dhcp-lease.c +++ b/src/libsystemd-network/src/sd-dhcp-lease.c @@ -27,15 +27,15 @@ #include <systemd/sd-dhcp-lease.h> #include "basic/alloc-util.h" -#include "dhcp-lease-internal.h" -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-lease-internal.h" +#include "systemd-network/dhcp-protocol.h" #include "shared/dns-domain.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/hexdecoct.h" #include "basic/hostname-util.h" #include "basic/in-addr-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "basic/parse-util.h" #include "basic/stdio-util.h" #include "basic/string-util.h" diff --git a/src/libsystemd-network/src/sd-dhcp-server.c b/src/libsystemd-network/src/sd-dhcp-server.c index f64d19082a..91866ca541 100644 --- a/src/libsystemd-network/src/sd-dhcp-server.c +++ b/src/libsystemd-network/src/sd-dhcp-server.c @@ -23,8 +23,8 @@ #include <systemd/sd-dhcp-server.h> #include "basic/alloc-util.h" -#include "dhcp-internal.h" -#include "dhcp-server-internal.h" +#include "systemd-network/dhcp-internal.h" +#include "systemd-network/dhcp-server-internal.h" #include "basic/fd-util.h" #include "basic/in-addr-util.h" #include "basic/siphash24.h" diff --git a/src/libsystemd-network/src/sd-dhcp6-client.c b/src/libsystemd-network/src/sd-dhcp6-client.c index 33965671ea..1bd351d479 100644 --- a/src/libsystemd-network/src/sd-dhcp6-client.c +++ b/src/libsystemd-network/src/sd-dhcp6-client.c @@ -25,13 +25,13 @@ #include <systemd/sd-dhcp6-client.h> #include "basic/alloc-util.h" -#include "dhcp-identifier.h" -#include "dhcp6-internal.h" -#include "dhcp6-lease-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp-identifier.h" +#include "systemd-network/dhcp6-internal.h" +#include "systemd-network/dhcp6-lease-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "basic/fd-util.h" #include "basic/in-addr-util.h" -#include "network-internal.h" +#include "systemd-network/network-internal.h" #include "basic/random-util.h" #include "basic/socket-util.h" #include "basic/string-table.h" diff --git a/src/libsystemd-network/src/sd-dhcp6-lease.c b/src/libsystemd-network/src/sd-dhcp6-lease.c index 5d34c506ba..da241936c5 100644 --- a/src/libsystemd-network/src/sd-dhcp6-lease.c +++ b/src/libsystemd-network/src/sd-dhcp6-lease.c @@ -21,8 +21,8 @@ #include <errno.h> #include "basic/alloc-util.h" -#include "dhcp6-lease-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp6-lease-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "basic/strv.h" #include "basic/util.h" diff --git a/src/libsystemd-network/src/sd-ipv4acd.c b/src/libsystemd-network/src/sd-ipv4acd.c index 6032d0470c..08f95fda93 100644 --- a/src/libsystemd-network/src/sd-ipv4acd.c +++ b/src/libsystemd-network/src/sd-ipv4acd.c @@ -27,7 +27,7 @@ #include <systemd/sd-ipv4acd.h> #include "basic/alloc-util.h" -#include "arp-util.h" +#include "systemd-network/arp-util.h" #include "basic/fd-util.h" #include "basic/in-addr-util.h" #include "basic/list.h" diff --git a/src/libsystemd-network/src/sd-lldp.c b/src/libsystemd-network/src/sd-lldp.c index 50a6e66169..6586279161 100644 --- a/src/libsystemd-network/src/sd-lldp.c +++ b/src/libsystemd-network/src/sd-lldp.c @@ -24,9 +24,9 @@ #include "basic/alloc-util.h" #include "basic/fd-util.h" -#include "lldp-internal.h" -#include "lldp-neighbor.h" -#include "lldp-network.h" +#include "systemd-network/lldp-internal.h" +#include "systemd-network/lldp-neighbor.h" +#include "systemd-network/lldp-network.h" #include "basic/socket-util.h" #include "basic/ether-addr-util.h" diff --git a/src/libsystemd-network/src/sd-ndisc.c b/src/libsystemd-network/src/sd-ndisc.c index 328c1ac15a..514946c511 100644 --- a/src/libsystemd-network/src/sd-ndisc.c +++ b/src/libsystemd-network/src/sd-ndisc.c @@ -28,7 +28,7 @@ #include "basic/alloc-util.h" #include "basic/async.h" -#include "icmp6-util.h" +#include "systemd-network/icmp6-util.h" #include "basic/in-addr-util.h" #include "basic/list.h" #include "basic/socket-util.h" diff --git a/src/libsystemd-network/test/test-dhcp-client.c b/src/libsystemd-network/test/test-dhcp-client.c index 8436d6d93d..f8eb7e9999 100644 --- a/src/libsystemd-network/test/test-dhcp-client.c +++ b/src/libsystemd-network/test/test-dhcp-client.c @@ -26,9 +26,9 @@ #include <systemd/sd-event.h> #include "basic/alloc-util.h" -#include "dhcp-identifier.h" -#include "dhcp-internal.h" -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-identifier.h" +#include "systemd-network/dhcp-internal.h" +#include "systemd-network/dhcp-protocol.h" #include "basic/fd-util.h" #include "basic/util.h" diff --git a/src/libsystemd-network/test/test-dhcp-option.c b/src/libsystemd-network/test/test-dhcp-option.c index 5bd86e3956..20995c98ba 100644 --- a/src/libsystemd-network/test/test-dhcp-option.c +++ b/src/libsystemd-network/test/test-dhcp-option.c @@ -4,8 +4,8 @@ #include <string.h> #include "basic/alloc-util.h" -#include "dhcp-internal.h" -#include "dhcp-protocol.h" +#include "systemd-network/dhcp-internal.h" +#include "systemd-network/dhcp-protocol.h" #include "basic/macro.h" #include "basic/util.h" diff --git a/src/libsystemd-network/test/test-dhcp-server.c b/src/libsystemd-network/test/test-dhcp-server.c index 7dc315c07f..34a67fcc73 100644 --- a/src/libsystemd-network/test/test-dhcp-server.c +++ b/src/libsystemd-network/test/test-dhcp-server.c @@ -23,7 +23,7 @@ #include <systemd/sd-dhcp-server.h> #include <systemd/sd-event.h> -#include "dhcp-server-internal.h" +#include "systemd-network/dhcp-server-internal.h" static void test_pool(struct in_addr *address, unsigned size, int ret) { _cleanup_(sd_dhcp_server_unrefp) sd_dhcp_server *server = NULL; diff --git a/src/libsystemd-network/test/test-dhcp6-client.c b/src/libsystemd-network/test/test-dhcp6-client.c index 77b861d976..710f1fe0d4 100644 --- a/src/libsystemd-network/test/test-dhcp6-client.c +++ b/src/libsystemd-network/test/test-dhcp6-client.c @@ -27,9 +27,9 @@ #include <systemd/sd-dhcp6-client.h> #include <systemd/sd-event.h> -#include "dhcp6-internal.h" -#include "dhcp6-lease-internal.h" -#include "dhcp6-protocol.h" +#include "systemd-network/dhcp6-internal.h" +#include "systemd-network/dhcp6-lease-internal.h" +#include "systemd-network/dhcp6-protocol.h" #include "basic/fd-util.h" #include "basic/macro.h" #include "basic/socket-util.h" diff --git a/src/libsystemd-network/test/test-ipv4ll.c b/src/libsystemd-network/test/test-ipv4ll.c index 28c1d96ccf..ff594c1038 100644 --- a/src/libsystemd-network/test/test-ipv4ll.c +++ b/src/libsystemd-network/test/test-ipv4ll.c @@ -27,7 +27,7 @@ #include <systemd/sd-ipv4ll.h> -#include "arp-util.h" +#include "systemd-network/arp-util.h" #include "basic/fd-util.h" #include "basic/socket-util.h" #include "basic/util.h" diff --git a/src/libsystemd-network/test/test-lldp.c b/src/libsystemd-network/test/test-lldp.c index 78e7bc6929..f3480c28d6 100644 --- a/src/libsystemd-network/test/test-lldp.c +++ b/src/libsystemd-network/test/test-lldp.c @@ -29,7 +29,7 @@ #include "basic/alloc-util.h" #include "basic/fd-util.h" -#include "lldp-network.h" +#include "systemd-network/lldp-network.h" #include "basic/macro.h" #include "basic/string-util.h" diff --git a/src/libsystemd-network/test/test-ndisc-rs.c b/src/libsystemd-network/test/test-ndisc-rs.c index 105a9cf987..4878ad2429 100644 --- a/src/libsystemd-network/test/test-ndisc-rs.c +++ b/src/libsystemd-network/test/test-ndisc-rs.c @@ -21,7 +21,7 @@ #include <systemd/sd-ndisc.h> -#include "icmp6-util.h" +#include "systemd-network/icmp6-util.h" #include "basic/socket-util.h" static struct ether_addr mac_addr = { |