system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-07 00:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: reorder bus implementations

Browse source 
Otherwise, in the man page, DHCPServer interface is listed in the Link
object.
This commit is contained in:
Yu Watanabe 2023-09-06 05:55:29 +09:00
parent 08237f062e
commit 53dff954d3
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
man/org.freedesktop.network1.xml
View file

@ -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"/>

9
src/network/networkd-manager-bus.c
View file

@ -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),
};