Merge lp:~cyphermox/network-manager/powersave+primaryconnectiontype into lp:~phablet-team/network-manager/rtm

[Mathieu Trudel-Lapierre]

- Add powersave (barajas bug 1367745)
- New PrimaryConnectionType property backported from upstream git master to be used by unity8 (bug 1384776)

[Ricardo Salveti (rsalveti)]

LGTM

Will create a patch and test to see if it actually works as expected (before top approval).

[Ricardo Salveti (rsalveti)]

*Will create a package

[Ricardo Salveti (rsalveti)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 19:24:43 +0000
+++ debian/changelog	2014-10-24 13:10:24 +0000
@@ -1,3 +1,21 @@
+network-manager (0.9.8.8-0ubuntu29) UNRELEASED; urgency=medium
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/patches/powersave.patch: enable powersave mode when wifi devices
+    are activated; disable it when we're disconnected so as not to interfere
+    with scanning and getting connected again to some network. (LP: #1384823)
+  * debian/libnm-util2.symbols: update symbols file for new method
+    nm_connection_get_connection_type introduced for the PrimaryConnectionType
+    patch.
+
+  [ Ryan Lortie ]
+  * debian/patches/primary_connection_type.patch: export the type of the
+    currently active primary connection (the one that currently owns the
+    default gateway), for use by applications to figure out when not to do
+    heavy requests, for example, while on mobile broadband. (LP: #1384776)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 23 Oct 2014 15:05:25 -0400
+
 network-manager (0.9.8.8-0ubuntu28) utopic; urgency=medium
 
   * debian/patches/add_ofono_support.patch: Ignore calls to set_mm_enabled;

=== modified file 'debian/libnm-util2.symbols'
--- debian/libnm-util2.symbols	2013-02-26 15:00:41 +0000
+++ debian/libnm-util2.symbols	2014-10-24 13:10:24 +0000
@@ -10,6 +10,7 @@
  nm_connection_error_get_type@Base 0.7.0
  nm_connection_error_quark@Base 0.7.0
  nm_connection_for_each_setting_value@Base 0.7.0
+ nm_connection_get_connection_type@Base 0.9.8.8-0ubuntu29~
  nm_connection_get_id@Base 0.8.998
  nm_connection_get_path@Base 0.7.0
  nm_connection_get_setting@Base 0.7.0

=== added file 'debian/patches/powersave.patch'
--- debian/patches/powersave.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/powersave.patch	2014-10-24 13:10:24 +0000
@@ -0,0 +1,114 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Enable the use of powersave mode on supporting wireless devices
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1384823
+
+---
+ src/nm-device-wifi.c          |    5 +++++
+ src/wifi/wifi-utils-nl80211.c |   23 +++++++++++++++++++++++
+ src/wifi/wifi-utils-private.h |    3 +++
+ src/wifi/wifi-utils.c         |    8 ++++++++
+ 4 files changed, 39 insertions(+)
+
+Index: b/src/nm-device-wifi.c
+===================================================================
+--- a/src/nm-device-wifi.c
++++ b/src/nm-device-wifi.c
+@@ -959,6 +959,8 @@ deactivate (NMDevice *dev)
+ 	/* Reset MAC address back to initial address */
+ 	_set_hw_addr (self, priv->initial_hw_addr, "reset");
+ 
++	wifi_utils_set_powersave (priv->wifi_data, FALSE);
++
+ 	/* Ensure we're in infrastructure mode after deactivation; some devices
+ 	 * (usually older ones) don't scan well in adhoc mode.
+ 	 */
+@@ -3489,12 +3491,15 @@ device_state_changed (NMDevice *device,
+ 			nm_supplicant_interface_disconnect (priv->supplicant.iface);
+ 		break;
+ 	case NM_DEVICE_STATE_ACTIVATED:
++		wifi_utils_set_powersave (priv->wifi_data, TRUE);
+ 		activation_success_handler (device);
+ 		break;
+ 	case NM_DEVICE_STATE_FAILED:
++		wifi_utils_set_powersave (priv->wifi_data, FALSE);
+ 		activation_failure_handler (device);
+ 		break;
+ 	case NM_DEVICE_STATE_DISCONNECTED:
++		wifi_utils_set_powersave (priv->wifi_data, FALSE);
+ 		/* Kick off a scan to get latest results */
+ 		priv->scan_interval = SCAN_INTERVAL_MIN;
+ 		cancel_pending_scan (self);
+Index: b/src/wifi/wifi-utils-nl80211.c
+===================================================================
+--- a/src/wifi/wifi-utils-nl80211.c
++++ b/src/wifi/wifi-utils-nl80211.c
+@@ -248,6 +248,28 @@ wifi_nl80211_set_mode (WifiData *data, c
+ 	return FALSE;
+ }
+ 
++static gboolean
++wifi_nl80211_set_powersave (WifiData *data, gboolean powersave)
++{
++	WifiDataNl80211 *nl80211 = (WifiDataNl80211 *) data;
++	struct nl_msg *msg;
++	int err;
++
++	msg = nl80211_alloc_msg (nl80211, NL80211_CMD_SET_POWER_SAVE, 0);
++
++	if (powersave)
++		NLA_PUT_U32 (msg, NL80211_ATTR_PS_STATE, NL80211_PS_ENABLED);
++	else
++		NLA_PUT_U32 (msg, NL80211_ATTR_PS_STATE, NL80211_PS_DISABLED);
++
++	err = nl80211_send_and_recv (nl80211, msg, NULL, NULL);
++	return err ? FALSE : TRUE;
++
++nla_put_failure:
++	nlmsg_free (msg);
++	return FALSE;
++}
++
+ /* @divisor: pass what value @xbm should be divided by to get dBm */
+ static guint32 nl80211_xbm_to_percent (gint32 xbm, guint32 divisor)
+ {
+@@ -739,6 +761,7 @@ wifi_nl80211_init (const char *iface, in
+ 	nl80211 = wifi_data_new (iface, ifindex, sizeof (*nl80211));
+ 	nl80211->parent.get_mode = wifi_nl80211_get_mode;
+ 	nl80211->parent.set_mode = wifi_nl80211_set_mode;
++	nl80211->parent.set_powersave = wifi_nl80211_set_powersave;
+ 	nl80211->parent.get_freq = wifi_nl80211_get_freq;
+ 	nl80211->parent.find_freq = wifi_nl80211_find_freq;
+ 	nl80211->parent.get_ssid = wifi_nl80211_get_ssid;
+Index: b/src/wifi/wifi-utils.c
+===================================================================
+--- a/src/wifi/wifi-utils.c
++++ b/src/wifi/wifi-utils.c
+@@ -104,6 +104,14 @@ wifi_utils_set_mode (WifiData *data, con
+ 	return data->set_mode ? data->set_mode (data, mode) : TRUE;
+ }
+ 
++gboolean
++wifi_utils_set_powersave (WifiData *data, gboolean powersave)
++{
++	g_return_val_if_fail (data != NULL, FALSE);
++
++	return data->set_powersave ? data->set_powersave (data, powersave) : TRUE;
++}
++
+ guint32
+ wifi_utils_get_freq (WifiData *data)
+ {
+Index: b/src/wifi/wifi-utils-private.h
+===================================================================
+--- a/src/wifi/wifi-utils-private.h
++++ b/src/wifi/wifi-utils-private.h
+@@ -36,6 +36,9 @@ struct WifiData {
+ 
+ 	gboolean (*set_mode) (WifiData *data, const NM80211Mode mode);
+ 
++	/* Set power saving mode on an interface (nl80211 only) */
++	gboolean (*set_powersave) (WifiData *data, gboolean powersave);
++
+ 	/* Return current frequency in MHz (really associated BSS frequency) */
+ 	guint32 (*get_freq) (WifiData *data);
+ 

=== added file 'debian/patches/primary_connection_type.patch'
--- debian/patches/primary_connection_type.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/primary_connection_type.patch	2014-10-24 13:10:24 +0000
@@ -0,0 +1,202 @@
+From 01dab14dbba76dd804858cad5f3b6ec4605b0d1a Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <[e-mail]>
+Date: Thu, 23 Oct 2014 13:56:52 -0400
+Subject: [PATCH] Add PrimaryConnectionType property to the manager
+
+This will provide an extremely easy way for applications to find out
+what type of connection the system is currently using.  They might want
+to do this to avoid using data if a phone is on a 3G connection, for
+example.
+
+Backported from https://bugzilla.gnome.org/show_bug.cgi?id=739080
+---
+ introspection/nm-manager.xml |  8 ++++++++
+ libnm-util/libnm-util.ver    |  1 +
+ libnm-util/nm-connection.c   | 21 +++++++++++++++++++++
+ libnm-util/nm-connection.h   |  2 ++
+ src/nm-active-connection.c   | 11 +++++++++++
+ src/nm-active-connection.h   |  2 ++
+ src/nm-manager.c             | 15 +++++++++++++++
+ src/nm-manager.h             |  1 +
+ 8 files changed, 61 insertions(+)
+
+diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
+index a0e2773..97ffc87 100644
+--- a/introspection/nm-manager.xml
++++ b/introspection/nm-manager.xml
+@@ -326,6 +326,14 @@
+       </tp:docstring>
+     </property>
+ 
++    <property name="PrimaryConnectionType" type="s" access="read">
++      <tp:docstring>
++        The connection type of the "primary" active connection being
++        used to access the network. This is the same as the Type
++        property on the object indicated by PrimaryConnection.
++      </tp:docstring>
++    </property>
++
+     <property name="ActivatingConnection" type="o" access="read">
+       <tp:docstring>
+         The object path of an active connection that is currently
+diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
+index 04f2a91..dd68293 100644
+--- a/libnm-util/libnm-util.ver
++++ b/libnm-util/libnm-util.ver
+@@ -11,6 +11,7 @@ global:
+ 	nm_connection_error_get_type;
+ 	nm_connection_error_quark;
+ 	nm_connection_for_each_setting_value;
++	nm_connection_get_connection_type;
+ 	nm_connection_get_id;
+ 	nm_connection_get_path;
+ 	nm_connection_get_setting;
+diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
+index 15b1685..e684138 100644
+--- a/libnm-util/nm-connection.c
++++ b/libnm-util/nm-connection.c
+@@ -1249,6 +1249,27 @@ nm_connection_get_id (NMConnection *connection)
+ 	return nm_setting_connection_get_id (s_con);
+ }
+ 
++/**
++ * nm_connection_get_connection_type:
++ * @connection: the #NMConnection
++ *
++ * A shortcut to return the type from the connection's #NMSettingConnection.
++ *
++ * Returns: the type from the connection's 'connection' setting
++ **/
++const char *
++nm_connection_get_connection_type (NMConnection *connection)
++{
++	NMSettingConnection *s_con;
++
++	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
++
++	s_con = nm_connection_get_setting_connection (connection);
++	g_return_val_if_fail (s_con != NULL, NULL);
++
++	return nm_setting_connection_get_connection_type (s_con);
++}
++
+ /*************************************************************/
+ 
+ /**
+diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
+index 4d060cc..d6a18f7 100644
+--- a/libnm-util/nm-connection.h
++++ b/libnm-util/nm-connection.h
+@@ -187,6 +187,8 @@ const char *  nm_connection_get_uuid      (NMConnection *connection);
+ 
+ const char *  nm_connection_get_id        (NMConnection *connection);
+ 
++const char *  nm_connection_get_connection_type (NMConnection *connection);
++
+ NMSetting8021x *           nm_connection_get_setting_802_1x            (NMConnection *connection);
+ NMSettingBluetooth *       nm_connection_get_setting_bluetooth         (NMConnection *connection);
+ NMSettingBond *            nm_connection_get_setting_bond              (NMConnection *connection);
+diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
+index 6e3a5da..5faded1 100644
+--- a/src/nm-active-connection.c
++++ b/src/nm-active-connection.c
+@@ -137,6 +137,17 @@ nm_active_connection_get_connection (NMActiveConnection *self)
+ }
+ 
+ const char *
++nm_active_connection_get_connection_type (NMActiveConnection *self)
++{
++	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
++
++	if (priv->connection == NULL)
++		return NULL;
++
++	return nm_connection_get_connection_type (priv->connection);
++}
++
++const char *
+ nm_active_connection_get_path (NMActiveConnection *self)
+ {
+ 	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->path;
+diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
+index 2f17c58..0401f88 100644
+--- a/src/nm-active-connection.h
++++ b/src/nm-active-connection.h
+@@ -70,6 +70,8 @@ void          nm_active_connection_export (NMActiveConnection *self);
+ NMConnection *nm_active_connection_get_connection (NMActiveConnection *self);
+ const char *  nm_active_connection_get_name       (NMActiveConnection *self);
+ 
++const char *  nm_active_connection_get_connection_type (NMActiveConnection *self);
++
+ const char *  nm_active_connection_get_path (NMActiveConnection *self);
+ 
+ const char *  nm_active_connection_get_specific_object (NMActiveConnection *self);
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index 9c82d14..11a50f2 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -291,6 +291,7 @@ enum {
+ 	PROP_ACTIVE_CONNECTIONS,
+ 	PROP_CONNECTIVITY,
+ 	PROP_PRIMARY_CONNECTION,
++	PROP_PRIMARY_CONNECTION_TYPE,
+ 	PROP_ACTIVATING_CONNECTION,
+ 
+ 	/* Not exported */
+@@ -4054,6 +4055,7 @@ policy_default_device_changed (GObject *object, GParamSpec *pspec, gpointer user
+ 		priv->primary_connection = ac ? g_object_ref (ac) : NULL;
+ 		nm_log_dbg (LOGD_CORE, "PrimaryConnection now %s", ac ? nm_active_connection_get_name (ac) : "(none)");
+ 		g_object_notify (G_OBJECT (self), NM_MANAGER_PRIMARY_CONNECTION);
++		g_object_notify (G_OBJECT (self), NM_MANAGER_PRIMARY_CONNECTION_TYPE);
+ 	}
+ }
+ 
+@@ -4660,6 +4662,7 @@ get_property (GObject *object, guint prop_id,
+ 	GSList *iter;
+ 	GPtrArray *active;
+ 	const char *path;
++	const char *type;
+ 
+ 	switch (prop_id) {
+ 	case PROP_VERSION:
+@@ -4705,6 +4708,10 @@ get_property (GObject *object, guint prop_id,
+ 		path = priv->primary_connection ? nm_active_connection_get_path (priv->primary_connection) : "/";
+ 		g_value_set_boxed (value, path);
+ 		break;
++	case PROP_PRIMARY_CONNECTION_TYPE:
++		type = priv->primary_connection ? nm_active_connection_get_connection_type (priv->primary_connection) : NULL;
++		g_value_set_string (value, type ? type : "");
++		break;
+ 	case PROP_ACTIVATING_CONNECTION:
+ 		path = priv->activating_connection ? nm_active_connection_get_path (priv->activating_connection) : "/";
+ 		g_value_set_boxed (value, path);
+@@ -4981,6 +4988,14 @@ nm_manager_class_init (NMManagerClass *manager_class)
+ 		                     G_PARAM_READABLE));
+ 
+ 	g_object_class_install_property
++		(object_class, PROP_PRIMARY_CONNECTION_TYPE,
++		 g_param_spec_string (NM_MANAGER_PRIMARY_CONNECTION_TYPE, "", "",
++		                      NULL,
++		                      G_PARAM_READABLE |
++		                      G_PARAM_STATIC_STRINGS));
++
++
++	g_object_class_install_property
+ 		(object_class, PROP_ACTIVATING_CONNECTION,
+ 		 g_param_spec_boxed (NM_MANAGER_ACTIVATING_CONNECTION,
+ 		                     "Activating connection",
+diff --git a/src/nm-manager.h b/src/nm-manager.h
+index 9884d05..a0c9065 100644
+--- a/src/nm-manager.h
++++ b/src/nm-manager.h
+@@ -61,6 +61,7 @@ typedef enum {
+ #define NM_MANAGER_ACTIVE_CONNECTIONS "active-connections"
+ #define NM_MANAGER_CONNECTIVITY "connectivity"
+ #define NM_MANAGER_PRIMARY_CONNECTION "primary-connection"
++#define NM_MANAGER_PRIMARY_CONNECTION_TYPE "primary-connection-type"
+ #define NM_MANAGER_ACTIVATING_CONNECTION "activating-connection"
+ 
+ /* Not exported */
+-- 
+2.1.0
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-15 19:24:43 +0000
+++ debian/patches/series	2014-10-24 13:10:24 +0000
@@ -43,3 +43,5 @@
 remove-extra-scan_done-on-scan-start.patch
 scan_update_last_seen.patch
 cull_aps_on_scan_done_signal.patch
+powersave.patch
+primary_connection_type.patch