From nobody Mon Jul 22 10:07:08 2024 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 4WSGCx18Dsz5QMXV; Mon, 22 Jul 2024 10:07:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSGCx0gPpz4fpC; Mon, 22 Jul 2024 10:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721642829; 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=Ww5NmCW+ge6EvEmoo7LH7BS+2wm1TZlJX3bTsbZ7IB8=; b=okIBwJ0hZsrr0SPnQiL8W0yIZcxiRVxqu++b5yzHRSO9lB2nXsAbbMrYufH+yYR85U93SZ 4sXscTSyvyE9lykIBph8a0nFw2W5QD6groRqiLU0YjEBkbYmd9rHG97oZaY7OS2S17Y9CM rsMVvZhjdHBv2MzYDF/tlExTfVBhpMNGTun4EFsk46IN6iCJ7N7h36YpW/jGNcszPRAv7D JQdimJE41GkokkH8O2kZRAE1Ij7sP/ugXAfVnH+MrsWZB8ChnE7pVi0Fn5dninjGteFpgl ipJIvG4PTH17+IfpF1Jh4zP/AvFv1mHD7Rj7V2ND6ezHjfybTTWZNIt8XVYM0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721642829; a=rsa-sha256; cv=none; b=jsjUV4eV01Z7RhyvcRpiVCk5f95qfHdRh0Cbn4oi+GVpKCIMmcv8MYQQO8f9J8L2g44tA6 +Tc4RQot2OF27LQcIyiwkxsvCcdPYjO5INWGhB2mL5tAl8dEvj2URKExszcEmyOgPbzo6o rSEWEBdyfjXO9v2qHM5rDScvfjCr04QkBlXEr5qC2keJwdxf5zJzLTsnH04ElhaRfiSUqZ cDqCVtfcLVpdL96tmD+5364511KIs0WNwFuAZXGfqz51PhmhVHasXali3sKwQvCPtyzNs3 YjMgo6nGOdF0aILLHsu/m5ctEZsVB1/fbmbMmP3xWy3hAK64DjqqOpWHL80GGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721642829; 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=Ww5NmCW+ge6EvEmoo7LH7BS+2wm1TZlJX3bTsbZ7IB8=; b=OdpV4Jen7ww2TmW3KMOfDUgaft2HrGc/btEQ/euACUnZrpPlZgTeeEOpk8hLXcTyVzNz3H TyoJCNF770jGkdPQX1VRWC3BMTBGLYbd4NECEF7cZmfaGUXEJTjR6CJb6MipJhnuUfiYDR UcLpdWq4LNawgtSyeeMT+xn4c9yZ6fFQi3D07XttdPibo2lRzE+s5HDOs9B40pxp05/5iY xMuSqJSRbTNmPt69/nBeBwhmnDt2XPFJtWWJ1Kn8hH+hGOza7jbkwemBz4obxG3qMr1PCD xNBLL/k/4mW/bScV75zjzawJbkiT//6iaj9ReR5EqlfG1JzyboWVFnF8EWGSpQ== 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 4WSGCx0CQmzg6r; Mon, 22 Jul 2024 10:07:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46MA78UZ043111; Mon, 22 Jul 2024 10:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46MA7884043108; Mon, 22 Jul 2024 10:07:08 GMT (envelope-from git) Date: Mon, 22 Jul 2024 10:07:08 GMT Message-Id: <202407221007.46MA7884043108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konrad Witaszczyk Subject: git: 2ab551500190 - main - usr.sbin/ppp: correct SIOCDIFADDR{,_IN6} calls to use {,in6_}ifreq 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: def X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ab5515001905576d4f9642691ae99d3ef672fc7 Auto-Submitted: auto-generated The branch main has been updated by def: URL: https://cgit.FreeBSD.org/src/commit/?id=2ab5515001905576d4f9642691ae99d3ef672fc7 commit 2ab5515001905576d4f9642691ae99d3ef672fc7 Author: Konrad Witaszczyk AuthorDate: 2024-06-28 10:29:04 +0000 Commit: Konrad Witaszczyk CommitDate: 2024-07-22 10:03:37 +0000 usr.sbin/ppp: correct SIOCDIFADDR{,_IN6} calls to use {,in6_}ifreq The SIOCDIFADDR{,_IN6} ioctls take an ifreq structure object, not an ifaliasreq structure object, as their argument. Reviewed by: brooks, jhb, oshogbo Approved by: oshogbo (mentor) Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D46018 --- usr.sbin/ppp/iface.c | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c index ad9f81b062f7..160370e6de44 100644 --- a/usr.sbin/ppp/iface.c +++ b/usr.sbin/ppp/iface.c @@ -201,64 +201,42 @@ iface_Create(const char *name) static int iface_addr_Zap(const char *name, struct iface_addr *addr, int s) { - struct ifaliasreq ifra; + struct ifreq ifr; #ifndef NOINET6 - struct in6_aliasreq ifra6; + struct in6_ifreq ifr6; #endif - struct sockaddr_in *me4, *msk4, *peer4; - struct sockaddr_storage ssme, sspeer, ssmsk; + struct sockaddr_in *me4; + struct sockaddr_storage ssme; int res, saved_errno; - ncprange_getsa(&addr->ifa, &ssme, &ssmsk); - ncpaddr_getsa(&addr->peer, &sspeer); + ncprange_getsa(&addr->ifa, &ssme, NULL); res = 0; switch (ncprange_family(&addr->ifa)) { case AF_INET: - memset(&ifra, '\0', sizeof ifra); - strncpy(ifra.ifra_name, name, sizeof ifra.ifra_name - 1); - - me4 = (struct sockaddr_in *)&ifra.ifra_addr; + memset(&ifr, '\0', sizeof ifr); + strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name - 1); + me4 = (struct sockaddr_in *)&ifr.ifr_addr; memcpy(me4, &ssme, sizeof *me4); - msk4 = (struct sockaddr_in *)&ifra.ifra_mask; - memcpy(msk4, &ssmsk, sizeof *msk4); - - peer4 = (struct sockaddr_in *)&ifra.ifra_broadaddr; - if (ncpaddr_family(&addr->peer) == AF_UNSPEC) { - peer4->sin_family = AF_INET; - peer4->sin_len = sizeof(*peer4); - peer4->sin_addr.s_addr = INADDR_NONE; - } else - memcpy(peer4, &sspeer, sizeof *peer4); - - res = ID0ioctl(s, SIOCDIFADDR, &ifra); + res = ID0ioctl(s, SIOCDIFADDR, &ifr); saved_errno = errno; if (log_IsKept(LogDEBUG)) { char buf[NCP_ASCIIBUFFERSIZE]; snprintf(buf, sizeof buf, "%s", ncprange_ntoa(&addr->ifa)); log_Printf(LogWARN, "%s: DIFADDR %s -> %s returns %d\n", - ifra.ifra_name, buf, ncpaddr_ntoa(&addr->peer), res); + ifr.ifr_name, buf, ncpaddr_ntoa(&addr->peer), res); } break; #ifndef NOINET6 case AF_INET6: - memset(&ifra6, '\0', sizeof ifra6); - strncpy(ifra6.ifra_name, name, sizeof ifra6.ifra_name - 1); - - memcpy(&ifra6.ifra_addr, &ssme, sizeof ifra6.ifra_addr); - memcpy(&ifra6.ifra_prefixmask, &ssmsk, sizeof ifra6.ifra_prefixmask); - ifra6.ifra_prefixmask.sin6_family = AF_UNSPEC; - if (ncpaddr_family(&addr->peer) == AF_UNSPEC) - ifra6.ifra_dstaddr.sin6_family = AF_UNSPEC; - else - memcpy(&ifra6.ifra_dstaddr, &sspeer, sizeof ifra6.ifra_dstaddr); - ifra6.ifra_lifetime.ia6t_vltime = ND6_INFINITE_LIFETIME; - ifra6.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; + memset(&ifr6, '\0', sizeof ifr6); + strncpy(ifr6.ifr_name, name, sizeof ifr6.ifr_name - 1); + memcpy(&ifr6.ifr_addr, &ssme, sizeof ifr6.ifr_addr); - res = ID0ioctl(s, SIOCDIFADDR_IN6, &ifra6); + res = ID0ioctl(s, SIOCDIFADDR_IN6, &ifr6); saved_errno = errno; break; #endif