Attachment 881113 Details for Bug 1082041 – patch v1

[patch] patch v1

rh1082041.patch (text/plain), 1.52 KB, created by Kai Engert (:kaie) (inactive account) on 2014-03-31 21:57:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Engert (:kaie) (inactive account)

Created: 2014-03-31 21:57:33 UTC

Size: 1.52 KB

patch

obsolete

>--- src/platform/nm-platform.c.org	2014-03-31 23:53:42.924754719 +0200
>+++ src/platform/nm-platform.c	2014-03-31 23:53:42.931754745 +0200
>@@ -1397,40 +1397,43 @@ nm_platform_ip6_address_sync (int ifinde
> 			nm_platform_ip6_address_delete (ifindex, address->address, address->plen);
> 	}
> 	g_array_free (addresses, TRUE);
> 
> 	if (!known_addresses)
> 		return TRUE;
> 
> 	/* Add missing addresses */
> 	for (i = 0; i < known_addresses->len; i++) {
> 		const NMPlatformIP6Address *known_address = &g_array_index (known_addresses, NMPlatformIP6Address, i);
> 		guint32 lifetime, preferred;
> 
> 		if (known_address->lifetime) {
> 			/* Pad the timestamp by 5 seconds to avoid potential races. */
> 			guint32 shift = subtract_guint32 (now, known_address->timestamp + 5);
> 
> 			lifetime = subtract_guint32 (known_address->lifetime, shift);
> 			preferred = subtract_guint32 (known_address->lifetime, shift);
> 		} else
> 			lifetime = preferred = NM_PLATFORM_LIFETIME_PERMANENT;
>+		
>+		if (known_address->preferred == 0)
>+			preferred = 0;
> 
> 		if (!nm_platform_ip6_address_add (ifindex, known_address->address,
> 		                                  known_address->peer_address, known_address->plen,
> 		                                  lifetime, preferred, known_address->flags))
> 			return FALSE;
> 	}
> 
> 	return TRUE;
> }
> 
> gboolean
> nm_platform_address_flush (int ifindex)
> {
> 	return nm_platform_ip4_address_sync (ifindex, NULL)
> 			&& nm_platform_ip6_address_sync (ifindex, NULL);
> }
> 
> /******************************************************************/
> 
> GArray *

Actions: View | Diff

Attachments on bug 1082041: 881113