Imported Upstream version 1.0.0 upstream/1.0.0

1 files changed, 31 insertions, 9 deletions

diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index 6a8750b7..98076534 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -2,20 +2,42 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.IP4Config">
+    <property name="Addresses" type="aau" access="read">
+      <tp:docstring>
+	Array of arrays of IPv4 address/prefix/gateway.  All 3
+	elements of each array are in network byte order.  Essentially:
+	[(addr, prefix, gateway), (addr, prefix, gateway), ...]
+
+	Deprecated: use AddressData and Gateway
+      </tp:docstring>
+    </property>
+    <property name="AddressData" type="aa{sv}" access="read">
+      <tp:docstring>
+	Array of IP address data objects. All addresses will include
+	"address" (an IP address string), and "prefix" (a uint). Some
+	addresses may include additional attributes.
+      </tp:docstring>
+    </property>
     <property name="Gateway" type="s" access="read">
       <tp:docstring>The gateway in use.</tp:docstring>
     </property>
-    <property name="Addresses" type="aau" access="read">
-      <tp:docstring>Array of tuples of IPv4 address/prefix/gateway.  All 3
-      elements of each tuple are in network byte order.  Essentially:
-      [(addr, prefix, gateway), (addr, prefix, gateway), ...]
+    <property name="Routes" type="aau" access="read">
+      <tp:docstring>
+	Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of
+	each tuple are in network byte order. 'route' and 'next hop'
+	are IPv4 addresses, while prefix and metric are simple
+	unsigned integers. Essentially: [(route, prefix, next-hop,
+	metric), (route, prefix, next-hop, metric), ...]
+
+	Deprecated: use RouteData
       </tp:docstring>
     </property>
-    <property name="Routes" type="aau" access="read">
-      <tp:docstring>Tuples of IPv4 route/prefix/next-hop/metric.  All 4 elements
-      of each tuple are in network byte order.  'route' and 'next hop' are IPv4
-      addresses, while prefix and metric are simple unsigned integers.  Essentially:
-      [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...]
+    <property name="RouteData" type="aa{sv}" access="read">
+      <tp:docstring>
+	Array of IP route data objects. All routes will include "dest"
+	(an IP address string) and "prefix" (a uint). Some routes may
+	include "next-hop" (an IP address string), "metric" (a uint),
+	and additional attributes.
       </tp:docstring>
     </property>
     <property name="Nameservers" type="au" access="read">