From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 5 Sep 2023 20:55:29 +0000 (+0900)
Subject: network: reorder bus implementations
X-Git-Tag: v255-rc1~573^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53dff954d388f3134d2ee6115f1ba136d363d20a;p=thirdparty%2Fsystemd.git

network: reorder bus implementations

Otherwise, in the man page, DHCPServer interface is listed in the Link
object.
---

diff --git a/man/org.freedesktop.network1.xml b/man/org.freedesktop.network1.xml
index a4b5385df98..6c462adbcbc 100644
--- a/man/org.freedesktop.network1.xml
+++ b/man/org.freedesktop.network1.xml
@@ -256,7 +256,6 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Peer { ... };
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
-  interface org.freedesktop.network1.DHCPServer { ... };
 };
     </programlisting>
 
@@ -310,12 +309,8 @@ node /org/freedesktop/network1/link/_1 {
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
-    <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.DHCPServer"/>
-
     <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.Link"/>
 
-    <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.DHCPServer"/>
-
     <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.Link"/>
 
     <variablelist class="dbus-method" generated="True" extra-ref="SetNTP()"/>
@@ -454,6 +449,7 @@ node /org/freedesktop/network1/link/_1 {
   interface org.freedesktop.DBus.Peer { ... };
   interface org.freedesktop.DBus.Introspectable { ... };
   interface org.freedesktop.DBus.Properties { ... };
+  interface org.freedesktop.network1.Link { ... };
 };
     </programlisting>
 
@@ -461,8 +457,12 @@ node /org/freedesktop/network1/link/_1 {
 
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
+    <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.Link"/>
+
     <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.DHCPServer"/>
 
+    <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.Link"/>
+
     <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.DHCPServer"/>
 
     <variablelist class="dbus-property" generated="True" extra-ref="Leases"/>
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 7813a3173a5..aecbc1d67c6 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -415,6 +415,11 @@ const BusObjectImplementation manager_object = {
         "/org/freedesktop/network1",
         "org.freedesktop.network1.Manager",
         .vtables = BUS_VTABLES(manager_vtable),
-        .children = BUS_IMPLEMENTATIONS(&dhcp_server_object, &dhcp_client_object,
-                                        &dhcp6_client_object, &link_object, &network_object),
+        .children = BUS_IMPLEMENTATIONS(
+                        &link_object, /* This is the main implementation for /org/freedesktop/network1/link,
+                                       * and must be earlier than the dhcp objects below. */
+                        &dhcp_server_object,
+                        &dhcp_client_object,
+                        &dhcp6_client_object,
+                        &network_object),
 };