From nobody Mon May 22 13:45:19 2023 X-Original-To: dev-commits-src-main@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 4QPzGl6s0Kz4BTHc; Mon, 22 May 2023 13:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QPzGl6RLjz4bZh; Mon, 22 May 2023 13:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684763119; 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; bh=RaUuesh1cBfaJGFp/ByJ/H4scNBFjb2lIzPwKo6/ShY=; b=mMD87PFYTj7V9bQr/63aGpvb/LDqBdQulk2l6ntsV74oGmT4eORBxe1O5hyOUJAPQoboYD pOhYd/I4pBAi+YB+QqN3Ku00V6OfGP6Sg8+OduWx+BsdF5FJ/5LNGpGLknSqycAbGZ3i8H OTbq19uanIJEySv4FhsXQ/qWfQxnawru5H8XOv1CRaaW3fM9Hp40QCfFBYhhMC4Q5YzHwC FE6CNnb9bGvH3UjM/KAgif2SGPaXKkEqg/GT493pDwlb2oyOczQkZAmhRkNFYSpwZHBpY4 NW9oP4yyx8DJGskvg6Y8FZ3VSOh/b8dOkoWjOfgo2z0MB767bgyO8RSR0Sz/eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684763119; 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; bh=RaUuesh1cBfaJGFp/ByJ/H4scNBFjb2lIzPwKo6/ShY=; b=vHHhZvR4kjV2oDhwsFimZkuzLDkzn2Nl/J9dsY5A2lB/Cf2GeTSdAHpzFtTCDKIXJySYqI 2wqP4KSMlbROMHyE8VzzpZinQGm/xshQ/yvzpNksZdD9KHU+sXJbtIydJ/vxUfEjH0GNmg hgyLFvInXVpEhBIZTI/WCm8FEThgf5RZ1R9PHgke20a+WDMwe5dUBN2R8bNNujsfyLPPd9 PLaSSKYPCloI0YIw4qAWecnotk488tnq4XXq3OPkZEieRqyoB2vSmGI10JtP0G7Ydoa863 1YhwNewyp4fVtpw4OludQRd+8/LMQXvcJnJrQpybn4/HqLmltWGjPcUWbMsmRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684763119; a=rsa-sha256; cv=none; b=xoH1N8qcSX/6x4GN14DoasUGma5MBe7NZp9+B28sqsDvUQQSzm4c39pUqDNLMqbxdhLN1w aAAMFtVTxK1G9wrnRoOq/dosnLGpvY8+MbMfkUfs0AyDja/lsNGbOwmR0NHEGzKJeJsvhx 7iehlGDIl8jnEkhtY/ufvypIly/E84+umMwSAi6A2UfTrDftyqRqFnaxOss42qVkYRqGYx ZhQBgrbXyuovvYEZQDAhVPddeNDkXITWcc5IxwtpVDZX31+kQojKiyZZ4MgKFbBUN2f0YG +N9264cDLGfE544r1l5JO7N4qGcTn3Lo92h5T7jB7j+up7LoIjxOdS2n6qQkjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QPzGl5NDLzKmc; Mon, 22 May 2023 13:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34MDjJEt076364; Mon, 22 May 2023 13:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MDjJ0g076363; Mon, 22 May 2023 13:45:19 GMT (envelope-from git) Date: Mon, 22 May 2023 13:45:19 GMT Message-Id: <202305221345.34MDjJ0g076363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 050815ae7f9d - main - netlink: call IPv6 hook when adding IPv4 addresses. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 050815ae7f9dc2a93599b5321441698e331d0ba7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=050815ae7f9dc2a93599b5321441698e331d0ba7 commit 050815ae7f9dc2a93599b5321441698e331d0ba7 Author: Alexander V. Chernikov AuthorDate: 2023-05-22 13:41:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-22 13:42:28 +0000 netlink: call IPv6 hook when adding IPv4 addresses. This provides compatibility with ifioctl() version of SIOCAIFADDR. This change is temporary until the IPv4/IPv6 address handling code is moved to netinet[6]. --- sys/netlink/route/iface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 84392aa5d7f7..920c473490ab 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -1155,7 +1155,12 @@ handle_newaddr_inet(struct nlmsghdr *hdr, struct nl_parsed_ifa *attrs, if (attrs->ifa_dst != NULL) req.ifra_dstaddr = *((struct sockaddr_in *)attrs->ifa_dst); - return (in_control(NULL, SIOCAIFADDR, &req, ifp, curthread)); + int error = in_control(NULL, SIOCAIFADDR, &req, ifp, curthread); +#ifdef INET6 + if (error == 0 && !(if_flags & IFF_UP) && (if_getflags(ifp) & IFF_UP)) + in6_if_up(ifp); +#endif + return (error); } static int