From nobody Mon Jul 29 06:21:58 2024 X-Original-To: dev-commits-src-branches@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 4WXStt3v69z5RKCt; Mon, 29 Jul 2024 06:21:58 +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 4WXStt31mcz40X4; Mon, 29 Jul 2024 06:21:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722234118; 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=mUyTpmU3XyGgw3lOxAaR3ezrxnuLf14WgbE+IVom5ss=; b=BZy0a34ncqjQapzum4483lff2HFXjg+vz4JReGvTRx83CA5+ocQ5RNaPpdUgiLOqpaPUqC 6UGX9ADAPlp+ZLf0I+hNhlKB4SjHja+PDH23VYXN15ISAwGVN3uxpuwgINQ7VJ8QypxV98 /M6ustTFkft84Z3OUI3Aa9ErEBgYmktzSmqJMblvw6X+OURjHmJb4JGq7ff7DPqUpn8a7R v+eLgXBVBOagwMfBSL09iCV9W6yUlMU6P+Rpmg9Qck3Yk7ezh7deZiY8puId885G8k0Cbv 0c0KRpFTyX19Shk10QhNzXA8fjdiuRJPQyY1nrL8c0iYtbKzR665SuYqx0YJ/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722234118; a=rsa-sha256; cv=none; b=Jxmgpk5bnFXNCzesVGX6ezTgH3PcqskQwz0RF0D3ix+tJEBAkzrTcOrgg6pZKWoMgF7V16 VySAbDVhzOKLhW9hMLy/Z+FTcOrOZuva3tsBEtBH2tZekHkTQFgKKEcElRcFn0zX4tFHOw bjKkmlQQxXAPu9ZW9+9899jH1X6Q+m4sktdljWEIWB5ah2olaCuajQdMXSef1WpQog3qd5 HIVRGrWaIFx2l47JriiamIEmJmMuYaY7TkncppRXHelo8pIAYRYILxDaaZt7AIpxyxqDEw n7jZC1ar6tOciS54Dxh0RF8d7t0bA+a1pXwZgvU/LHp7y+LUIh2bVniho5BM8A== 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=1722234118; 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=mUyTpmU3XyGgw3lOxAaR3ezrxnuLf14WgbE+IVom5ss=; b=DWelx8409A5ldQQGYgfDzh9rMJo8GyPfeIoE5DQAB8vB0CNhxSvVjAt41ubxQIjFGLVZ3+ HAAWqSY3X3Hyyl+SbvfZ4b7J/beaRyThrRhCrdks49sXy0j9rw7zhkOdEwUNlkGBie81cC gD8Heobx0/SmtpfcYrf5LIwPxls7IOOXSu9mkTyv5ynmhi7Hlpg9S2K1Q0Gcz3yF78IeeS y/H/J7Kez/0MCkb94QN8MB7loVdsl6kmqSlNPFA8Muc1CUClT2VQWuXHeWmRV+Q4mvEk9T ImIExkXCxHGayHHN8VDnNcN90AInNYrgMDMhaNnxAH4UMrwkb6XUe1d8yXrmZQ== 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 4WXStt2dL0zNhf; Mon, 29 Jul 2024 06:21:58 +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 46T6LwWI065751; Mon, 29 Jul 2024 06:21:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46T6Lw7M065748; Mon, 29 Jul 2024 06:21:58 GMT (envelope-from git) Date: Mon, 29 Jul 2024 06:21:58 GMT Message-Id: <202407290621.46T6Lw7M065748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: e5236f640510 - stable/13 - dhclient: Ignore SIP servers DHCP option defined in RFC 3361 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5236f64051056eb933c6a53f6f6c2bab62f308a Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=e5236f64051056eb933c6a53f6f6c2bab62f308a commit e5236f64051056eb933c6a53f6f6c2bab62f308a Author: Yuichiro NAITO AuthorDate: 2024-07-04 07:57:02 +0000 Commit: Michael Osipov CommitDate: 2024-07-29 06:21:34 +0000 dhclient: Ignore SIP servers DHCP option defined in RFC 3361 Ignore SIP servers dhcp option to shut up the warning message. This option is defined in the RFC 3361 and sent from NSD-G1000T router. PR: 280119 Reviewed by: jrm (mentor), brooks MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D45873 (cherry picked from commit ac6dc5cde729a602252a0b80f82424861d2eb7b5) --- sbin/dhclient/dhclient.c | 1 + sbin/dhclient/dhcp.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index e7557c4b0bf7..1bdd0eb68f8f 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2609,6 +2609,7 @@ check_option(struct client_lease *l, int option) case DHO_BOOTFILE_NAME: case DHO_DHCP_USER_CLASS_ID: case DHO_URL: + case DHO_SIP_SERVERS: case DHO_END: return (1); case DHO_CLASSLESS_ROUTES: diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h index 300deb464238..99b69613934f 100644 --- a/sbin/dhclient/dhcp.h +++ b/sbin/dhclient/dhcp.h @@ -172,6 +172,7 @@ struct dhcp_packet { #define DHO_DHCP_USER_CLASS_ID 77 #define DHO_URL 114 #define DHO_DOMAIN_SEARCH 119 +#define DHO_SIP_SERVERS 120 #define DHO_CLASSLESS_ROUTES 121 #define DHO_END 255