diff options
Diffstat (limited to 'src/libsystemd-network/src')
21 files changed, 112 insertions, 113 deletions
diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile index 204627a130..3e89f7ca4f 100644 --- a/src/libsystemd-network/src/Makefile +++ b/src/libsystemd-network/src/Makefile @@ -23,7 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -noinst_LTLIBRARIES += \ +rootlibexec_LTLIBRARIES += \ libsystemd-network.la libsystemd_network_la_CFLAGS = \ @@ -78,10 +78,9 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/sd-lldp.c libsystemd_network_la_LIBADD = \ + libsystemd-basic.la \ + libsystemd.la \ + libsystemd-shared.la \ $(KMOD_LIBS) -sd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) -sd.CPPFLAGS += $(libshared.CPPFLAGS) -sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd-network/src/arp-util.c b/src/libsystemd-network/src/arp-util.c index bf66a75b16..2edb97be32 100644 --- a/src/libsystemd-network/src/arp-util.c +++ b/src/libsystemd-network/src/arp-util.c @@ -22,8 +22,8 @@ #include <linux/filter.h> -#include "basic/fd-util.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/util.h" #include "systemd-network/arp-util.h" int arp_network_bind_raw_socket(int ifindex, be32_t address, const struct ether_addr *eth_mac) { diff --git a/src/libsystemd-network/src/dhcp-identifier.c b/src/libsystemd-network/src/dhcp-identifier.c index 3edba38bd8..afe0b9a404 100644 --- a/src/libsystemd-network/src/dhcp-identifier.c +++ b/src/libsystemd-network/src/dhcp-identifier.c @@ -20,13 +20,13 @@ #include <libudev.h> #include <systemd/sd-id128.h> -#include "basic/siphash24.h" -#include "basic/sparse-endian.h" -#include "basic/virt.h" -#include "shared/udev-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/sparse-endian.h" +#include "systemd-basic/virt.h" #include "systemd-network/dhcp-identifier.h" #include "systemd-network/dhcp6-protocol.h" #include "systemd-network/network-internal.h" +#include "systemd-shared/udev-util.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/src/dhcp-network.c b/src/libsystemd-network/src/dhcp-network.c index 4984d49ab7..2cdadee730 100644 --- a/src/libsystemd-network/src/dhcp-network.c +++ b/src/libsystemd-network/src/dhcp-network.c @@ -28,8 +28,8 @@ #include <linux/if_infiniband.h> #include <linux/if_packet.h> -#include "basic/fd-util.h" -#include "basic/socket-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/socket-util.h" #include "systemd-network/dhcp-internal.h" static int _bind_raw_socket(int ifindex, union sockaddr_union *link, diff --git a/src/libsystemd-network/src/dhcp-option.c b/src/libsystemd-network/src/dhcp-option.c index f47b2ae9e7..a848ed2841 100644 --- a/src/libsystemd-network/src/dhcp-option.c +++ b/src/libsystemd-network/src/dhcp-option.c @@ -22,8 +22,8 @@ #include <stdio.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/utf8.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/utf8.h" #include "systemd-network/dhcp-internal.h" static int option_append(uint8_t options[], size_t size, size_t *offset, diff --git a/src/libsystemd-network/src/dhcp6-network.c b/src/libsystemd-network/src/dhcp6-network.c index 0f7c281ad3..469e3ddfdf 100644 --- a/src/libsystemd-network/src/dhcp6-network.c +++ b/src/libsystemd-network/src/dhcp6-network.c @@ -28,8 +28,8 @@ #include <linux/if_packet.h> -#include "basic/fd-util.h" -#include "basic/socket-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/socket-util.h" #include "systemd-network/dhcp6-internal.h" #include "systemd-network/dhcp6-protocol.h" diff --git a/src/libsystemd-network/src/dhcp6-option.c b/src/libsystemd-network/src/dhcp6-option.c index 060a822834..ecbf201661 100644 --- a/src/libsystemd-network/src/dhcp6-option.c +++ b/src/libsystemd-network/src/dhcp6-option.c @@ -21,15 +21,15 @@ #include <netinet/in.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/sparse-endian.h" -#include "basic/strv.h" -#include "basic/unaligned.h" -#include "basic/util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/sparse-endian.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/unaligned.h" +#include "systemd-basic/util.h" #include "systemd-network/dhcp6-internal.h" #include "systemd-network/dhcp6-protocol.h" #include "systemd-network/sd-dhcp6-client.h" +#include "systemd-shared/dns-domain.h" #define DHCP6_OPTION_IA_NA_LEN 12 #define DHCP6_OPTION_IA_TA_LEN 4 diff --git a/src/libsystemd-network/src/icmp6-util.c b/src/libsystemd-network/src/icmp6-util.c index 39f9f5785f..4280d32e3d 100644 --- a/src/libsystemd-network/src/icmp6-util.c +++ b/src/libsystemd-network/src/icmp6-util.c @@ -30,8 +30,8 @@ #include <linux/if_packet.h> -#include "basic/fd-util.h" -#include "basic/socket-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/socket-util.h" #include "systemd-network/icmp6-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 afe2e8d1eb..6509b1479d 100644 --- a/src/libsystemd-network/src/lldp-neighbor.c +++ b/src/libsystemd-network/src/lldp-neighbor.c @@ -17,12 +17,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#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 "basic/unaligned.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/escape.h" +#include "systemd-basic/ether-addr-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/unaligned.h" #include "systemd-network/lldp-internal.h" #include "systemd-network/lldp-neighbor.h" diff --git a/src/libsystemd-network/src/lldp-network.c b/src/libsystemd-network/src/lldp-network.c index 9d1d592a36..6c9ed81e69 100644 --- a/src/libsystemd-network/src/lldp-network.c +++ b/src/libsystemd-network/src/lldp-network.c @@ -22,8 +22,8 @@ #include <linux/filter.h> -#include "basic/fd-util.h" -#include "basic/socket-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/socket-util.h" #include "systemd-network/lldp-network.h" int lldp_network_bind_raw_socket(int ifindex) { diff --git a/src/libsystemd-network/src/ndisc-router.c b/src/libsystemd-network/src/ndisc-router.c index 2fa77d391e..4e7e7d6bfa 100644 --- a/src/libsystemd-network/src/ndisc-router.c +++ b/src/libsystemd-network/src/ndisc-router.c @@ -19,14 +19,14 @@ #include <netinet/icmp6.h> -#include "basic/alloc-util.h" -#include "basic/hostname-util.h" -#include "basic/missing.h" -#include "basic/strv.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/missing.h" +#include "systemd-basic/strv.h" #include "systemd-network/ndisc-internal.h" #include "systemd-network/ndisc-router.h" #include "systemd-network/sd-ndisc.h" +#include "systemd-shared/dns-domain.h" _public_ sd_ndisc_router* sd_ndisc_router_ref(sd_ndisc_router *rt) { if (!rt) diff --git a/src/libsystemd-network/src/network-internal.c b/src/libsystemd-network/src/network-internal.c index df0d335ca0..13b3bad81b 100644 --- a/src/libsystemd-network/src/network-internal.c +++ b/src/libsystemd-network/src/network-internal.c @@ -22,22 +22,22 @@ #include <linux/if.h> -#include "basic/alloc-util.h" -#include "basic/ether-addr-util.h" -#include "basic/hexdecoct.h" -#include "basic/log.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" -#include "shared/condition.h" -#include "shared/conf-parser.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/ether-addr-util.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/log.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/utf8.h" +#include "systemd-basic/util.h" #include "systemd-network/dhcp-lease-internal.h" #include "systemd-network/network-internal.h" #include "systemd-network/sd-ndisc.h" +#include "systemd-shared/condition.h" +#include "systemd-shared/conf-parser.h" const char *net_get_name(struct udev_device *device) { const char *name, *field; diff --git a/src/libsystemd-network/src/sd-dhcp-client.c b/src/libsystemd-network/src/sd-dhcp-client.c index 75895f2e58..8d8fb09186 100644 --- a/src/libsystemd-network/src/sd-dhcp-client.c +++ b/src/libsystemd-network/src/sd-dhcp-client.c @@ -27,18 +27,18 @@ #include <linux/if_infiniband.h> -#include "basic/alloc-util.h" -#include "basic/async.h" -#include "basic/hostname-util.h" -#include "basic/random-util.h" -#include "basic/string-util.h" -#include "basic/util.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/async.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.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 "systemd-network/sd-dhcp-client.h" +#include "systemd-shared/dns-domain.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/src/sd-dhcp-lease.c b/src/libsystemd-network/src/sd-dhcp-lease.c index 0edc075b58..557648debe 100644 --- a/src/libsystemd-network/src/sd-dhcp-lease.c +++ b/src/libsystemd-network/src/sd-dhcp-lease.c @@ -24,21 +24,21 @@ #include <stdlib.h> #include <string.h> -#include "basic/alloc-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 "basic/parse-util.h" -#include "basic/stdio-util.h" -#include "basic/string-util.h" -#include "basic/unaligned.h" -#include "shared/dns-domain.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/fileio.h" +#include "systemd-basic/hexdecoct.h" +#include "systemd-basic/hostname-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/parse-util.h" +#include "systemd-basic/stdio-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unaligned.h" #include "systemd-network/dhcp-lease-internal.h" #include "systemd-network/dhcp-protocol.h" #include "systemd-network/network-internal.h" #include "systemd-network/sd-dhcp-lease.h" +#include "systemd-shared/dns-domain.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/src/sd-dhcp-server.c b/src/libsystemd-network/src/sd-dhcp-server.c index 4a6c14e80c..b1d7ea3046 100644 --- a/src/libsystemd-network/src/sd-dhcp-server.c +++ b/src/libsystemd-network/src/sd-dhcp-server.c @@ -20,12 +20,12 @@ #include <sys/ioctl.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/in-addr-util.h" -#include "basic/siphash24.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/in-addr-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/unaligned.h" #include "systemd-network/dhcp-internal.h" #include "systemd-network/dhcp-server-internal.h" #include "systemd-network/sd-dhcp-server.h" diff --git a/src/libsystemd-network/src/sd-dhcp6-client.c b/src/libsystemd-network/src/sd-dhcp6-client.c index af5d91c946..6d2fd37006 100644 --- a/src/libsystemd-network/src/sd-dhcp6-client.c +++ b/src/libsystemd-network/src/sd-dhcp6-client.c @@ -23,13 +23,13 @@ #include <linux/if_infiniband.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/in-addr-util.h" -#include "basic/random-util.h" -#include "basic/socket-util.h" -#include "basic/string-table.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-table.h" +#include "systemd-basic/util.h" #include "systemd-network/dhcp-identifier.h" #include "systemd-network/dhcp6-internal.h" #include "systemd-network/dhcp6-lease-internal.h" diff --git a/src/libsystemd-network/src/sd-dhcp6-lease.c b/src/libsystemd-network/src/sd-dhcp6-lease.c index cb53533492..9e028d1ce7 100644 --- a/src/libsystemd-network/src/sd-dhcp6-lease.c +++ b/src/libsystemd-network/src/sd-dhcp6-lease.c @@ -20,9 +20,9 @@ #include <errno.h> -#include "basic/alloc-util.h" -#include "basic/strv.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/strv.h" +#include "systemd-basic/util.h" #include "systemd-network/dhcp6-lease-internal.h" #include "systemd-network/dhcp6-protocol.h" diff --git a/src/libsystemd-network/src/sd-ipv4acd.c b/src/libsystemd-network/src/sd-ipv4acd.c index 418a686150..d277fd8b2d 100644 --- a/src/libsystemd-network/src/sd-ipv4acd.c +++ b/src/libsystemd-network/src/sd-ipv4acd.c @@ -24,15 +24,15 @@ #include <stdlib.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/ether-addr-util.h" -#include "basic/fd-util.h" -#include "basic/in-addr-util.h" -#include "basic/list.h" -#include "basic/random-util.h" -#include "basic/siphash24.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/ether-addr-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "systemd-network/arp-util.h" #include "systemd-network/sd-ipv4acd.h" diff --git a/src/libsystemd-network/src/sd-ipv4ll.c b/src/libsystemd-network/src/sd-ipv4ll.c index 85c5b20a81..a543d26f34 100644 --- a/src/libsystemd-network/src/sd-ipv4ll.c +++ b/src/libsystemd-network/src/sd-ipv4ll.c @@ -24,15 +24,15 @@ #include <stdlib.h> #include <string.h> -#include "basic/alloc-util.h" -#include "basic/ether-addr-util.h" -#include "basic/in-addr-util.h" -#include "basic/list.h" -#include "basic/random-util.h" -#include "basic/siphash24.h" -#include "basic/sparse-endian.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/ether-addr-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/list.h" +#include "systemd-basic/random-util.h" +#include "systemd-basic/siphash24.h" +#include "systemd-basic/sparse-endian.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "systemd-network/sd-ipv4acd.h" #include "systemd-network/sd-ipv4ll.h" diff --git a/src/libsystemd-network/src/sd-lldp.c b/src/libsystemd-network/src/sd-lldp.c index 7a3fcb9472..0d64bdcaa2 100644 --- a/src/libsystemd-network/src/sd-lldp.c +++ b/src/libsystemd-network/src/sd-lldp.c @@ -20,10 +20,10 @@ #include <arpa/inet.h> -#include "basic/alloc-util.h" -#include "basic/ether-addr-util.h" -#include "basic/fd-util.h" -#include "basic/socket-util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/ether-addr-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/socket-util.h" #include "systemd-network/lldp-internal.h" #include "systemd-network/lldp-neighbor.h" #include "systemd-network/lldp-network.h" diff --git a/src/libsystemd-network/src/sd-ndisc.c b/src/libsystemd-network/src/sd-ndisc.c index 91e4467371..67c135cbe3 100644 --- a/src/libsystemd-network/src/sd-ndisc.c +++ b/src/libsystemd-network/src/sd-ndisc.c @@ -20,12 +20,12 @@ #include <netinet/icmp6.h> #include <netinet/in.h> -#include "basic/alloc-util.h" -#include "basic/fd-util.h" -#include "basic/in-addr-util.h" -#include "basic/socket-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/alloc-util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/in-addr-util.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" #include "systemd-network/icmp6-util.h" #include "systemd-network/ndisc-internal.h" #include "systemd-network/ndisc-router.h" |