]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: move prototypes related to network Network bus objects to networkd-network... 12912/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 29 Jun 2019 20:10:35 +0000 (05:10 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 29 Jun 2019 20:12:51 +0000 (05:12 +0900)
src/network/meson.build
src/network/networkd-manager.c
src/network/networkd-network-bus.c
src/network/networkd-network-bus.h [new file with mode: 0644]
src/network/networkd-network.h

index 1e14d040077682e11868fac81e17acf11ce799a7..0e302be6c07fa8267f3a9610c22fc9603dcdeb1f 100644 (file)
@@ -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
index e838f4b18acd7d8fdee04db2183f41f36d10a9e1..33b7ec1d6c33f7266f274e10d3d48058c4206fb9 100644 (file)
@@ -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"
index e3ba148ce1bf744d171fb5f68145436494bb89bc..a895f7268882f9de14d3e19d9e8c70e82aa932d5 100644 (file)
@@ -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 (file)
index 0000000..650e145
--- /dev/null
@@ -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);
index 1f4eb6c5606fa80e2c6a74b6812c0d8fa4c3a03b..b5f4a6e09832f3e68413e2fd30d86c048f27ff63 100644 (file)
@@ -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_;