From nobody Mon Jul 29 06:20:07 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 4WXSrm11ryz5RKFx; Mon, 29 Jul 2024 06:20:08 +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 4WXSrm0ZgKz40Mf; Mon, 29 Jul 2024 06:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722234008; 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=J8q+f6Z9zWMy8GqKQCBi7PxHX/XRhBF9K80gHjXDZL0=; b=M7aMw/EsZVru1iMyrrjTMB8QQJlaDNqv/Ng/kFjBXTxUvpyTrLypwRP9uPmoUL5Sn+/acD EluNEXJRWLK/vANaB0mc32qSL0IV99XdSx2/Hxqze3KwR7105j0sV5XNq42OOV9ZGRojTB zl4ubCOahtpWmA3yIsxdWZGHQ0N/s4oAtxtWmiCdtToqw3b5S7dwpj1eaT2BFWNMsEu+Db j9RjlslPt+LVX0hEcpm34ZrzdzbB7fwSuHwq2xGGafY+gmASHA0hIwEiyrnAr3PSew1TOn 97S0uhQjK11nAuJa9suM0lZeB0o83GJnBrIA08JhU/UV8hx8pmrMabgxKlK8Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722234008; a=rsa-sha256; cv=none; b=RIbGbJVde189Ghwv7CX35Eh4OzfkbwWFKndnoSLgP3tsTDnHbAxttrJ7Rw1zqBcGu6YQJ1 YMa47lSRK86uijjdCnwic2JvhN/pAdMTMfi5W//SxaI7Ae9CWXCkQQQSvcAvZ9wgUbAZFh 1NVCWwT4GdQi4Z81f7OzJEGuIe9B8196jVbOCmt80nyvdNK3cQD4rW+dtRvHxqB7mo1lYi Rb32jz4O9cs7GNHQUI0JQ+P2++Zv34lCkgN+xG9GhvMmqsB8Pj/oFtRA7ii65PXYzfHNNj Q0MCqYcdR+QySc39X/u0NklTR3wAmaBNONCZVI5nPd3zSYwN5khpnMlFCvHCfw== 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=1722234008; 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=J8q+f6Z9zWMy8GqKQCBi7PxHX/XRhBF9K80gHjXDZL0=; b=fX7Ph7f0g3Ntf38ArLqFVBHABvoojpxKFo0lboCzfQ+vhQxb5s48r2olwy0Yb4mc0jDpii AvJfWRjjvrLeODzM+TxUGcCY6FaoKHklAhSlVIu39zZaEW87m4FCQCiIQAxIwxxa82JqLO LKmNfMJJ7Vo1OcJAKdhNbqhSwonel7o64/kRdV8TiSgHdVDruMFwyaQWVVuOOk1uBhzFxW p8E/XjQy+G2BqjJkWLt32/uOqHerMJabncCS1mONw8L126JXQUG8Q9lYtSPaQdJrq+XAkB wgaJ7rA8b55CPBpmRpSUvm4kOdGjPD1y1nI3fUEJ1yd1nN5zgM/AQWE9cLeoaw== 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 4WXSrm09lQzN0l; Mon, 29 Jul 2024 06:20:08 +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 46T6K7hr053676; Mon, 29 Jul 2024 06:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46T6K7Fn053671; Mon, 29 Jul 2024 06:20:07 GMT (envelope-from git) Date: Mon, 29 Jul 2024 06:20:07 GMT Message-Id: <202407290620.46T6K7Fn053671@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: 954692a14402 - stable/14 - dhclient: Ignore SIP servers DHCP option defined in RFC 3361 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 954692a144026860579cc525b5aa824b75719d6a Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=954692a144026860579cc525b5aa824b75719d6a commit 954692a144026860579cc525b5aa824b75719d6a Author: Yuichiro NAITO AuthorDate: 2024-07-04 07:57:02 +0000 Commit: Michael Osipov CommitDate: 2024-07-29 06:19:41 +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 8179a5c34209..62e55eb4d01f 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2618,6 +2618,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