]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-ndisc: disable one more timer event source
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 17 Apr 2024 03:21:44 +0000 (12:21 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 17 Apr 2024 04:23:44 +0000 (13:23 +0900)
Otherwise, even if we have already received RA, timeout callback will be
called. Currently, networkd mostly does nothing on timeout, hence should
not change any effective behavior.

Follow-up for e7cb80474d4e580f7cc7c8645e1412e4a59f7588.

src/libsystemd-network/sd-ndisc.c

index b4136563e1f98da83c842b89527d2de361a04a38..eef3e8b913efbc99de3d56bf794a6b89e2d7f494 100644 (file)
@@ -219,6 +219,7 @@ static int ndisc_handle_router(sd_ndisc *nd, ICMP6Packet *packet) {
                 return r;
 
         (void) event_source_disable(nd->timeout_event_source);
+        (void) event_source_disable(nd->timeout_no_ra);
 
         log_ndisc(nd, "Received Router Advertisement: flags %s preference %s lifetime %s",
                   rt->flags & ND_RA_FLAG_MANAGED ? "MANAGED" : rt->flags & ND_RA_FLAG_OTHER ? "OTHER" : "none",