From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Tue, 26 Mar 2019 23:25:23 +0100
Subject: New upstream version 1.16.0

---
 introspection/meson.build                          | 28 ++++---
 ...g.freedesktop.NetworkManager.Device.WifiP2P.xml | 79 ++++++++++++++++++
 ....freedesktop.NetworkManager.Device.Wireless.xml |  2 +-
 .../org.freedesktop.NetworkManager.Device.xml      | 24 +++++-
 .../org.freedesktop.NetworkManager.WifiP2PPeer.xml | 97 ++++++++++++++++++++++
 introspection/org.freedesktop.NetworkManager.xml   | 40 ++++++++-
 6 files changed, 252 insertions(+), 18 deletions(-)
 create mode 100644 introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
 create mode 100644 introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml

(limited to 'introspection')

diff --git a/introspection/meson.build b/introspection/meson.build
index 35d8c87c..e442ac85 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -3,26 +3,30 @@ ifaces_secret_agent_xml = files('org.freedesktop.NetworkManager.SecretAgent.xml'
 ifaces_vpn_plugin_xml = files('org.freedesktop.NetworkManager.VPN.Plugin.xml')
 
 ifaces = [
+  'org.freedesktop.NetworkManager',
   'org.freedesktop.NetworkManager.AccessPoint',
   'org.freedesktop.NetworkManager.AgentManager',
   'org.freedesktop.NetworkManager.Checkpoint',
   'org.freedesktop.NetworkManager.Connection.Active',
+  'org.freedesktop.NetworkManager.DHCP4Config',
+  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.Device',
   'org.freedesktop.NetworkManager.Device.Adsl',
   'org.freedesktop.NetworkManager.Device.Bluetooth',
   'org.freedesktop.NetworkManager.Device.Bond',
   'org.freedesktop.NetworkManager.Device.Bridge',
   'org.freedesktop.NetworkManager.Device.Dummy',
   'org.freedesktop.NetworkManager.Device.Generic',
-  'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.IPTunnel',
+  'org.freedesktop.NetworkManager.Device.Infiniband',
   'org.freedesktop.NetworkManager.Device.Lowpan',
   'org.freedesktop.NetworkManager.Device.Macsec',
   'org.freedesktop.NetworkManager.Device.Macvlan',
   'org.freedesktop.NetworkManager.Device.Modem',
   'org.freedesktop.NetworkManager.Device.OlpcMesh',
+  'org.freedesktop.NetworkManager.Device.OvsBridge',
   'org.freedesktop.NetworkManager.Device.OvsInterface',
   'org.freedesktop.NetworkManager.Device.OvsPort',
-  'org.freedesktop.NetworkManager.Device.OvsBridge',
   'org.freedesktop.NetworkManager.Device.Ppp',
   'org.freedesktop.NetworkManager.Device.Statistics',
   'org.freedesktop.NetworkManager.Device.Team',
@@ -31,24 +35,22 @@ ifaces = [
   'org.freedesktop.NetworkManager.Device.Vlan',
   'org.freedesktop.NetworkManager.Device.Vxlan',
   'org.freedesktop.NetworkManager.Device.WiMax',
-  'org.freedesktop.NetworkManager.Device.Wpan',
+  'org.freedesktop.NetworkManager.Device.WifiP2P',
   'org.freedesktop.NetworkManager.Device.WireGuard',
   'org.freedesktop.NetworkManager.Device.Wired',
   'org.freedesktop.NetworkManager.Device.Wireless',
-  'org.freedesktop.NetworkManager.Device',
-  'org.freedesktop.NetworkManager.DHCP4Config',
-  'org.freedesktop.NetworkManager.DHCP6Config',
+  'org.freedesktop.NetworkManager.Device.Wpan',
   'org.freedesktop.NetworkManager.DnsManager',
   'org.freedesktop.NetworkManager.IP4Config',
   'org.freedesktop.NetworkManager.IP6Config',
-  'org.freedesktop.NetworkManager',
   'org.freedesktop.NetworkManager.PPP',
   'org.freedesktop.NetworkManager.SecretAgent',
-  'org.freedesktop.NetworkManager.Settings.Connection',
   'org.freedesktop.NetworkManager.Settings',
+  'org.freedesktop.NetworkManager.Settings.Connection',
   'org.freedesktop.NetworkManager.VPN.Connection',
   'org.freedesktop.NetworkManager.VPN.Plugin',
-  'org.freedesktop.NetworkManager.WiMax.Nsp'
+  'org.freedesktop.NetworkManager.WiMax.Nsp',
+  'org.freedesktop.NetworkManager.WifiP2PPeer',
 ]
 
 ifaces_xmls = []
@@ -66,7 +68,7 @@ foreach iface: ifaces
     iface_xml,
     interface_prefix: 'org.freedesktop.NetworkManager',
     namespace: 'NMDBus',
-    docbook: 'dbus'
+    docbook: 'dbus',
   )
 
   sources += res
@@ -82,14 +84,14 @@ endforeach
 
 install_data(
   ifaces_xmls,
-  install_dir: dbus_ifaces_dir
+  install_dir: dbus_ifaces_dir,
 )
 
 libnmdbus = static_library(
   'nmdbus',
   sources: sources,
   include_directories: top_inc,
-  dependencies: glib_dep
+  dependencies: glib_dep,
 )
 
 libnmdbus_dep = declare_dependency(
@@ -97,5 +99,5 @@ libnmdbus_dep = declare_dependency(
   #        libNetworkManagerBase and libNetworkManager
   #sources: sources,
   include_directories: include_directories('.'),
-  link_with: libnmdbus
+  link_with: libnmdbus,
 )
diff --git a/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
new file mode 100644
index 00000000..40e6fdbb
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.WifiP2P:
+      @short_description: Wi-Fi P2P Device
+
+      Since: 1.16
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.WifiP2P">
+    <annotation name="org.gtk.GDBus.C.Name" value="Device_Wifi_P2P"/>
+
+    <!--
+        HwAddress:
+
+        The active hardware address of the device.
+
+        Since: 1.16
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Peers:
+
+        List of object paths of peers visible to this Wi-Fi P2P device.
+
+        Since: 1.16
+    -->
+    <property name="Peers" type="ao" access="read"/>
+
+    <!--
+        StartFind:
+        @options: Options of find. Currently 'timeout' option with value of "i"
+                  in the range of 1-600 seconds is supported. The default is
+                  30 seconds.
+
+        Start a find operation for Wi-Fi P2P peers.
+
+        Since: 1.16
+    -->
+    <method name="StartFind">
+      <arg name="options" type="a{sv}" direction="in"/>
+    </method>
+
+    <!--
+        StopFind:
+
+        Stop an ongoing find operation again.
+
+        Since: 1.16
+    -->
+    <method name="StopFind">
+    </method>
+
+    <!--
+        PeerAdded:
+        @peer: The object path of the newly found access point.
+
+        Emitted when a new Wi-Fi P2P peer is found by the device.
+
+        Since: 1.16
+    -->
+    <signal name="PeerAdded">
+      <arg name="peer" type="o"/>
+    </signal>
+
+    <!--
+        PeerRemoved:
+        @peer: The object path of the Wi-Fi P2P peer that has disappeared.
+
+        Emitted when a Wi-Fi P2P peer disappears from view of the device.
+
+        Since: 1.16
+    -->
+    <signal name="PeerRemoved">
+      <arg name="peer" type="o"/>
+    </signal>
+
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index 13038545..af544088 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -36,7 +36,7 @@
         RequestScan:
         @options: Options of scan. Currently 'ssids' option with value of "aay" type is supported.
 
-        Request the device to scan
+        Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property.
     -->
     <method name="RequestScan">
       <arg name="options" type="a{sv}" direction="in"/>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index be0a612c..65c2a2c0 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -198,7 +198,7 @@
     <!--
         DeviceType:
 
-        The general type of the network device; ie Ethernet, WiFi, etc.
+        The general type of the network device; ie Ethernet, Wi-Fi, etc.
 
         Returns: <link linkend="NMDeviceType">NMDeviceType</link>
     -->
@@ -256,6 +256,28 @@
     -->
     <property name="Real" type="b" access="read"/>
 
+    <!--
+        Ip4Connectivity:
+
+        The result of the last IPv4 connectivity check.
+
+        Since: 1.16
+
+        Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
+    -->
+    <property name="Ip4Connectivity" type="u" access="read"/>
+
+    <!--
+        Ip6Connectivity:
+
+        The result of the last IPv6 connectivity check.
+
+        Since: 1.16
+
+        Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
+    -->
+    <property name="Ip6Connectivity" type="u" access="read"/>
+
     <!--
         Reapply:
         @connection: The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.
diff --git a/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
new file mode 100644
index 00000000..9068f071
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.WifiP2PPeer.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.WifiP2PPeer:
+      @short_description: Wi-Fi P2P Peer
+
+      Since: 1.16
+  -->
+  <interface name="org.freedesktop.NetworkManager.WifiP2PPeer">
+    <annotation name="org.gtk.GDBus.C.Name" value="Wifi_P2P_Peer"/>
+
+    <!--
+        Flags:
+
+        Flags describing the capabilities of the access point.
+
+        Returns: <link linkend="NM80211ApFlags">NM80211ApFlags</link>
+
+        Since: 1.16
+    -->
+    <property name="Flags" type="u" access="read"/>
+
+    <!--
+        Manufacturer:
+
+        The manufacturer of the Wi-Fi P2P peer.
+
+        Since: 1.16
+    -->
+    <property name="Manufacturer" type="s" access="read"/>
+
+    <!--
+        Model:
+
+        The model of the Wi-Fi P2P peer.
+
+        Since: 1.16
+    -->
+    <property name="Model" type="s" access="read"/>
+
+    <!--
+        ModelNumber:
+
+        The model number of the Wi-Fi P2P peer.
+
+        Since: 1.16
+    -->
+    <property name="ModelNumber" type="s" access="read"/>
+
+    <!--
+        Serial:
+
+        The serial number of the Wi-Fi P2P peer.
+
+        Since: 1.16
+    -->
+    <property name="Serial" type="s" access="read"/>
+
+    <!--
+        WfdIEs:
+
+        The Wi-Fi Display Information Elements of the Wi-Fi P2P peer.
+
+        Since: 1.16
+    -->
+    <property name="WfdIEs" type="ay" access="read"/>
+
+    <!--
+        HwAddress:
+
+        The hardware address (BSSID) of the access point.
+
+        Since: 1.16
+    -->
+    <property name="HwAddress" type="s" access="read"/>
+
+    <!--
+        Strength:
+
+        The current signal quality of the access point, in percent.
+
+        Since: 1.16
+    -->
+    <property name="Strength" type="y" access="read"/>
+
+    <!--
+        LastSeen:
+
+        The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
+        point was found in scan results. A value of -1 means the access point has
+        never been found in scan results.
+
+        Since: 1.16
+    -->
+    <property name="LastSeen" type="i" access="read"/>
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index 6c6ec282..efd866db 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -76,7 +76,7 @@
         ActivateConnection:
         @connection: The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.
         @device: The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.
-        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.
         @active_connection: The path of the active connection object representing this active connection.
 
         Activate a connection using the supplied device.
@@ -92,7 +92,7 @@
         AddAndActivateConnection:
         @connection: Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
         @device: The object path of device to be activated using the given connection.
-        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
         @path: Object path of the new connection that was just added.
         @active_connection: The path of the active connection object representing this active connection.
 
@@ -100,6 +100,8 @@
         (automatically filling in missing settings with the capabilities of the
         given device and specific object), then activate the new connection.
         Cannot be used for VPN connections at this time.
+
+        See also AddAndActivateConnection2.
     -->
     <method name="AddAndActivateConnection">
       <arg name="connection" type="a{sa{sv}}" direction="in"/>
@@ -109,6 +111,38 @@
       <arg name="active_connection" type="o" direction="out"/>
     </method>
 
+    <!--
+        AddAndActivateConnection2:
+        @connection: Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.
+        @device: The object path of device to be activated using the given connection.
+        @specific_object: The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.
+        @options: Further options for the method call.
+        @path: Object path of the new connection that was just added.
+        @active_connection: The path of the active connection object representing this active connection.
+        @result: a dictionary of additional output arguments for future extension. Currently not additional
+          output arguments are supported.
+
+        Adds a new connection using the given details (if any) as a template
+        (automatically filling in missing settings with the capabilities of the
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+
+        This method extends AddAndActivateConnection to allow passing further
+        parameters. At this time the following options are supported:
+
+         * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected.
+         * bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.
+    -->
+    <method name="AddAndActivateConnection2">
+      <arg name="connection" type="a{sa{sv}}" direction="in"/>
+      <arg name="device" type="o" direction="in"/>
+      <arg name="specific_object" type="o" direction="in"/>
+      <arg name="options" type="a{sv}" direction="in"/>
+      <arg name="path" type="o" direction="out"/>
+      <arg name="active_connection" type="o" direction="out"/>
+      <arg name="result" type="a{sv}" direction="out"/>
+    </method>
+
     <!--
         DeactivateConnection:
         @active_connection: The currently active connection to deactivate.
@@ -152,7 +186,7 @@
 
         Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
+        Wi-Fi, WWAN, and WiMAX state, etc.
     -->
     <method name="GetPermissions">
       <arg name="permissions" type="a{ss}" direction="out"/>
-- 
cgit 1.3.0-6-gf8a5


From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 21 Apr 2019 21:09:51 +0200
Subject: New upstream version 1.18.0

---
 introspection/meson.build | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'introspection')

diff --git a/introspection/meson.build b/introspection/meson.build
index e442ac85..631432a7 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -73,13 +73,20 @@ foreach iface: ifaces
 
   sources += res
 
-  content_files += join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+  if gio_unix_dep.version().version_compare('>= 2.51.3')
+    dbus_iface_xml_path = join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+  else
+    dbus_iface_xml_path = join_paths(meson.build_root(), 'dbus-' + iface_xml)
+  endif
+
+  content_files += dbus_iface_xml_path
 
   # res is an array only since 0.46. Documentation won't work with
   # older versions
   if meson.version().version_compare('>= 0.46.0')
-    introspection_files += res[2]
+    introspection_files += [ [res[2], dbus_iface_xml_path] ]
   endif
+
 endforeach
 
 install_data(
-- 
cgit 1.3.0-6-gf8a5