diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-07-17 17:04:13 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-07-17 17:04:13 +0000 |
| commit | edda4463bc03cd4bfb611256feae6eab1d8e6c32 (patch) | |
| tree | 21329d83cbc4b63c94684f2e871f7304313db408 /introspection | |
| parent | f4f0752ca3742aa9e28de05f5d38f42f764762cb (diff) | |
2008-07-17 Dan Williams <dcbw@redhat.com>
* introspection/Makefile.am
introspection/nm-device.xml
introspection/nm-dhcp4-config.xml
- Add bits for the DHCP4Config property of the device, and the DHCP4Config
itself
* src/nm-device-interface.c
src/nm-device-interface.h
- Add the DHCP4Config property
* src/nm-device.c
- Keep track of DHCP4 options via a new DHCP4Config property and notify
D-Bus clients when it changes
* src/nm-dhcp4-config.c
src/nm-dhcp4-config.h
- Simple object to store DHCP4 options, export them over D-Bus, and
notify when they change
* src/dhcp-manager/nm-dhcp-manager.c
src/dhcp-manager/nm-dhcp-manager.h
- (nm_dhcp_manager_set_dhcp4_config, copy_dhcp4_config_option): copy and
filter server-returned DHCP options into an NMDHCP4Config object
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3829 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/Makefile.am | 3 | ||||
| -rw-r--r-- | introspection/nm-device.xml | 5 | ||||
| -rw-r--r-- | introspection/nm-dhcp4-config.xml | 20 |
3 files changed, 27 insertions, 1 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am index da4927ea6e..2ac5804f13 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -15,5 +15,6 @@ EXTRA_DIST = \ nm-vpn-plugin.xml \ nm-vpn-connection.xml \ nm-ppp-manager.xml \ - nm-active-connection.xml + nm-active-connection.xml \ + nm-dhcp4-config.xml diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 392a77f950..eb545a3c68 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -37,6 +37,11 @@ Object path of the Ip4Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. </tp:docstring> </property> + <property name="Dhcp4Config" type="o" access="read"> + <tp:docstring> + Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + </tp:docstring> + </property> <property name="Managed" type="b" access="read"> <tp:docstring> Whether or not this device is managed by NetworkManager. diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml new file mode 100644 index 0000000000..c0821ada97 --- /dev/null +++ b/introspection/nm-dhcp4-config.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.DHCP4Config"> + <tp:docstring> + Options and configuration returned by the IPv4 DHCP server. + </tp:docstring> + <property name="Options" type="a{sv}" access="read"> + <tp:docstring>Configuration options returned by a DHCP server, if any.</tp:docstring> + </property> + + <signal name="PropertiesChanged"> + <arg name="properties" type="a{sv}" tp:type="String_Variant_Map"> + <tp:docstring> + A dictionary mapping property names to variant boxed values + </tp:docstring> + </arg> + </signal> + </interface> +</node> |