From 86ae2d69a3b07de23f0c4ddb1fa3e5ec8bc85c1b Mon Sep 17 00:00:00 2001 From: LetzteInstanz Date: Sun, 21 Mar 2021 10:37:38 +0300 Subject: [PATCH] network: move AddressFamily into network-util for the use by wait-online later --- src/libsystemd/sd-network/network-util.h | 10 ++++++++++ src/network/networkd-util.h | 11 +---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h index dd6a7dbe88c..ad8632d0120 100644 --- a/src/libsystemd/sd-network/network-util.h +++ b/src/libsystemd/sd-network/network-util.h @@ -11,6 +11,16 @@ bool network_is_online(void); +typedef enum AddressFamily { + /* This is a bitmask, though it usually doesn't feel that way! */ + ADDRESS_FAMILY_NO = 0, + ADDRESS_FAMILY_IPV4 = 1 << 0, + ADDRESS_FAMILY_IPV6 = 1 << 1, + ADDRESS_FAMILY_YES = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6, + _ADDRESS_FAMILY_MAX, + _ADDRESS_FAMILY_INVALID = -EINVAL, +} AddressFamily; + typedef enum LinkOperationalState { LINK_OPERSTATE_MISSING, LINK_OPERSTATE_OFF, diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h index 01675e8b5c5..4926fc5eb70 100644 --- a/src/network/networkd-util.h +++ b/src/network/networkd-util.h @@ -8,18 +8,9 @@ #include "hashmap.h" #include "log.h" #include "macro.h" +#include "network-util.h" #include "string-util.h" -typedef enum AddressFamily { - /* This is a bitmask, though it usually doesn't feel that way! */ - ADDRESS_FAMILY_NO = 0, - ADDRESS_FAMILY_IPV4 = 1 << 0, - ADDRESS_FAMILY_IPV6 = 1 << 1, - ADDRESS_FAMILY_YES = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6, - _ADDRESS_FAMILY_MAX, - _ADDRESS_FAMILY_INVALID = -EINVAL, -} AddressFamily; - typedef struct NetworkConfigSection { unsigned line; bool invalid; -- 2.47.3