From 458554a48c62b7885a9347bb7103922f3b1f69e3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 27 Jul 2016 23:40:47 -0400 Subject: fix --- src/libsystemd-network/arp-util.c | 4 ++-- src/libsystemd-network/arp-util.h | 4 ++-- src/libsystemd-network/dhcp-identifier.c | 6 +++--- src/libsystemd-network/dhcp-identifier.h | 6 +++--- src/libsystemd-network/dhcp-internal.h | 2 +- src/libsystemd-network/dhcp-lease-internal.h | 4 ++-- src/libsystemd-network/dhcp-network.c | 4 ++-- src/libsystemd-network/dhcp-option.c | 4 ++-- src/libsystemd-network/dhcp-protocol.h | 4 ++-- src/libsystemd-network/dhcp-server-internal.h | 6 +++--- src/libsystemd-network/dhcp6-internal.h | 6 +++--- src/libsystemd-network/dhcp6-network.c | 4 ++-- src/libsystemd-network/dhcp6-option.c | 10 +++++----- src/libsystemd-network/dhcp6-protocol.h | 4 ++-- src/libsystemd-network/icmp6-util.c | 4 ++-- src/libsystemd-network/lldp-internal.h | 6 +++--- src/libsystemd-network/lldp-neighbor.c | 12 ++++++------ src/libsystemd-network/lldp-neighbor.h | 4 ++-- src/libsystemd-network/lldp-network.c | 4 ++-- src/libsystemd-network/network-internal.c | 22 +++++++++++----------- src/libsystemd-network/sd-dhcp-client.c | 12 ++++++------ src/libsystemd-network/sd-dhcp-lease.c | 20 ++++++++++---------- src/libsystemd-network/sd-dhcp-server.c | 10 +++++----- src/libsystemd-network/sd-dhcp6-client.c | 14 +++++++------- src/libsystemd-network/sd-dhcp6-lease.c | 6 +++--- src/libsystemd-network/sd-ipv4acd.c | 16 ++++++++-------- src/libsystemd-network/sd-ipv4ll.c | 16 ++++++++-------- src/libsystemd-network/sd-lldp.c | 8 ++++---- src/libsystemd-network/sd-ndisc.c | 12 ++++++------ src/libsystemd-network/test-acd.c | 4 ++-- src/libsystemd-network/test-dhcp-client.c | 6 +++--- src/libsystemd-network/test-dhcp-option.c | 6 +++--- src/libsystemd-network/test-dhcp6-client.c | 8 ++++---- src/libsystemd-network/test-ipv4ll-manual.c | 10 +++++----- src/libsystemd-network/test-ipv4ll.c | 6 +++--- src/libsystemd-network/test-lldp.c | 8 ++++---- src/libsystemd-network/test-ndisc-rs.c | 2 +- 37 files changed, 142 insertions(+), 142 deletions(-) (limited to 'src/libsystemd-network') diff --git a/src/libsystemd-network/arp-util.c b/src/libsystemd-network/arp-util.c index 4660c7ea09..8de71764e1 100644 --- a/src/libsystemd-network/arp-util.c +++ b/src/libsystemd-network/arp-util.c @@ -22,8 +22,8 @@ #include #include "arp-util.h" -#include "fd-util.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/util.h" int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_addr *eth_mac) { struct sock_filter filter[] = { diff --git a/src/libsystemd-network/arp-util.h b/src/libsystemd-network/arp-util.h index 3ef56b002a..7540cce95f 100644 --- a/src/libsystemd-network/arp-util.h +++ b/src/libsystemd-network/arp-util.h @@ -21,8 +21,8 @@ #include -#include "socket-util.h" -#include "sparse-endian.h" +#include "basic/socket-util.h" +#include "basic/sparse-endian.h" int arp_network_bind_raw_socket(int index, be32_t address, const struct ether_addr *eth_mac); diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index 906d960171..5917ddb506 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -23,10 +23,10 @@ #include "dhcp-identifier.h" #include "dhcp6-protocol.h" #include "network-internal.h" -#include "siphash24.h" -#include "sparse-endian.h" +#include "basic/siphash24.h" +#include "basic/sparse-endian.h" #include "udev-util.h" -#include "virt.h" +#include "basic/virt.h" #define SYSTEMD_PEN 43793 #define HASH_KEY SD_ID128_MAKE(80,11,8c,c2,fe,4a,03,ee,3e,d6,0c,6f,36,39,14,09) diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h index 802a0d6bc2..5045dd9b3d 100644 --- a/src/libsystemd-network/dhcp-identifier.h +++ b/src/libsystemd-network/dhcp-identifier.h @@ -21,9 +21,9 @@ #include -#include "macro.h" -#include "sparse-endian.h" -#include "unaligned.h" +#include "basic/macro.h" +#include "basic/sparse-endian.h" +#include "basic/unaligned.h" typedef enum DUIDType { DUID_TYPE_LLT = 1, diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h index dda4c13919..4cfa831faf 100644 --- a/src/libsystemd-network/dhcp-internal.h +++ b/src/libsystemd-network/dhcp-internal.h @@ -28,7 +28,7 @@ #include #include "dhcp-protocol.h" -#include "socket-util.h" +#include "basic/socket-util.h" int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link, uint32_t xid, const uint8_t *mac_addr, diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h index 646e612cee..dee424294a 100644 --- a/src/libsystemd-network/dhcp-lease-internal.h +++ b/src/libsystemd-network/dhcp-lease-internal.h @@ -26,8 +26,8 @@ #include #include "dhcp-protocol.h" -#include "list.h" -#include "util.h" +#include "basic/list.h" +#include "basic/util.h" struct sd_dhcp_route { struct in_addr dst_addr; diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c index fac25e0fa2..4b08bf0ed8 100644 --- a/src/libsystemd-network/dhcp-network.c +++ b/src/libsystemd-network/dhcp-network.c @@ -28,8 +28,8 @@ #include #include "dhcp-internal.h" -#include "fd-util.h" -#include "socket-util.h" +#include "basic/fd-util.h" +#include "basic/socket-util.h" static int _bind_raw_socket(int ifindex, union sockaddr_union *link, uint32_t xid, const uint8_t *mac_addr, diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c index c105196334..d3f977cb17 100644 --- a/src/libsystemd-network/dhcp-option.c +++ b/src/libsystemd-network/dhcp-option.c @@ -22,8 +22,8 @@ #include #include -#include "alloc-util.h" -#include "utf8.h" +#include "basic/alloc-util.h" +#include "basic/utf8.h" #include "dhcp-internal.h" diff --git a/src/libsystemd-network/dhcp-protocol.h b/src/libsystemd-network/dhcp-protocol.h index 3e32484c1d..b4ca0b73a0 100644 --- a/src/libsystemd-network/dhcp-protocol.h +++ b/src/libsystemd-network/dhcp-protocol.h @@ -23,8 +23,8 @@ #include #include -#include "macro.h" -#include "sparse-endian.h" +#include "basic/macro.h" +#include "basic/sparse-endian.h" struct DHCPMessage { uint8_t op; diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h index 7ba1e72155..7591db43e9 100644 --- a/src/libsystemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/dhcp-server-internal.h @@ -24,9 +24,9 @@ #include #include "dhcp-internal.h" -#include "hashmap.h" -#include "log.h" -#include "util.h" +#include "basic/hashmap.h" +#include "basic/log.h" +#include "basic/util.h" typedef struct DHCPClientId { size_t length; diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h index 4228053ade..34cdbed57a 100644 --- a/src/libsystemd-network/dhcp6-internal.h +++ b/src/libsystemd-network/dhcp6-internal.h @@ -24,9 +24,9 @@ #include -#include "list.h" -#include "macro.h" -#include "sparse-endian.h" +#include "basic/list.h" +#include "basic/macro.h" +#include "basic/sparse-endian.h" typedef struct DHCP6Address DHCP6Address; diff --git a/src/libsystemd-network/dhcp6-network.c b/src/libsystemd-network/dhcp6-network.c index fd2d60c9d5..db748a56e2 100644 --- a/src/libsystemd-network/dhcp6-network.c +++ b/src/libsystemd-network/dhcp6-network.c @@ -29,8 +29,8 @@ #include "dhcp6-internal.h" #include "dhcp6-protocol.h" -#include "fd-util.h" -#include "socket-util.h" +#include "basic/fd-util.h" +#include "basic/socket-util.h" int dhcp6_network_bind_udp_socket(int index, struct in6_addr *local_address) { union sockaddr_union src = { diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c index 0ae381ad22..2de3d61c50 100644 --- a/src/libsystemd-network/dhcp6-option.c +++ b/src/libsystemd-network/dhcp6-option.c @@ -23,14 +23,14 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" #include "dns-domain.h" -#include "sparse-endian.h" -#include "strv.h" -#include "unaligned.h" -#include "util.h" +#include "basic/sparse-endian.h" +#include "basic/strv.h" +#include "basic/unaligned.h" +#include "basic/util.h" #define DHCP6_OPTION_IA_NA_LEN 12 #define DHCP6_OPTION_IA_TA_LEN 4 diff --git a/src/libsystemd-network/dhcp6-protocol.h b/src/libsystemd-network/dhcp6-protocol.h index 2487c470ab..f54f4ad618 100644 --- a/src/libsystemd-network/dhcp6-protocol.h +++ b/src/libsystemd-network/dhcp6-protocol.h @@ -22,8 +22,8 @@ #include #include -#include "macro.h" -#include "sparse-endian.h" +#include "basic/macro.h" +#include "basic/sparse-endian.h" struct DHCP6Message { union { diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index acad9d7d6a..9978bf8af9 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -28,9 +28,9 @@ #include #include -#include "fd-util.h" +#include "basic/fd-util.h" #include "icmp6-util.h" -#include "socket-util.h" +#include "basic/socket-util.h" #define IN6ADDR_ALL_ROUTERS_MULTICAST_INIT \ { { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h index a6be995e3b..44857d6f63 100644 --- a/src/libsystemd-network/lldp-internal.h +++ b/src/libsystemd-network/lldp-internal.h @@ -23,9 +23,9 @@ #include #include -#include "hashmap.h" -#include "log.h" -#include "prioq.h" +#include "basic/hashmap.h" +#include "basic/log.h" +#include "basic/prioq.h" struct sd_lldp { int ifindex; diff --git a/src/libsystemd-network/lldp-neighbor.c b/src/libsystemd-network/lldp-neighbor.c index 6a716430e3..bae1c64cb0 100644 --- a/src/libsystemd-network/lldp-neighbor.c +++ b/src/libsystemd-network/lldp-neighbor.c @@ -17,14 +17,14 @@ along with systemd; If not, see . ***/ -#include "alloc-util.h" -#include "escape.h" -#include "ether-addr-util.h" -#include "hexdecoct.h" -#include "in-addr-util.h" +#include "basic/alloc-util.h" +#include "basic/escape.h" +#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 "unaligned.h" +#include "basic/unaligned.h" static void lldp_neighbor_id_hash_func(const void *p, struct siphash *state) { const LLDPNeighborID *id = p; diff --git a/src/libsystemd-network/lldp-neighbor.h b/src/libsystemd-network/lldp-neighbor.h index 050159ab73..b45ebc2b04 100644 --- a/src/libsystemd-network/lldp-neighbor.h +++ b/src/libsystemd-network/lldp-neighbor.h @@ -25,9 +25,9 @@ #include -#include "hash-funcs.h" +#include "basic/hash-funcs.h" #include "lldp-internal.h" -#include "time-util.h" +#include "basic/time-util.h" typedef struct LLDPNeighborID { /* The spec calls this an "MSAP identifier" */ diff --git a/src/libsystemd-network/lldp-network.c b/src/libsystemd-network/lldp-network.c index f031760351..086a5c133e 100644 --- a/src/libsystemd-network/lldp-network.c +++ b/src/libsystemd-network/lldp-network.c @@ -21,9 +21,9 @@ #include #include -#include "fd-util.h" +#include "basic/fd-util.h" #include "lldp-network.h" -#include "socket-util.h" +#include "basic/socket-util.h" int lldp_network_bind_raw_socket(int ifindex) { diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index d57baf8fff..6a0fb5fb2e 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -23,21 +23,21 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "condition.h" #include "conf-parser.h" #include "dhcp-lease-internal.h" -#include "ether-addr-util.c" -#include "hexdecoct.h" -#include "log.h" +#include "basic/ether-addr-util.h" +#include "basic/hexdecoct.h" +#include "basic/log.h" #include "network-internal.h" -#include "parse-util.h" -#include "siphash24.h" -#include "socket-util.h" -#include "string-util.h" -#include "strv.h" -#include "utf8.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/siphash24.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" +#include "basic/strv.h" +#include "basic/utf8.h" +#include "basic/util.h" const char *net_get_name(struct udev_device *device) { const char *name, *field; diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 193f31880f..636be90ec3 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -28,17 +28,17 @@ #include -#include "alloc-util.h" -#include "async.h" +#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 "dns-domain.h" -#include "hostname-util.h" -#include "random-util.h" -#include "string-util.h" -#include "util.h" +#include "basic/hostname-util.h" +#include "basic/random-util.h" +#include "basic/string-util.h" +#include "basic/util.h" #define MAX_CLIENT_ID_LEN (sizeof(uint32_t) + MAX_DUID_LEN) /* Arbitrary limit */ #define MAX_MAC_ADDR_LEN CONST_MAX(INFINIBAND_ALEN, ETH_ALEN) diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index d4c680d485..c214264ec1 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -26,20 +26,20 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-lease-internal.h" #include "dhcp-protocol.h" #include "dns-domain.h" -#include "fd-util.h" -#include "fileio.h" -#include "hexdecoct.h" -#include "hostname-util.h" -#include "in-addr-util.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 "parse-util.h" -#include "stdio-util.h" -#include "string-util.h" -#include "unaligned.h" +#include "basic/parse-util.h" +#include "basic/stdio-util.h" +#include "basic/string-util.h" +#include "basic/unaligned.h" int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) { assert_return(lease, -EINVAL); diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index 5e8b4e4823..f64d19082a 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -22,13 +22,13 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-internal.h" #include "dhcp-server-internal.h" -#include "fd-util.h" -#include "in-addr-util.h" -#include "siphash24.h" -#include "string-util.h" +#include "basic/fd-util.h" +#include "basic/in-addr-util.h" +#include "basic/siphash24.h" +#include "basic/string-util.h" #define DHCP_DEFAULT_LEASE_TIME_USEC USEC_PER_HOUR #define DHCP_MAX_LEASE_TIME_USEC (USEC_PER_HOUR*12) diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index 2760b039ba..33965671ea 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -24,18 +24,18 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-identifier.h" #include "dhcp6-internal.h" #include "dhcp6-lease-internal.h" #include "dhcp6-protocol.h" -#include "fd-util.h" -#include "in-addr-util.h" +#include "basic/fd-util.h" +#include "basic/in-addr-util.h" #include "network-internal.h" -#include "random-util.h" -#include "socket-util.h" -#include "string-table.h" -#include "util.h" +#include "basic/random-util.h" +#include "basic/socket-util.h" +#include "basic/string-table.h" +#include "basic/util.h" #define MAX_MAC_ADDR_LEN INFINIBAND_ALEN diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c index 5c10a6326a..5d34c506ba 100644 --- a/src/libsystemd-network/sd-dhcp6-lease.c +++ b/src/libsystemd-network/sd-dhcp6-lease.c @@ -20,11 +20,11 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp6-lease-internal.h" #include "dhcp6-protocol.h" -#include "strv.h" -#include "util.h" +#include "basic/strv.h" +#include "basic/util.h" int dhcp6_lease_clear_timers(DHCP6IA *ia) { assert_return(ia, -EINVAL); diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c index f1ed7ca747..6032d0470c 100644 --- a/src/libsystemd-network/sd-ipv4acd.c +++ b/src/libsystemd-network/sd-ipv4acd.c @@ -26,15 +26,15 @@ #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "arp-util.h" -#include "fd-util.h" -#include "in-addr-util.h" -#include "list.h" -#include "random-util.h" -#include "refcnt.h" -#include "siphash24.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/in-addr-util.h" +#include "basic/list.h" +#include "basic/random-util.h" +#include "basic/refcnt.h" +#include "basic/siphash24.h" +#include "basic/util.h" /* Constants from the RFC */ #define PROBE_WAIT 1 diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index fc27408989..2547821cef 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -27,14 +27,14 @@ #include #include -#include "alloc-util.h" -#include "in-addr-util.h" -#include "list.h" -#include "random-util.h" -#include "refcnt.h" -#include "siphash24.h" -#include "sparse-endian.h" -#include "util.h" +#include "basic/alloc-util.h" +#include "basic/in-addr-util.h" +#include "basic/list.h" +#include "basic/random-util.h" +#include "basic/refcnt.h" +#include "basic/siphash24.h" +#include "basic/sparse-endian.h" +#include "basic/util.h" #define IPV4LL_NETWORK 0xA9FE0000L #define IPV4LL_NETMASK 0xFFFF0000L diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c index 5a7380cd3f..50a6e66169 100644 --- a/src/libsystemd-network/sd-lldp.c +++ b/src/libsystemd-network/sd-lldp.c @@ -22,13 +22,13 @@ #include -#include "alloc-util.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" #include "lldp-internal.h" #include "lldp-neighbor.h" #include "lldp-network.h" -#include "socket-util.h" -#include "ether-addr-util.h" +#include "basic/socket-util.h" +#include "basic/ether-addr-util.h" #define LLDP_DEFAULT_NEIGHBORS_MAX 128U diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c index 1c0d300cb3..328c1ac15a 100644 --- a/src/libsystemd-network/sd-ndisc.c +++ b/src/libsystemd-network/sd-ndisc.c @@ -26,13 +26,13 @@ #include -#include "alloc-util.h" -#include "async.h" +#include "basic/alloc-util.h" +#include "basic/async.h" #include "icmp6-util.h" -#include "in-addr-util.h" -#include "list.h" -#include "socket-util.h" -#include "string-util.h" +#include "basic/in-addr-util.h" +#include "basic/list.h" +#include "basic/socket-util.h" +#include "basic/string-util.h" #define NDISC_ROUTER_SOLICITATION_INTERVAL 4 * USEC_PER_SEC #define NDISC_MAX_ROUTER_SOLICITATIONS 3 diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c index 53ddfc3b62..edbf27beb3 100644 --- a/src/libsystemd-network/test-acd.c +++ b/src/libsystemd-network/test-acd.c @@ -28,9 +28,9 @@ #include #include -#include "in-addr-util.h" +#include "basic/in-addr-util.h" #include "netlink-util.h" -#include "util.h" +#include "basic/util.h" static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) { assert_se(acd); diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index 478b370c4c..8436d6d93d 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -25,12 +25,12 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-identifier.h" #include "dhcp-internal.h" #include "dhcp-protocol.h" -#include "fd-util.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/util.h" static uint8_t mac_addr[] = {'A', 'B', 'C', '1', '2', '3'}; diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c index d84859c053..5bd86e3956 100644 --- a/src/libsystemd-network/test-dhcp-option.c +++ b/src/libsystemd-network/test-dhcp-option.c @@ -3,11 +3,11 @@ #include #include -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "dhcp-internal.h" #include "dhcp-protocol.h" -#include "macro.h" -#include "util.h" +#include "basic/macro.h" +#include "basic/util.h" struct option_desc { uint8_t sname[64]; diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index 0548e8381e..77b861d976 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -30,10 +30,10 @@ #include "dhcp6-internal.h" #include "dhcp6-lease-internal.h" #include "dhcp6-protocol.h" -#include "fd-util.h" -#include "macro.h" -#include "socket-util.h" -#include "virt.h" +#include "basic/fd-util.h" +#include "basic/macro.h" +#include "basic/socket-util.h" +#include "basic/virt.h" static struct ether_addr mac_addr = { .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'} diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c index caa315b210..f7188595df 100644 --- a/src/libsystemd-network/test-ipv4ll-manual.c +++ b/src/libsystemd-network/test-ipv4ll-manual.c @@ -27,12 +27,12 @@ #include #include -#include "alloc-util.h" -#include "in-addr-util.h" +#include "basic/alloc-util.h" +#include "basic/in-addr-util.h" #include "netlink-util.h" -#include "parse-util.h" -#include "string-util.h" -#include "util.h" +#include "basic/parse-util.h" +#include "basic/string-util.h" +#include "basic/util.h" static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) { _cleanup_free_ char *address = NULL; diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c index b7278834f2..28c1d96ccf 100644 --- a/src/libsystemd-network/test-ipv4ll.c +++ b/src/libsystemd-network/test-ipv4ll.c @@ -28,9 +28,9 @@ #include #include "arp-util.h" -#include "fd-util.h" -#include "socket-util.h" -#include "util.h" +#include "basic/fd-util.h" +#include "basic/socket-util.h" +#include "basic/util.h" static bool verbose = false; static bool extended = false; diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c index 8c6d214d6f..78e7bc6929 100644 --- a/src/libsystemd-network/test-lldp.c +++ b/src/libsystemd-network/test-lldp.c @@ -27,11 +27,11 @@ #include #include -#include "alloc-util.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" #include "lldp-network.h" -#include "macro.h" -#include "string-util.h" +#include "basic/macro.h" +#include "basic/string-util.h" #define TEST_LLDP_PORT "em1" #define TEST_LLDP_TYPE_SYSTEM_NAME "systemd-lldp" diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c index 863a76637c..105a9cf987 100644 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@ -22,7 +22,7 @@ #include #include "icmp6-util.h" -#include "socket-util.h" +#include "basic/socket-util.h" static struct ether_addr mac_addr = { .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'} -- cgit v1.2.3-54-g00ecf