fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 20:38:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: fix and simplify address lifetime compensation

Browse source 
Acked-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Pavel Šimerda 2013-08-30 10:02:05 +02:00
parent c5c8fbea12
commit e96b5d82bd
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/platform/nm-platform.c
View file

@ -1198,14 +1198,14 @@ get_time (void)
return tp.tv_sec; return tp.tv_sec;
} }
/* Compute (a + b - c) in an overflow-safe manner. */ /* Compute (a - b) in an overflow-safe manner. */
static guint32 static guint32
addsubstract_guint32 (guint32 a, guint32 b, guint32 c) subtract_guint32 (guint32 a, guint32 b)
{ {
a = a > c ? a - c : 0; if (a == G_MAXUINT32)
a = a < G_MAXUINT32 - b ? a + b : G_MAXUINT32; return G_MAXUINT32;
return a; return a > b ? a - b : 0;
} }
/** /**
@ -1246,11 +1246,11 @@ nm_platform_ip4_address_sync (int ifindex, const GArray *known_addresses)
guint32 lifetime, preferred; guint32 lifetime, preferred;
if (known_address->lifetime) { if (known_address->lifetime) {
guint32 shift = addsubstract_guint32 (now, 0, known_address->timestamp); /* Pad the timestamp by 5 seconds to avoid potential races. */
guint32 shift = subtract_guint32 (now, known_address->timestamp + 5);
/* Pad the lifetime by 5 seconds to avoid potential races. */ lifetime = subtract_guint32 (known_address->lifetime, shift);
lifetime = addsubstract_guint32 (known_address->lifetime, 5, shift); preferred = subtract_guint32 (known_address->lifetime, shift);
preferred = addsubstract_guint32 (known_address->lifetime, 5, shift);
} else } else
lifetime = preferred = NM_PLATFORM_LIFETIME_PERMANENT; lifetime = preferred = NM_PLATFORM_LIFETIME_PERMANENT;
@ -1303,11 +1303,11 @@ nm_platform_ip6_address_sync (int ifindex, const GArray *known_addresses)
guint32 lifetime, preferred; guint32 lifetime, preferred;
if (known_address->lifetime) { if (known_address->lifetime) {
guint32 shift = addsubstract_guint32 (now, 0, known_address->timestamp); /* Pad the timestamp by 5 seconds to avoid potential races. */
guint32 shift = subtract_guint32 (now, known_address->timestamp + 5);
/* Pad the lifetime by 5 seconds to avoid potential races. */ lifetime = subtract_guint32 (known_address->lifetime, shift);
lifetime = addsubstract_guint32 (known_address->lifetime, 5, shift); preferred = subtract_guint32 (known_address->lifetime, shift);
preferred = addsubstract_guint32 (known_address->lifetime, 5, shift);
} else } else
lifetime = preferred = NM_PLATFORM_LIFETIME_PERMANENT; lifetime = preferred = NM_PLATFORM_LIFETIME_PERMANENT;