X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-network%2Fnetwork-internal.h;h=981c4e0e213a1685bfe77886f923a2c185b0b73a;hp=53c364a4c9533d8ef6dec067e7c9584b4453265e;hb=7eb08da4b388b920c8a894b1500c9cc7dc1f31ef;hpb=a2ba62c719224a4b47751623ca5e8b0333f49721 diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index 53c364a4c..981c4e0e2 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -1,5 +1,7 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +#pragma once + /*** This file is part of systemd. @@ -19,14 +21,12 @@ along with systemd; If not, see . ***/ -#pragma once - #include #include #include #include "udev.h" -#include "condition-util.h" +#include "condition.h" bool net_match_config(const struct ether_addr *match_mac, const char *match_path, @@ -42,9 +42,8 @@ bool net_match_config(const struct ether_addr *match_mac, const char *dev_parent_driver, const char *dev_driver, const char *dev_type, - const char *dev_name); - -unsigned net_netmask_to_prefixlen(const struct in_addr *netmask); + const char *dev_name, + bool ignore_name_match); int config_parse_net_condition(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, @@ -62,12 +61,10 @@ int config_parse_ifalias(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -int net_parse_inaddr(const char *address, unsigned char *family, void *dst); - int net_get_unique_predictable_data(struct udev_device *device, uint8_t result[8]); const char *net_get_name(struct udev_device *device); -void serialize_in_addrs(FILE *f, const char *key, const struct in_addr *addresses, size_t size); +void serialize_in_addrs(FILE *f, const struct in_addr *addresses, size_t size); int deserialize_in_addrs(struct in_addr **addresses, const char *string); int deserialize_in6_addrs(struct in6_addr **addresses, const char *string);