From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 May 2019 20:35:02 +0000 (+0900)
Subject: network: split out DBus related prototypes to networkd-link-bus.h
X-Git-Tag: v243-rc1~260^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a1af3d4caca8f902068a97440ed31a643c2a033;p=thirdparty%2Fsystemd.git

network: split out DBus related prototypes to networkd-link-bus.h
---

diff --git a/src/network/meson.build b/src/network/meson.build
index 959421fc5c4..4eda3abef12 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -63,6 +63,7 @@ sources = files('''
         networkd-ipv6-proxy-ndp.c
         networkd-ipv6-proxy-ndp.h
         networkd-link-bus.c
+        networkd-link-bus.h
         networkd-link.c
         networkd-link.h
         networkd-lldp-rx.c
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 2f414cb1165..0f2ffd4e864 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-util.h"
+#include "networkd-link-bus.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
 #include "parse-util.h"
@@ -65,7 +66,7 @@ const sd_bus_vtable link_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-static char *link_bus_path(Link *link) {
+char *link_bus_path(Link *link) {
         _cleanup_free_ char *ifindex = NULL;
         char *p;
         int r;
diff --git a/src/network/networkd-link-bus.h b/src/network/networkd-link-bus.h
new file mode 100644
index 00000000000..3cc3de46c60
--- /dev/null
+++ b/src/network/networkd-link-bus.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include "sd-bus.h"
+
+#include "macro.h"
+
+typedef struct Link Link;
+
+extern const sd_bus_vtable link_vtable[];
+
+char *link_bus_path(Link *link);
+int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
+int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
+int link_send_changed(Link *link, const char *property, ...) _sentinel_;
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 67c0903fa69..56e36b7d6b5 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -20,6 +20,8 @@
 #include "network-internal.h"
 #include "networkd-can.h"
 #include "networkd-ipv6-proxy-ndp.h"
+#include "networkd-link-bus.h"
+#include "networkd-link.h"
 #include "networkd-lldp-tx.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 80fc4baee60..05b88356cfd 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -183,12 +183,6 @@ int link_stop_clients(Link *link, bool may_keep_dhcp);
 const char* link_state_to_string(LinkState s) _const_;
 LinkState link_state_from_string(const char *s) _pure_;
 
-extern const sd_bus_vtable link_vtable[];
-
-int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
-int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
-int link_send_changed(Link *link, const char *property, ...) _sentinel_;
-
 uint32_t link_get_vrf_table(Link *link);
 uint32_t link_get_dhcp_route_table(Link *link);
 uint32_t link_get_ipv6_accept_ra_route_table(Link *link);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 92e3b0a0f12..d2e5b5de596 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -21,6 +21,7 @@
 #include "local-addresses.h"
 #include "netlink-util.h"
 #include "network-internal.h"
+#include "networkd-link-bus.h"
 #include "networkd-manager.h"
 #include "networkd-speed-meter.h"
 #include "ordered-set.h"
diff --git a/src/network/networkd-speed-meter.c b/src/network/networkd-speed-meter.c
index 5fd30f3df88..c4fc56b019f 100644
--- a/src/network/networkd-speed-meter.c
+++ b/src/network/networkd-speed-meter.c
@@ -5,6 +5,7 @@
 #include "sd-event.h"
 #include "sd-netlink.h"
 
+#include "networkd-link-bus.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
 #include "networkd-speed-meter.h"