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

ndisc: add support for PREF64 option (fixes)

Browse source
This commit is contained in:
Beniamino Galvani 2025-09-10 17:50:44 +02:00
parent 0b3a7ca9d0
commit 2fe97bea4d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -263,7 +263,7 @@ uuid_dep = dependency('uuid')
libelogind_dep = dependency('libelogind', version: '>= 219', required: false) libelogind_dep = dependency('libelogind', version: '>= 219', required: false)
libudev_dep = dependency('libudev', version: '>= 175') libudev_dep = dependency('libudev', version: '>= 175')
dbus_dep = dependency('dbus-1', version: '>= 1.1') dbus_dep = dependency('dbus-1', version: '>= 1.1')
libndp_dep = dependency('libndp') libndp_dep = dependency('libndp', version: '>= 1.9')
jansson_dep = dependency('jansson', version: '>= 2.7', required: false) jansson_dep = dependency('jansson', version: '>= 2.7', required: false)
config_h.set10('WITH_JANSSON', jansson_dep.found()) config_h.set10('WITH_JANSSON', jansson_dep.found())

4
src/core/ndisc/nm-ndisc.c
View file

@ -1541,8 +1541,10 @@ clean_pref64(NMNDisc *ndisc, gint64 now_msec, NMNDiscConfigMap *changed, gint64
if (!rdata->public.pref64.valid) if (!rdata->public.pref64.valid)
return; return;
if (!expiry_next(now_msec, rdata->public.pref64.expiry_msec, next_msec)) if (!expiry_next(now_msec, rdata->public.pref64.expiry_msec, next_msec)) {
rdata->public.pref64.valid = FALSE;
*changed |= NM_NDISC_CONFIG_PREF64; *changed |= NM_NDISC_CONFIG_PREF64;
}
} }
static void static void