From nobody Mon Jul 15 17:43:43 2024 X-Original-To: dev-commits-src-main@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 4WN8h02x87z5RMrZ; Mon, 15 Jul 2024 17:43:44 +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 4WN8h016vJz4J5l; Mon, 15 Jul 2024 17:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721065424; 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=xaQhgrzg/ocb5pXKRVxhzYQc665x/8dGTPJc8Ser2YY=; b=P3MJwMbnL8oGU/NjdnHzwNiUejdWtVdZpb8NsvujkHscLA2SBarGoz5AojiFzFa77KbaAl /RScpqJrpzyOinv9KFoo5YhiOi+A8lKmbehJZU9MYpbt2XGWEIVQxIjnRaKqo1/ZxSEKOj 9y+2N5lZdDK53Lvn044kcgLat2//tluaB4MlhNosbTOv4jqNtAXQ1UJ8/mtNl71vJZH8IB O0NUAwuiT9g1cTVN7byJn28Q4SGKkZ4uZmNIQg4p3Iv6SMWZANiP7x6hJ8TcsUBGE9s6OQ 7tn/sMHt1lWlKCgSunnnELG9US4H4VqUPWMKFyfA+uAkTnVlbNPCbEnJ4XGNng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721065424; a=rsa-sha256; cv=none; b=bQUEF9HEIGQUqubHULRvYV+3SHIu1KhnhoubgCMw19O/pPaJOonWCnimW2HPYtHcjWcGrQ HHuNasQXChDz+7lgL8rOhTYbH/AisB3H1P6WcMQD8EFttNcuIVrKmDZ/H/G2q0VE36Gj0L /jVydpZLEPAyklv3WIQ1lOfqMv+PT5bmsWlpWkbfEjgx5FwrQ6i8lTzcEPFWlwNPHHXr4w EHhHJzijHKaVwITnCWvomSWXwXAGog8JAo9oKnTlU8QJQwwJsRgES+aKeQJu5H9pluWwhe zYsvIRVviY3ypcfApTny2Jk8ZMyHI5dMExLw3mxg80uk2MJsvyEkCksainMeTA== 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=1721065424; 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=xaQhgrzg/ocb5pXKRVxhzYQc665x/8dGTPJc8Ser2YY=; b=sL5q2C4KB20vNbDpP/4qotAMObMVno+stL1c3Iy4A7WGngsJY+5joDS/jM1UNPnDVZSuHy A+2f6W67/SdX7Yda0rCSzfPZtW5JmlDcjX0GsTlPqVZmQsAeaqLTvlIVvXrq3G6zZCQlvu InaSgniL1AATFUYCbIvLgVLAndZ9tGdd4Y8kUqtBunp3SH7qAOk4LMfC2vyG0BclL6NCnP CwXdpohJOMPCc9QQXx+haKEDbP45bI4FWStoXac/Rej52eg4ZpydCEAwaBb1WS4OU+LWaX BUegGRQBbC/LqzkPidZT+oyiyoltD0KZ3gIfj0XQzG8/xd2c3rLc1nbGgkphKA== 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 4WN8h00kJJz12js; Mon, 15 Jul 2024 17:43:44 +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 46FHhin5086135; Mon, 15 Jul 2024 17:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FHhhaS086132; Mon, 15 Jul 2024 17:43:43 GMT (envelope-from git) Date: Mon, 15 Jul 2024 17:43:43 GMT Message-Id: <202407151743.46FHhhaS086132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: ac6dc5cde729 - main - dhclient: Ignore SIP servers DHCP option defined in RFC 3361 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ac6dc5cde729a602252a0b80f82424861d2eb7b5 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6dc5cde729a602252a0b80f82424861d2eb7b5 commit ac6dc5cde729a602252a0b80f82424861d2eb7b5 Author: Yuichiro NAITO AuthorDate: 2024-07-04 07:57:02 +0000 Commit: Michael Osipov CommitDate: 2024-07-15 17:42:17 +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 --- 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