From ceac2c2b62dc2b5ac67856ab423a47f152d49925 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 30 Jun 2019 05:10:35 +0900 Subject: [PATCH] network: move prototypes related to network Network bus objects to networkd-network-bus.h --- src/network/meson.build | 1 + src/network/networkd-manager.c | 1 + src/network/networkd-network-bus.c | 1 + src/network/networkd-network-bus.h | 11 +++++++++++ src/network/networkd-network.h | 5 ----- 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 src/network/networkd-network-bus.h diff --git a/src/network/meson.build b/src/network/meson.build index 1e14d04007..0e302be6c0 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -87,6 +87,7 @@ sources = files(''' networkd-radv.c networkd-radv.h networkd-network-bus.c + networkd-network-bus.h networkd-network.c networkd-network.h networkd-route.c diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index e838f4b18a..33b7ec1d6c 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -24,6 +24,7 @@ #include "networkd-dhcp6.h" #include "networkd-link-bus.h" #include "networkd-manager.h" +#include "networkd-network-bus.h" #include "networkd-speed-meter.h" #include "ordered-set.h" #include "path-util.h" diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c index e3ba148ce1..a895f72688 100644 --- a/src/network/networkd-network-bus.c +++ b/src/network/networkd-network-bus.c @@ -3,6 +3,7 @@ #include "alloc-util.h" #include "ether-addr-util.h" #include "networkd-manager.h" +#include "networkd-network-bus.h" #include "string-util.h" #include "strv.h" diff --git a/src/network/networkd-network-bus.h b/src/network/networkd-network-bus.h new file mode 100644 index 0000000000..650e145d42 --- /dev/null +++ b/src/network/networkd-network-bus.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +#pragma once + +#include "sd-bus.h" + +typedef struct Link Link; + +extern const sd_bus_vtable network_vtable[]; + +int network_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); +int network_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error); diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 1f4eb6c560..b5f4a6e098 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -279,11 +279,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_keep_configuration); const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length); -extern const sd_bus_vtable network_vtable[]; - -int network_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); -int network_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error); - const char* ipv6_privacy_extensions_to_string(IPv6PrivacyExtensions i) _const_; IPv6PrivacyExtensions ipv6_privacy_extensions_from_string(const char *s) _pure_;