From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 2 Jul 2019 14:26:03 +0000 (+0900)
Subject: network: move manager dbus prototypes to networkd-manager-bus.h
X-Git-Tag: v243-rc1~100^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79a59fa51de1ce0acf705958182add1794e1f8af;p=thirdparty%2Fsystemd.git

network: move manager dbus prototypes to networkd-manager-bus.h
---

diff --git a/src/network/meson.build b/src/network/meson.build
index 6725e9d1b08..387cf0a0b76 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -80,6 +80,7 @@ sources = files('''
         networkd-lldp-tx.c
         networkd-lldp-tx.h
         networkd-manager-bus.c
+        networkd-manager-bus.h
         networkd-manager.c
         networkd-manager.h
         networkd-ndisc.c
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index a40220d108d..4374d3db609 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "networkd-link-bus.h"
+#include "networkd-manager-bus.h"
 #include "networkd-manager.h"
 #include "strv.h"
 
diff --git a/src/network/networkd-manager-bus.h b/src/network/networkd-manager-bus.h
new file mode 100644
index 00000000000..e19d7069270
--- /dev/null
+++ b/src/network/networkd-manager-bus.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include "sd-bus.h"
+
+typedef struct Manager Manager;
+
+extern const sd_bus_vtable manager_vtable[];
+
+int manager_send_changed_strv(Manager *m, char **properties);
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index ec3bb47ea69..8d72d290a0f 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -23,6 +23,7 @@
 #include "network-internal.h"
 #include "networkd-dhcp6.h"
 #include "networkd-link-bus.h"
+#include "networkd-manager-bus.h"
 #include "networkd-manager.h"
 #include "networkd-network-bus.h"
 #include "networkd-speed-meter.h"
diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
index 9b3b05bccc3..e5bf7ac9f7a 100644
--- a/src/network/networkd-manager.h
+++ b/src/network/networkd-manager.h
@@ -65,8 +65,6 @@ struct Manager {
         usec_t speed_meter_usec_old;
 };
 
-extern const sd_bus_vtable manager_vtable[];
-
 int manager_new(Manager **ret);
 void manager_free(Manager *m);
 
@@ -85,7 +83,6 @@ int manager_rtnl_process_address(sd_netlink *nl, sd_netlink_message *message, vo
 int manager_rtnl_process_route(sd_netlink *nl, sd_netlink_message *message, void *userdata);
 int manager_rtnl_process_rule(sd_netlink *nl, sd_netlink_message *message, void *userdata);
 
-int manager_send_changed_strv(Manager *m, char **properties);
 void manager_dirty(Manager *m);
 
 int manager_address_pool_acquire(Manager *m, int family, unsigned prefixlen, union in_addr_union *found);