From nobody Sun May 21 09:43:02 2023 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 4QPFxf39lyz4CJlG; Sun, 21 May 2023 09:43:02 +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 4QPFxf26Wqz42d1; Sun, 21 May 2023 09:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684662182; 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=KRvJ6xP0Fvi0VQ99YTpPpBBPADDV4/OVnJI4X1odDO8=; b=fdr+G0WU2yyv8a/wlK0IBYeSEp9iDavCTBtE3XTirFjblm1v10wGMvnanE1vp0YZ6NnWZV /KDV/2+bwRR9RHbqT1MseCL0VW3a5oAGV6E+y0kitJTsEkol1o3G9SANMvXbEP7BeSkqGN OYZqrv0MZmsBoBOGoqr9PMMiXMfKbRMi6MYLwv5+KQD83g5593Ey7mdC2swHGeAPmFyOt/ wZCKSEd2DEa5qd3tynxdg5zm6IxtZDWvoM9BAKge4sGtZ/s3M0KsWefB7JoyIxOYYdIo4/ LXfDG3H0zIHW9R3ZA8t71zIvr0B7o2+1QNuUnex5TPVgZzFuxASO0jVqYgKWxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684662182; 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=KRvJ6xP0Fvi0VQ99YTpPpBBPADDV4/OVnJI4X1odDO8=; b=eBTE4t5jGv22giEiz6MhDbhla/uhGWGFmd0Wa8m3m4NwlGjPheS8E3HUgf8EdbyADyzmwe 20Y3xEZC3lzeEH3TVXr3IkQyUgz7W3ZITyHziJDon3+dO4FP2CLOZuFiLBG/iP04BSWTIR 8kM/ufIpBj150hB2DdzyJNOGC5qFQ2+6ln0CY0QQOOo6FSKzuvlYIGD3pc+v3wG8S0rP2a JPQ7pqaK1Ke1cs/DcQUBH4HdCs5AHRSss+Wne57INk+OoQA7NruVc0uvgYrbpGHOcwnozC Q4dyk7jD9/IkkIr0xbxmjSJI0pAWD8r/9EsFN4gZxBbW+vTDvrEdrQTkPIOzaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684662182; a=rsa-sha256; cv=none; b=r+SZszCefpyy+qpVwg7EAmmT2+y6utcdokEcBUJpIGxPjVHMUKWon8Pa2ipv4qXod7ulDH gPe+w0dIZS8ixhiCPviBzryw25RC+lpVnl3ZtSUA2wKzKaZ+jRahbErYE+AlXYCakkfeGR nd5SX/eEn4GFzlau5gXBxRak7nCO5n1RewpJVuoN0NwkjfmegDSKXaYf57kB8qJg/Wwjh/ 8jVzq2WUDGWGDi039C0otH8RIPmT6tc5YQGq85qFVVR8mRO/YPizc4/LCBIywy6lCeDClg J7M0d1KnOhcpZIrK/tSxk9By4r2xsFhMlXKyjhCq5fpwKtCrF/Vtg33cGBxM9A== 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 4QPFxf10qGzmfh; Sun, 21 May 2023 09:43:02 +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 34L9h2KS006373; Sun, 21 May 2023 09:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34L9h2M9006372; Sun, 21 May 2023 09:43:02 GMT (envelope-from git) Date: Sun, 21 May 2023 09:43:02 GMT Message-Id: <202305210943.34L9h2M9006372@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: 63ad5ce7335b - main - ifconfig: simplify ifconfig() by factoring out ifa add/del logic 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 63ad5ce7335be6a0cc4a7bf27fe03d72c28ad401 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=63ad5ce7335be6a0cc4a7bf27fe03d72c28ad401 commit 63ad5ce7335be6a0cc4a7bf27fe03d72c28ad401 Author: Alexander V. Chernikov AuthorDate: 2023-05-20 11:23:04 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-21 09:42:11 +0000 ifconfig: simplify ifconfig() by factoring out ifa add/del logic Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40180 --- sbin/ifconfig/ifconfig.c | 83 +++++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 36 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 16ab651261d1..c5e7b7befc72 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -92,10 +92,10 @@ struct ifreq ifr; char name[IFNAMSIZ]; char *descr = NULL; size_t descrlen = 64; -int setaddr; -int setmask; -int doalias; -int clearaddr; +static int setaddr; +static int setmask; +static int doalias; +static int clearaddr; int newaddr = 1; int verbose; int printifname = 0; @@ -968,6 +968,45 @@ static void setifdstaddr(const char *, int, int, const struct afswtch *); static const struct cmd setifdstaddr_cmd = DEF_CMD("ifdstaddr", 0, setifdstaddr); +static void +delifaddr(int s, const struct afswtch *afp) +{ + if (afp->af_ridreq == NULL || afp->af_difaddr == 0) { + warnx("interface %s cannot change %s addresses!", + name, afp->af_name); + clearaddr = 0; + return; + } + + strlcpy(((struct ifreq *)afp->af_ridreq)->ifr_name, name, + sizeof ifr.ifr_name); + int ret = ioctl(s, afp->af_difaddr, afp->af_ridreq); + if (ret < 0) { + if (errno == EADDRNOTAVAIL && (doalias >= 0)) { + /* means no previous address for interface */ + } else + Perror("ioctl (SIOCDIFADDR)"); + } +} + +static void +addifaddr(int s, const struct afswtch *afp) +{ + if (afp->af_addreq == NULL || afp->af_aifaddr == 0) { + warnx("interface %s cannot change %s addresses!", + name, afp->af_name); + newaddr = 0; + return; + } + + if (setaddr || setmask) { + strlcpy(((struct ifreq *)afp->af_addreq)->ifr_name, name, + sizeof ifr.ifr_name); + if (ioctl(s, afp->af_aifaddr, afp->af_addreq) < 0) + Perror("ioctl (SIOCAIFADDR)"); + } +} + int ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *uafp) { @@ -1088,38 +1127,10 @@ top: /* * Do deferred operations. */ - if (clearaddr) { - if (afp->af_ridreq == NULL || afp->af_difaddr == 0) { - warnx("interface %s cannot change %s addresses!", - name, afp->af_name); - clearaddr = 0; - } - } - if (clearaddr) { - int ret; - strlcpy(((struct ifreq *)afp->af_ridreq)->ifr_name, name, - sizeof ifr.ifr_name); - ret = ioctl(s, afp->af_difaddr, afp->af_ridreq); - if (ret < 0) { - if (errno == EADDRNOTAVAIL && (doalias >= 0)) { - /* means no previous address for interface */ - } else - Perror("ioctl (SIOCDIFADDR)"); - } - } - if (newaddr) { - if (afp->af_addreq == NULL || afp->af_aifaddr == 0) { - warnx("interface %s cannot change %s addresses!", - name, afp->af_name); - newaddr = 0; - } - } - if (newaddr && (setaddr || setmask)) { - strlcpy(((struct ifreq *)afp->af_addreq)->ifr_name, name, - sizeof ifr.ifr_name); - if (ioctl(s, afp->af_aifaddr, afp->af_addreq) < 0) - Perror("ioctl (SIOCAIFADDR)"); - } + if (clearaddr) + delifaddr(s, afp); + if (newaddr) + addifaddr(s, afp); close(s); return(0);