From nobody Mon Sep 8 22:26:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cLM445T7Tz67BpR; Mon, 08 Sep 2025 22:26:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cLM444Z2Lz3K6P; Mon, 08 Sep 2025 22:26:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757370372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oKg3++C5gkMM3Vc7d2Fs3C4cv1dOXzHAuR9JWroPsWM=; b=L5e7MQ0zum/nn8wmjM1IZsc8CoxqbXFc2e0XmFrn8rgB+q8qzxh3Oh4D+egPjDwz918E/d BjvWmZ0ElG59poLYE+JppLRfKtLTUJrcSX1w3Ea+rLMwMF59McRE6r/UXJpiXUQznRgVo5 o28QL566VzqGe1v3IdBE3F0wYqmEnJffYxfw12YLwZ/QcX1xnLGS2O49Ivv/nj9EdhNnBT uYpfYAIEULKjpFp+UW/Ov2qwDwC9206xjSkBk8fHE18i6Wk+yMqMV2IFg5Y4szCEqn1Bxs klZmHmE/8M/wayln40Pz+oPHEw8CWoALi+yo4pFxmzRTD+7AVCGwBQ/As0+tFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757370372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oKg3++C5gkMM3Vc7d2Fs3C4cv1dOXzHAuR9JWroPsWM=; b=QeUwioLuqvlNZx5z24YeTTEsJcB/IJh6Nc4Pi0UXugkL8aQ+xU2yrUwLZ6YQetlnEe9iDm lXXdBi+GtfwjFowlAiK4tKPlbrNqxpPzORX9Z5TYpz7bRIY1VfXqcM8JgdUdKdiPjdY/Dm DBtS7zeoE60SKAE0pR1yAZHErr78AE2dlKVPVZU6Pg14jQOKyuNyxBpu0e1b8RraF+LbPO sWTN68teYxQvYXY6SUtfiTxHXH4c7z0yeOHNLxvSOYS2wPPy64tgym4KN/z9oRjs5KJLCC kAIVAjpayD6znNUGa5L7+clla816GRQw1riVmzWUBm+djyZ8R7LBsawubGnVmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757370372; a=rsa-sha256; cv=none; b=A2I9yFZLPuLg/EuYGaLvBED3X/on5D/fHKEiQTQ2e0+fM34jjw3g4OC5Yb+O/Ai6tUNC7Z /IQUofPa507Yjhku56/riHlz99bJEvA0FkrDhIUSzJuuve76YtIz3M8jrnseWN7c1p7IWG LghdFg2xTUPPRdItzbB+bY0kHtfIpzjOt1XVQClHgqIM+H97OxPUpGa+kEIQpB0XEyetyT gRo2RWOKCjmAz8CQvl/6Jh4mMMTse1pjU+4pdr4zbvCdkONKhoyO0Ov2jFBuVo5b8gu7KD ftLJr1pbebo4V6/l58CUBHMN3hAD+QdjAb/iYiqGUiG0iKZJwmpIc4mXJxbogw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 641BCCAE6; Mon, 08 Sep 2025 22:26:12 +0000 (-00) (envelope-from bdrewery@FreeBSD.org) Received: from localhost (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 81C32AE3C; Mon, 08 Sep 2025 15:26:11 -0700 (PDT) X-Virus-Scanned: amavis at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by localhost (mail.xzibition.com [172.31.3.2]) (amavis, port 10026) with LMTP id DV8ko1_XmJXh; Mon, 8 Sep 2025 15:26:09 -0700 (PDT) Message-ID: DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 48888AE3A Date: Mon, 8 Sep 2025 15:26:08 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: da50f49977cc - main - ifconfig: fix removing IPv6 addresses To: Kristof Provost , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202507291313.56TDDQFb089337@gitrepo.freebsd.org> Content-Language: en-US From: Bryan Drewery In-Reply-To: <202507291313.56TDDQFb089337@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Should this also be done for WITHOUT_NETLINK? > diff --git sbin/ifconfig/af_inet6.c sbin/ifconfig/af_inet6.c > index 7986edf490b4..e0f34f0c4d82 100644 > --- sbin/ifconfig/af_inet6.c > +++ sbin/ifconfig/af_inet6.c > @@ -753,7 +753,7 @@ static struct afswtch af_inet6 = { >  #ifdef WITHOUT_NETLINK >         .af_difaddr     = SIOCDIFADDR_IN6, >         .af_aifaddr     = SIOCAIFADDR_IN6, > -       .af_ridreq      = &in6_addreq, > +       .af_ridreq      = &in6_ridreq, >         .af_addreq      = &in6_addreq, >         .af_exec        = af_exec_ioctl, >  #else On 7/29/25 6:13 AM, Kristof Provost wrote: > The branch main has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=da50f49977cc4e6aae55cb2379313599249a8dd2 > > commit da50f49977cc4e6aae55cb2379313599249a8dd2 > Author: Kristof Provost > AuthorDate: 2025-07-29 09:50:11 +0000 > Commit: Kristof Provost > CommitDate: 2025-07-29 13:13:09 +0000 > > ifconfig: fix removing IPv6 addresses > > Sponsored by: Rubicon Communications, LLC ("Netgate") > --- > sbin/ifconfig/af_inet6.c | 2 +- > sbin/ifconfig/tests/inet6.sh | 30 ++++++++++++++++++++++++++++++ > 2 files changed, 31 insertions(+), 1 deletion(-) > > diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c > index 17dc068ee875..7986edf490b4 100644 > --- a/sbin/ifconfig/af_inet6.c > +++ b/sbin/ifconfig/af_inet6.c > @@ -759,7 +759,7 @@ static struct afswtch af_inet6 = { > #else > .af_difaddr = NL_RTM_DELADDR, > .af_aifaddr = NL_RTM_NEWADDR, > - .af_ridreq = &in6_add, > + .af_ridreq = &in6_del, > .af_addreq = &in6_add, > .af_exec = in6_exec_nl, > #endif > diff --git a/sbin/ifconfig/tests/inet6.sh b/sbin/ifconfig/tests/inet6.sh > index edfd88d93af7..22399915a64d 100644 > --- a/sbin/ifconfig/tests/inet6.sh > +++ b/sbin/ifconfig/tests/inet6.sh > @@ -76,8 +76,38 @@ broadcast_cleanup() > vnet_cleanup > } > > +atf_test_case "delete6" "cleanup" > +delete6_head() > +{ > + atf_set descr 'Test removing IPv6 addresses' > + atf_set require.user root > +} > + > +delete6_body() > +{ > + vnet_init > + > + ep=$(vnet_mkepair) > + > + atf_check -s exit:0 \ > + ifconfig ${ep}a inet6 fe80::42/64 > + atf_check -s exit:0 -o match:"fe80::42%${ep}" \ > + ifconfig ${ep}a inet6 > + > + atf_check -s exit:0 \ > + ifconfig ${ep}a inet6 -alias fe80::42 > + atf_check -s exit:0 -o not-match:"fe80::42%${ep}" \ > + ifconfig ${ep}a inet6 > +} > + > +delete6_cleanup() > +{ > + vnet_cleanup > +} > + > atf_init_test_cases() > { > atf_add_test_case netmask > atf_add_test_case broadcast > + atf_add_test_case delete6 > }