From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id EE6275A061A; Fri, 15 Nov 2024 15:17:31 +0100 (CET) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH] ndp: Don't send unsolicited router advertisement if we can't, yet Date: Fri, 15 Nov 2024 15:17:31 +0100 Message-ID: <20241115141731.51359-1-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: AMOL2USCJR23I2MBS5GICSMVKTVOOKDV X-Message-ID-Hash: AMOL2USCJR23I2MBS5GICSMVKTVOOKDV X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: ndp_timer() is called right away on the first epoll_wait() cycle, when the communication channel to the guest isn't ready yet: 1.0038: NDP: sending unsolicited RA, next in 264s 1.0038: tap: failed to send 1 frames of 1 check that it's up before sending it. This effectively delays the first gratuitous router advertisement, which is probably a good idea given that we expect the guest to send a router solicitation right away. Fixes: 6e1e44293ef9 ("ndp: Send unsolicited Router Advertisements") Signed-off-by: Stefano Brivio --- ndp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ndp.c b/ndp.c index 7ee44b2..b458785 100644 --- a/ndp.c +++ b/ndp.c @@ -420,9 +420,12 @@ void ndp_timer(const struct ctx *c, const struct timespec *now) interval = min_rtr_adv_interval + random() % (max_rtr_adv_interval - min_rtr_adv_interval); - info("NDP: sending unsolicited RA, next in %llds", (long long)interval); + if (next_ra) { + info("NDP: sending unsolicited RA, next in %llds", + (long long)interval); - ndp_ra(c, &in6addr_ll_all_nodes); + ndp_ra(c, &in6addr_ll_all_nodes); + } next_ra = now->tv_sec + interval; } -- 2.43.0