[Merge] lp:~awe/network-manager/lp1579222-fix-openvpn into lp:~phablet-team/network-manager/touch-1.2

[Simon Fels]

Review: Needs Fixing

Minor comment inline, otherwise LGTM

Diff comments:

> 
> === added file 'debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch'
> --- debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch	1970-01-01 00:00:00 +0000
> +++ debian/patches/lp1579222-fix-openvpn-platform-nl-logic.patch	2016-05-09 23:13:22 +0000
> @@ -0,0 +1,36 @@
> +---

The patch should have a proper description in itself.

> + src/platform/nm-linux-platform.c |   12 +++++++-----
> + 1 file changed, 7 insertions(+), 5 deletions(-)
> +
> +Index: b/src/platform/nm-linux-platform.c
> +===================================================================
> +--- a/src/platform/nm-linux-platform.c
> ++++ b/src/platform/nm-linux-platform.c
> +@@ -2198,13 +2198,10 @@ _nl_msg_new_address (int nlmsg_type,
> + 	if (nlmsg_append (msg, &am, sizeof (am), NLMSG_ALIGNTO) < 0)
> + 		goto nla_put_failure;
> + 
> +-	if (address)
> ++	if (address) {
> + 		NLA_PUT (msg, IFA_LOCAL, addr_len, address);
> +-
> +-	if (peer_address)
> +-		NLA_PUT (msg, IFA_ADDRESS, addr_len, peer_address);
> +-	else if (address)
> + 		NLA_PUT (msg, IFA_ADDRESS, addr_len, address);
> ++	}
> + 
> + 	if (label && label[0])
> + 		NLA_PUT_STRING (msg, IFA_LABEL, label);
> +@@ -3817,6 +3814,11 @@ do_add_addrroute (NMPlatform *platform,
> + 		obj = nmp_cache_lookup_obj (priv->cache, obj_id);
> + 	}
> + 
> ++	if (seq_result == -EEXIST) {
> ++		_LOGD ("do_add_addroute: seq_restul == -EEXISTS; treating as OK");
> ++		seq_result = WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;
> ++	}
> ++
> + 	/* Adding is only successful, if kernel reported success *and* we have the
> + 	 * expected object in cache afterwards. */
> + 	return obj && seq_result == WAIT_FOR_NL_RESPONSE_RESULT_RESPONSE_OK;


-- 
https://code.launchpad.net/~awe/network-manager/lp1579222-fix-openvpn/+merge/294170
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/touch-1.2.