summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-07-22 06:03:10 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-07-29 02:05:05 +0900
commit3336e946daab7417fc33170ca4d77581dd799748 (patch)
tree23f948c7e3a179c80d64248097cd8a6280285ae7
parent5d8c3ec1e92ffd4463c85ab057d6532b5950a6d9 (diff)
downloadsystemd-3336e946daab7417fc33170ca4d77581dd799748.tar.gz
network: ndisc: do not set configured flags when addresses or routes are not assigned yet
Just for safety.
-rw-r--r--src/network/networkd-ndisc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index a91c099996..dcfe3e726c 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -819,10 +819,11 @@ static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
case SD_NDISC_EVENT_TIMEOUT:
log_link_debug(link, "NDisc handler get timeout event");
- link->ndisc_addresses_configured = true;
- link->ndisc_routes_configured = true;
- link_check_ready(link);
-
+ if (link->ndisc_addresses_messages == 0 && link->ndisc_routes_messages == 0) {
+ link->ndisc_addresses_configured = true;
+ link->ndisc_routes_configured = true;
+ link_check_ready(link);
+ }
break;
default:
assert_not_reached("Unknown NDisc event");