diff options
Diffstat (limited to 'src/grp-network/libnetworkd-core')
42 files changed, 162 insertions, 162 deletions
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile index 740206413e..5afee3d399 100644 --- a/src/grp-network/libnetworkd-core/Makefile +++ b/src/grp-network/libnetworkd-core/Makefile @@ -93,7 +93,7 @@ nodist_libnetworkd_core_la_SOURCES = \ libnetworkd_core_la_LIBADD = \ libsystemd-network.la \ libsystemd-internal.la \ - libfirewall.la \ + libsystemd-firewall.la \ libsystemd-shared.la sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.c b/src/grp-network/libnetworkd-core/networkd-address-pool.c index 7b57f6be0e..fa71df4bd5 100644 --- a/src/grp-network/libnetworkd-core/networkd-address-pool.c +++ b/src/grp-network/libnetworkd-core/networkd-address-pool.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/set.h" -#include "basic/string-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/string-util.h" #include "networkd-address-pool.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-address-pool.h b/src/grp-network/libnetworkd-core/networkd-address-pool.h index 5d7020739d..102608fa37 100644 --- a/src/grp-network/libnetworkd-core/networkd-address-pool.h +++ b/src/grp-network/libnetworkd-core/networkd-address-pool.h @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/in-addr-util.h" -#include "basic/list.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/list.h" typedef struct AddressPool AddressPool; typedef struct Manager Manager; diff --git a/src/grp-network/libnetworkd-core/networkd-address.c b/src/grp-network/libnetworkd-core/networkd-address.c index cd24bc12f2..4481e57ef2 100644 --- a/src/grp-network/libnetworkd-core/networkd-address.c +++ b/src/grp-network/libnetworkd-core/networkd-address.c @@ -19,16 +19,16 @@ #include <net/if.h> -#include "basic/alloc-util.h" -#include "basic/parse-util.h" -#include "basic/set.h" -#include "basic/socket-util.h" -#include "basic/string-util.h" -#include "basic/utf8.h" -#include "basic/util.h" -#include "firewall-util.h" #include "sd-netlink/netlink-util.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" +#include "systemd-firewall/firewall-util.h" +#include "systemd-shared/conf-parser.h" #include "networkd-address.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-address.h b/src/grp-network/libnetworkd-core/networkd-address.h index 9378621580..0a6b8b6b2f 100644 --- a/src/grp-network/libnetworkd-core/networkd-address.h +++ b/src/grp-network/libnetworkd-core/networkd-address.h @@ -22,7 +22,7 @@ #include <inttypes.h> #include <stdbool.h> -#include "basic/in-addr-util.h" +#include "systemd-basic/in-addr-util.h" typedef struct Address Address; diff --git a/src/grp-network/libnetworkd-core/networkd-brvlan.c b/src/grp-network/libnetworkd-core/networkd-brvlan.c index 118a6ed464..21401f6160 100644 --- a/src/grp-network/libnetworkd-core/networkd-brvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-brvlan.c @@ -22,11 +22,11 @@ #include <linux/if_bridge.h> -#include "basic/alloc-util.h" -#include "basic/parse-util.h" #include "sd-netlink/netlink-util.h" -#include "shared/conf-parser.h" -#include "shared/vlan-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/vlan-util.h" #include "networkd-brvlan.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-conf.c b/src/grp-network/libnetworkd-core/networkd-conf.c index 44f5170219..9fd1cf8191 100644 --- a/src/grp-network/libnetworkd-core/networkd-conf.c +++ b/src/grp-network/libnetworkd-core/networkd-conf.c @@ -19,11 +19,11 @@ #include <ctype.h> -#include "basic/def.h" -#include "basic/hexdecoct.h" -#include "basic/string-table.h" -#include "shared/conf-parser.h" +#include "systemd-basic/def.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/string-table.h" #include "systemd-network/dhcp-identifier.h" +#include "systemd-shared/conf-parser.h" #include "networkd-conf.h" diff --git a/src/grp-network/libnetworkd-core/networkd-dhcp4.c b/src/grp-network/libnetworkd-core/networkd-dhcp4.c index 2e7858ccd3..d29787b92f 100644 --- a/src/grp-network/libnetworkd-core/networkd-dhcp4.c +++ b/src/grp-network/libnetworkd-core/networkd-dhcp4.c @@ -21,8 +21,8 @@ #include <linux/if.h> -#include "basic/alloc-util.h" -#include "basic/hostname-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hostname-util.h" #include "systemd-network/dhcp-lease-internal.h" #include "systemd-network/network-internal.h" diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.c b/src/grp-network/libnetworkd-core/networkd-fdb.c index 2949def65b..344d38f13a 100644 --- a/src/grp-network/libnetworkd-core/networkd-fdb.c +++ b/src/grp-network/libnetworkd-core/networkd-fdb.c @@ -20,11 +20,11 @@ #include <net/ethernet.h> #include <net/if.h> -#include "basic/alloc-util.h" -#include "basic/util.h" #include "sd-netlink/netlink-util.h" -#include "shared/conf-parser.h" -#include "shared/vlan-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/vlan-util.h" #include "networkd-fdb.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-fdb.h b/src/grp-network/libnetworkd-core/networkd-fdb.h index a1ad4183dc..b798f36979 100644 --- a/src/grp-network/libnetworkd-core/networkd-fdb.h +++ b/src/grp-network/libnetworkd-core/networkd-fdb.h @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/list.h" -#include "basic/macro.h" +#include "systemd-basic/list.h" +#include "systemd-basic/macro.h" typedef struct Network Network; typedef struct FdbEntry FdbEntry; diff --git a/src/grp-network/libnetworkd-core/networkd-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-gperf.gperf index 6588bada51..836063d371 100644 --- a/src/grp-network/libnetworkd-core/networkd-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-gperf.gperf @@ -1,7 +1,7 @@ %{ #include <stddef.h> -#include "shared/conf-parser.h" +#include "systemd-shared/conf-parser.h" #include "networkd-conf.h" %} diff --git a/src/grp-network/libnetworkd-core/networkd-link-bus.c b/src/grp-network/libnetworkd-core/networkd-link-bus.c index aa352f447a..e690cfa8f4 100644 --- a/src/grp-network/libnetworkd-core/networkd-link-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-link-bus.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/parse-util.h" -#include "basic/strv.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/strv.h" #include "networkd-link.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-link.c b/src/grp-network/libnetworkd-core/networkd-link.c index d73629d679..ec762080b8 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.c +++ b/src/grp-network/libnetworkd-core/networkd-link.c @@ -22,20 +22,20 @@ #include <linux/if.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/set.h" -#include "basic/socket-util.h" -#include "basic/stdio-util.h" -#include "basic/string-table.h" -#include "basic/util.h" -#include "basic/virt.h" +#include "sd-bus/bus-util.h" #include "sd-netlink/netlink-util.h" -#include "shared/bus-util.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/set.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/util.h" +#include "systemd-basic/virt.h" #include "systemd-network/dhcp-lease-internal.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/udev-util.h" #include "networkd-lldp-tx.h" #include "networkd-ndisc.h" diff --git a/src/grp-network/libnetworkd-core/networkd-link.h b/src/grp-network/libnetworkd-core/networkd-link.h index 5c7b64a243..96315fa57f 100644 --- a/src/grp-network/libnetworkd-core/networkd-link.h +++ b/src/grp-network/libnetworkd-core/networkd-link.h @@ -23,15 +23,15 @@ #include <systemd/sd-bus.h> -#include "basic/list.h" -#include "basic/set.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/list.h" +#include "systemd-basic/set.h" #include "systemd-network/sd-dhcp-client.h" #include "systemd-network/sd-dhcp-server.h" #include "systemd-network/sd-dhcp6-client.h" #include "systemd-network/sd-ipv4ll.h" #include "systemd-network/sd-lldp.h" #include "systemd-network/sd-ndisc.h" +#include "systemd-staging/sd-netlink.h" typedef enum LinkState { LINK_STATE_PENDING, diff --git a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c index 6a015ec24f..abefb5cb9d 100644 --- a/src/grp-network/libnetworkd-core/networkd-lldp-tx.c +++ b/src/grp-network/libnetworkd-core/networkd-lldp-tx.c @@ -21,15 +21,15 @@ #include <inttypes.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/hostname-util.h" -#include "basic/parse-util.h" -#include "basic/random-util.h" -#include "basic/socket-util.h" -#include "basic/string-util.h" -#include "basic/unaligned.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unaligned.h" #include "networkd-lldp-tx.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager-bus.c b/src/grp-network/libnetworkd-core/networkd-manager-bus.c index 53652953fe..735bf75510 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-manager-bus.c @@ -17,8 +17,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "shared/bus-util.h" +#include "sd-bus/bus-util.h" +#include "systemd-basic/alloc-util.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-manager.c b/src/grp-network/libnetworkd-core/networkd-manager.c index 1bf22edcb7..d7d149ebb5 100644 --- a/src/grp-network/libnetworkd-core/networkd-manager.c +++ b/src/grp-network/libnetworkd-core/networkd-manager.c @@ -23,22 +23,22 @@ #include <systemd/sd-daemon.h> -#include "basic/alloc-util.h" -#include "basic/def.h" -#include "basic/fd-util.h" -#include "basic/fileio.h" -#include "basic/ordered-set.h" -#include "basic/path-util.h" -#include "basic/set.h" -#include "basic/virt.h" #include "libudev-private.h" +#include "sd-bus/bus-util.h" #include "sd-netlink/local-addresses.h" #include "sd-netlink/netlink-util.h" -#include "sd-netlink/sd-netlink.h" -#include "shared/bus-util.h" -#include "shared/conf-parser.h" -#include "shared/dns-domain.h" -#include "shared/udev-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/def.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/ordered-set.h" +#include "systemd-basic/path-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/virt.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/dns-domain.h" +#include "systemd-shared/udev-util.h" +#include "systemd-staging/sd-netlink.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c index 7e7b8f8804..de6210d76a 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.c @@ -22,13 +22,13 @@ #include <linux/if_bonding.h> -#include "basic/alloc-util.h" -#include "basic/extract-word.h" -#include "basic/missing.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "sd-netlink/sd-netlink.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/extract-word.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-netdev-bond.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bond.h b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h index 0ffb91b12e..f7f262ef60 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bond.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bond.h @@ -19,8 +19,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/in-addr-util.h" -#include "basic/list.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/list.h" #include "networkd-netdev.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c index 2de2587e36..0f46869008 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-bridge.c @@ -20,8 +20,8 @@ #include <net/if.h> -#include "basic/missing.h" #include "sd-netlink/netlink-util.h" +#include "systemd-basic/missing.h" #include "networkd-netdev-bridge.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf index e478b53f43..8666b56cf1 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-netdev-gperf.gperf @@ -1,9 +1,9 @@ %{ #include <stddef.h> -#include "shared/conf-parser.h" -#include "shared/vlan-util.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/vlan-util.h" #include "networkd-netdev-bond.h" #include "networkd-netdev-bridge.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c index 724fc86f92..2c91316029 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.c @@ -19,8 +19,8 @@ #include <net/if.h> -#include "basic/string-table.h" -#include "shared/conf-parser.h" +#include "systemd-basic/string-table.h" +#include "systemd-shared/conf-parser.h" #include "networkd-netdev-ipvlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h index a7ccd4922a..f9d103126b 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-ipvlan.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/missing.h" +#include "systemd-basic/missing.h" #include "networkd-netdev.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c index bf559f1b46..1b1ccbc772 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-macvlan.c @@ -19,8 +19,8 @@ #include <net/if.h> -#include "basic/string-table.h" -#include "shared/conf-parser.h" +#include "systemd-basic/string-table.h" +#include "systemd-shared/conf-parser.h" #include "networkd-netdev-macvlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c index e94c19126b..44a6d9f4e9 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.c @@ -24,13 +24,13 @@ #include <linux/if_tunnel.h> #include <linux/ip6_tunnel.h> -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "sd-netlink/sd-netlink.h" -#include "shared/conf-parser.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-link.h" #include "networkd-netdev-tunnel.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h index 09bd86656e..bc2a9f7881 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tunnel.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/in-addr-util.h" +#include "systemd-basic/in-addr-util.h" #include "networkd-netdev.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c index ab5b90fcc9..0660dfc1d6 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-tuntap.c @@ -26,9 +26,9 @@ #include <linux/if_tun.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/user-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/user-util.h" #include "networkd-netdev-tuntap.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c index fb068c75bf..171fe4012a 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-veth.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-veth.c @@ -21,7 +21,7 @@ #include <linux/veth.h> -#include "sd-netlink/sd-netlink.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-netdev-veth.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c index 0c24d5e859..a819edc380 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vlan.c @@ -19,7 +19,7 @@ #include <net/if.h> -#include "shared/vlan-util.h" +#include "systemd-shared/vlan-util.h" #include "networkd-netdev-vlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c b/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c index 8f91a11757..c9b281d185 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vrf.c @@ -19,8 +19,8 @@ #include <net/if.h> -#include "basic/missing.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/missing.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-netdev-vrf.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c index 8c611ac5db..a9df6bd89d 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.c @@ -19,12 +19,12 @@ #include <net/if.h> -#include "basic/alloc-util.h" -#include "basic/extract-word.h" -#include "basic/missing.h" -#include "basic/parse-util.h" -#include "sd-netlink/sd-netlink.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/extract-word.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/parse-util.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-staging/sd-netlink.h" #include "networkd-link.h" #include "networkd-netdev-vxlan.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h index 7950c867e3..345c3fc3a0 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev-vxlan.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/in-addr-util.h" +#include "systemd-basic/in-addr-util.h" typedef struct VxLan VxLan; diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.c b/src/grp-network/libnetworkd-core/networkd-netdev.c index 7cc5969cce..b24bcebd36 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.c +++ b/src/grp-network/libnetworkd-core/networkd-netdev.c @@ -19,17 +19,17 @@ #include <net/if.h> -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/fd-util.h" -#include "basic/list.h" -#include "basic/siphash24.h" -#include "basic/stat-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" #include "sd-netlink/netlink-util.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/conf-parser.h" #include "networkd-netdev.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-netdev.h b/src/grp-network/libnetworkd-core/networkd-netdev.h index dcec00af47..08397f0c73 100644 --- a/src/grp-network/libnetworkd-core/networkd-netdev.h +++ b/src/grp-network/libnetworkd-core/networkd-netdev.h @@ -19,9 +19,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/list.h" -#include "basic/time-util.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/list.h" +#include "systemd-basic/time-util.h" +#include "systemd-staging/sd-netlink.h" typedef struct netdev_join_callback netdev_join_callback; typedef struct Link Link; diff --git a/src/grp-network/libnetworkd-core/networkd-network-bus.c b/src/grp-network/libnetworkd-core/networkd-network-bus.c index d4cd275ffe..e8eeb454d2 100644 --- a/src/grp-network/libnetworkd-core/networkd-network-bus.c +++ b/src/grp-network/libnetworkd-core/networkd-network-bus.c @@ -17,9 +17,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/string-util.h" -#include "basic/strv.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf index e214790436..8bc398d25f 100644 --- a/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf +++ b/src/grp-network/libnetworkd-core/networkd-network-gperf.gperf @@ -1,9 +1,9 @@ %{ #include <stddef.h> -#include "shared/conf-parser.h" -#include "shared/vlan-util.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/vlan-util.h" #include "networkd-conf.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network.c b/src/grp-network/libnetworkd-core/networkd-network.c index 697b748e52..f0c8daa7a7 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.c +++ b/src/grp-network/libnetworkd-core/networkd-network.c @@ -20,19 +20,19 @@ #include <ctype.h> #include <net/if.h> -#include "basic/alloc-util.h" -#include "basic/conf-files.h" -#include "basic/fd-util.h" -#include "basic/hostname-util.h" -#include "basic/parse-util.h" -#include "basic/set.h" -#include "basic/stat-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/conf-parser.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/conf-files.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/stat-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/conf-parser.h" +#include "systemd-shared/dns-domain.h" #include "networkd-network.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-network.h b/src/grp-network/libnetworkd-core/networkd-network.h index 66430a7c45..6b1da36d28 100644 --- a/src/grp-network/libnetworkd-core/networkd-network.h +++ b/src/grp-network/libnetworkd-core/networkd-network.h @@ -21,10 +21,10 @@ #include <systemd/sd-bus.h> -#include "basic/hashmap.h" -#include "shared/condition.h" -#include "shared/resolve-util.h" +#include "systemd-basic/hashmap.h" #include "systemd-network/dhcp-identifier.h" +#include "systemd-shared/condition.h" +#include "systemd-shared/resolve-util.h" #include "udev.h" #include "networkd-address.h" diff --git a/src/grp-network/libnetworkd-core/networkd-route.c b/src/grp-network/libnetworkd-core/networkd-route.c index f6e2d4858e..0ee94d9c9c 100644 --- a/src/grp-network/libnetworkd-core/networkd-route.c +++ b/src/grp-network/libnetworkd-core/networkd-route.c @@ -17,14 +17,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/alloc-util.h" -#include "basic/in-addr-util.h" -#include "basic/parse-util.h" -#include "basic/set.h" -#include "basic/string-util.h" -#include "basic/util.h" #include "sd-netlink/netlink-util.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/set.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/conf-parser.h" #include "networkd-route.h" #include "networkd.h" diff --git a/src/grp-network/libnetworkd-core/networkd-util.c b/src/grp-network/libnetworkd-core/networkd-util.c index e5a5bce8cb..d0569215ab 100644 --- a/src/grp-network/libnetworkd-core/networkd-util.c +++ b/src/grp-network/libnetworkd-core/networkd-util.c @@ -17,11 +17,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/parse-util.h" -#include "basic/string-table.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/conf-parser.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" +#include "systemd-shared/conf-parser.h" #include "networkd-util.h" diff --git a/src/grp-network/libnetworkd-core/networkd-util.h b/src/grp-network/libnetworkd-core/networkd-util.h index d023782285..49ac1b0dc5 100644 --- a/src/grp-network/libnetworkd-core/networkd-util.h +++ b/src/grp-network/libnetworkd-core/networkd-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "basic/macro.h" +#include "systemd-basic/macro.h" typedef enum AddressFamilyBoolean { /* This is a bitmask, though it usually doesn't feel that way! */ diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/libnetworkd-core/networkd.h index dbc846a07e..c788ad0fcb 100644 --- a/src/grp-network/libnetworkd-core/networkd.h +++ b/src/grp-network/libnetworkd-core/networkd.h @@ -24,10 +24,10 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "basic/hashmap.h" -#include "basic/list.h" -#include "sd-netlink/sd-netlink.h" +#include "systemd-basic/hashmap.h" +#include "systemd-basic/list.h" #include "systemd-network/dhcp-identifier.h" +#include "systemd-staging/sd-netlink.h" #include "udev.h" #include "networkd-address-pool.h" |