From nobody Fri Jan 28 17:34:20 2022 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 BD97D198AB24; Fri, 28 Jan 2022 17:34:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jll26528tz4XGK; Fri, 28 Jan 2022 17:34:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643391262; 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=lmQnMI/4fBZwspK/3scVqbc/R8019oddL70Z8hjx8hI=; b=YqUVECqFvLxGDvC6t0IUvEzreA6R+7r7xeT/90do6/cjxoO5Ia7BhTzn2D6OsIO6AGmMqq iijyP6AmdGUFTxZYavWFxLhMJq7+MYLY3ANVKbGvIXXej81XBErryUgm7UoLyApJ5/jc6Q lIboHhQ8S16eOyKBqj4wmhMueLBf1OBNUReGF4pjslSNmT/UY+m3hkX7X9Dp3agMQArQtU Cpdjhtp4VhAfSHI1kUhCP87PTH2QZ1CEUKKx+qL7c5tvNgFIMwdcUOo9Ey+wobtKSzEbfp 7xQ8XBeUSUuMKqZZzukMogpjqFBK3tn9FWx84mlIXtXuFmOFpNS2OfDrxsETZw== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 1AA32F6E0; Fri, 28 Jan 2022 17:34:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Fri, 28 Jan 2022 09:34:20 -0800 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: git: 779fd0534466 - main - ifconfig: improve vlan options parsing Content-Language: en-US To: "Alexander V. Chernikov" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202201170935.20H9ZOpr069571@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202201170935.20H9ZOpr069571@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643391262; 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=lmQnMI/4fBZwspK/3scVqbc/R8019oddL70Z8hjx8hI=; b=tBIwvjL9cGwxnVn1lqfyIydzAw++jRemOCdcPewCPZDKCyptlxD2OUUVryslZJ8RWbxepY NxL5IUQ+O9E8eITOCr/h0dIyZ19wl/DUigAzb7nA/wqUF4W64R//cZ4OqPs7e5XL9KZdm/ m9MzkuYflhfR+6JZq99nrsGWRdEkh3F6DPMHsWYhFCn82vLoQqoerJ8JbSfeY/USjX3L76 4LqvdHzsk75F8AD1IpL6Qm8gZFi+nI3XjPwZKXW5uVXUiwCfG/2kptVX185jhrZ6Z8pGr7 P1r5N83By82wXnYv1esvIZrBCr2VTpubZKUoyhQ3ndWXEHKoCZk+AZdInzvLJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643391262; a=rsa-sha256; cv=none; b=RHAphjFtW2/4Crcg7yGoJrtBw6QVhzz3Dxi/V3Iq4OAsPC/kprxVcZ0EFfKWq2Bt1kymN/ f9kLzaWinxKWIL3gsm0dLPKEyJDoDrUzAwU1QDNqsfaIeNvX6urf2C30gkfkVcSRmUb941 creIXlZFJ7pQQvf1AjRGxF6/xI10O0cPsPAsOmvCaPM8R4Tz18qFiPTRmfoWiX9j/t4RGP 7AaTA/K8V5HiUXma/d6XQl3bHuYGDRfpDvZ0AZru0gDpqTXXFU8lRnwICAyVJMg82ijfRs VLdMTSO71lMxJGti9kj5v2Cwqx+2E9aB4KY/tXufu+6HuoOE9oFgv3jWwKn3iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 1/17/22 1:35 AM, Alexander V. Chernikov wrote: > The branch main has been updated by melifaro: > > URL: https://cgit.FreeBSD.org/src/commit/?id=779fd05344662aeec79c29470258bf657318eab3 > > commit 779fd05344662aeec79c29470258bf657318eab3 > Author: Alexander V. Chernikov > AuthorDate: 2022-01-17 09:30:26 +0000 > Commit: Alexander V. Chernikov > CommitDate: 2022-01-17 09:35:15 +0000 > > ifconfig: improve vlan options parsing > > PR: 261136 > Reported by: Daniel O'Connor > MFC after: 2 weeks > --- > sbin/ifconfig/ifvlan.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c > index 60f97338ee27..1e74b504fc26 100644 > --- a/sbin/ifconfig/ifvlan.c > +++ b/sbin/ifconfig/ifvlan.c > @@ -144,8 +139,20 @@ vlan_parse_ethervid(const char *name) > if ((*cp != '\0') || (vid & ~0xFFF)) > errx(1, "invalid vlan tag"); > > - strlcpy(params.vlr_parent, ifname, IFNAMSIZ); > - params.vlr_tag = (vid & 0xFFF); > + /* > + * allow "devX.Y vlandev devX vlan Y" syntax > + */ > + if (params.vlr_tag == NOTAG || params.vlr_tag == vid) > + params.vlr_tag = vid; > + else > + errx(1, "ambiguous vlan specification"); > + > + /* Restrict overriding interface name */ > + if (params.vlr_parent[0] == '\0' || !strcmp(params.vlr_parent, ifname)) > + strlcpy(params.vlr_parent, ifname, IFNAMSIZ); > + else > + errx(1, "ambiguous vlan specification"); > + printf("CR: %s %d\n", params.vlr_parent, params.vlr_tag); Did you mean to leave this printf in? I see it when adding a vlan interface now: root@frodo:~ # ifconfig cxl0.200 create CR: cxl0 200 -- John Baldwin