From patchwork Mon Mar 18 13:43:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Merzlyakov X-Patchwork-Id: 1057890 X-Patchwork-Delegate: dedeckeh@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nXBj1K+y"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cAzu3Nqq"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44NHTc04LLz9s5c for ; Tue, 19 Mar 2019 00:44:04 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=mgBnHG3XHoywJFsGGp69HMtOlZJxSJsg2LpMz2dFmpU=; b=nXBj1K+yAT/1ag Z/wfSLvNbrMpBGk0NX4AwrDMsMm0jwxFSaDLmw7vXAXPeOwvnKlXX59GljKm8tUVCEbLwIcy3ikfN VjTg6eErdpqm3hm0HbvU0fhAzZkUfAazz5Qufx+JeAwGp1Q7CHVaGfNx9DRZdToOnZoXEsqqBRcGE Iy86Q3YhGbvdRvyd9KAY1pnlgEK/J+FYXDASpsyELB3L8D7nvN75qOhSIuD2akRcVirlM+TtC9T0k I2ltFvaTddzoW2jRAhKfI5iduzXjmvUej+8qpWa0UeCqMe20pPCcjtpbgp5RiTp3E2RqMnd7FI76c OUg3kGrAatuGX5KjCPew==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5sYQ-0004hT-Co; Mon, 18 Mar 2019 13:43:50 +0000 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5sYM-0004h9-FE for openwrt-devel@lists.openwrt.org; Mon, 18 Mar 2019 13:43:48 +0000 Received: by mail-pg1-x52d.google.com with SMTP id h34so11393538pgh.11 for ; Mon, 18 Mar 2019 06:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dSBlsvYKfTU6N3h0iRj3Pc1grR5yhu05q+PKmRFxf84=; b=cAzu3NqqyFYtlR870WCMRnpgrFfyiwSVyNLhMqk0A7xYLrMBw5J0BJCea81H1KUl8R RGtkxQ60PJxbXuiXoLQrK9d4fra2zaJEeaxb/mdrDyS2dWSv1p+aHBZRA2DaIbF2PRam afKuBOIDpHW30e1WlHBMlgolmw5O6h/E0mRmsjfwVQhzPzq5oGlrs1+8xq/fMXwK40fE 4wL3GLaycNBrYQyQpIz+p7P6GZCM2SiySnyiVdi97UPShF9pMzAHhvdT2I/wiHw+AMOh HoMNHg+JUPMEuyi91s8ypNR3R63PlWu4GAUqzMvyHJDA3z+i4fIhQNrAJLAqfHDlJfwR fugA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dSBlsvYKfTU6N3h0iRj3Pc1grR5yhu05q+PKmRFxf84=; b=Jg9W8DvM+tCUkeExttJQ9p4Of7ZvuEkHWALvyAttmTm4H3faz6gLwP5JN3Nf3cfdoO 8q6Smv3fBUMOginoQGIRjZzO37gxAK4sfvrQspLydK+fDnDPb/WXZW1z8hKwqS19ri9c T1QhLC4OvZIe7yVn2PLRiP21wWYp6RJrKfXmIXrGDhYSw7n+dpbjiecAy2DMteujg1sZ Ow7nm+tFlPvs0q9SpOWrmbnLx3cIY2+O8Mewo62C0ZNGvw3cYWp+RdO5dzhr9YT91RWJ iwcqY+Ie7hsei4Z6o3kVzTp3Kbma5gWkj/8p/cDG/BHzJmBuE6fr/WDFLQaTxodABNvG kqJg== X-Gm-Message-State: APjAAAWLmiKrLixBnct/9Difa4aqBzlV+b7SrNODTDCvwB53Yb5JsQ9o jCCsZ2Rr2vUkwvzSDaiwGKmsH+C77rM= X-Google-Smtp-Source: APXvYqyGhPYMNUKtD7ilf8B6bZwNgmUJEHa4Dq11ziBFC5ZQSfp5g52c1L8kdHk1E7qpnfhyBGgORg== X-Received: by 2002:a17:902:27a8:: with SMTP id d37mr19827319plb.164.1552916623511; Mon, 18 Mar 2019 06:43:43 -0700 (PDT) Received: from localhost.localdomain ([2a02:2880:3:102:4711:4807:6fb7:9a72]) by smtp.gmail.com with ESMTPSA id 125sm2839733pfw.139.2019.03.18.06.43.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 06:43:42 -0700 (PDT) From: pavel.merzlyakov@gmail.com To: openwrt-devel@lists.openwrt.org Date: Mon, 18 Mar 2019 15:43:28 +0200 Message-Id: <20190318134328.2342-1-pavel.merzlyakov@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_064346_510538_F2CF7B38 X-CRM114-Status: GOOD ( 13.22 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:52d listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (pavel.merzlyakov[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH] [odhcp6c] ra: clear RA information and request new after link-up event or SIGUSR2 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pavel Merzlyakov Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Pavel Merzlyakov A subnet may be changed after link-up event Signed-off-by: Pavel Merzlyakov --- src/odhcp6c.c | 3 +++ src/ra.c | 20 +++++++++++++++++--- src/ra.h | 1 + 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 19a86f2..dd20f39 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -455,6 +455,9 @@ int main(_unused int argc, char* const argv[]) syslog(LOG_NOTICE, "(re)starting transaction on %s", ifname); + if (signal_usr2) + ra_restart(); + signal_usr1 = signal_usr2 = false; int mode = dhcpv6_set_ia_mode(ia_na_mode, ia_pd_mode); if (mode != DHCPV6_STATELESS) diff --git a/src/ra.c b/src/ra.c index 898f449..917df11 100644 --- a/src/ra.c +++ b/src/ra.c @@ -55,6 +55,7 @@ static int sock = -1, rtnl = -1; static int if_index = 0; static char if_name[IF_NAMESIZE] = {0}; static volatile int rs_attempt = 0; +static const int rs_attempt_limit = 4; static struct in6_addr lladdr = IN6ADDR_ANY_INIT; static unsigned int ra_options = 0; static unsigned int ra_holdoff_interval = 0; @@ -179,6 +180,20 @@ failure: return -1; } +void ra_restart(void) +{ + const int rs_attempt_old = rs_attempt; + + odhcp6c_clear_state(STATE_RA_PREFIX); + odhcp6c_clear_state(STATE_RA_ROUTE); + odhcp6c_clear_state(STATE_RA_DNS); + odhcp6c_clear_state(STATE_RA_SEARCH); + + rs_attempt = 0; + if (rs_attempt_old == 0 || rs_attempt_old >= rs_attempt_limit) + ra_send_rs(SIGALRM); +} + static void ra_send_rs(int signal __attribute__((unused))) { const struct sockaddr_in6 dest = {AF_INET6, 0, 0, ALL_IPV6_ROUTERS, if_index}; @@ -193,7 +208,7 @@ static void ra_send_rs(int signal __attribute__((unused))) if (sendto(sock, &rs, len, MSG_DONTWAIT, (struct sockaddr*)&dest, sizeof(dest)) < 0) syslog(LOG_ERR, "Failed to send RS (%s)", strerror(errno)); - if (++rs_attempt <= 3) + if (++rs_attempt < rs_attempt_limit) alarm(4); } @@ -243,8 +258,7 @@ bool ra_link_up(void) if (ret) { syslog(LOG_NOTICE, "carrier => %i event on %s", (int)!nocarrier, if_name); - rs_attempt = 0; - ra_send_rs(SIGALRM); + ra_restart(); } return ret; diff --git a/src/ra.h b/src/ra.h index 9acc8cd..4ec208f 100644 --- a/src/ra.h +++ b/src/ra.h @@ -46,5 +46,6 @@ struct icmpv6_opt_route_info { int ra_init(const char *ifname, const struct in6_addr *ifid, unsigned int options, unsigned int holdoff_interval); +void ra_restart(void); bool ra_link_up(void); bool ra_process(void);