From nobody Tue Aug 30 23:24:55 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 4MHNgr18fnz4bYBm; Tue, 30 Aug 2022 23:24:56 +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 4MHNgr0RkDz3qkS; Tue, 30 Aug 2022 23:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661901896; 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=5XizrN5L0hW0T1fe5xxtlBwkQN2snsb1CFlvE60kmJ4=; b=cUhbplMM8Dn78YLfNijuIHCY8mL+dKxJcqc1jg/F/n9d3U3lXlnDAqJoBCiXqQQQWGcEqL tyXFlzTQGiKW71aBYIdvtzwUZKkhegG5xLh4zt3frnd0s/k5SNpmmpbR+Dms1OwDZRAkwO sexKlYWdONO4yipDXmA3h5GZueoHoF2oDIl27uXo9yDS/ANi/XSKAS4p6Kb/zXm9y/v6zw ElYI5xLUcORBt17RtoOXR7TwFLH6MpUxuT+YoWRug6rW8epOv3SChqtf6SILj/2EqV0dLF w9u6UuiAzjN1Lxu14a4XCcLWHjJ/ykaCQCOVYuDoHk81gaWxYbkAQg8tlFxUlg== 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 4MHNgq6ZWtzwYt; Tue, 30 Aug 2022 23:24:55 +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 27UNOtwU073179; Tue, 30 Aug 2022 23:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UNOtRL073178; Tue, 30 Aug 2022 23:24:55 GMT (envelope-from git) Date: Tue, 30 Aug 2022 23:24:55 GMT Message-Id: <202208302324.27UNOtRL073178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1df08e905a0b - main - natd: use PF_DIVERT/SOCK_RAW instead of PF_INET/SOCK_RAW/IPPROTO_DIVERT 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1df08e905a0b093bd05ac93761bacabc92171629 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661901896; 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=5XizrN5L0hW0T1fe5xxtlBwkQN2snsb1CFlvE60kmJ4=; b=CIh/bkaXW62tUb7FcQSHBikD7eNQB1Tlyi0PZDD1XoBNnXB8T5GCBJlwc5eo3o5QhPmZZP 82bh523/qDIsHMLOoU31Ig5VGjsd4NoB+0JB0Gy1tUrLEI//XEKuExnnqc4RHznmoDsRle t0pPGRMlm4jr4IqgUmtHF4zP+WmtSkEj2R3HcKQurotJIZGw5WOfHr/B0g8JljMYnnmphB Sgy061Uw4J4LQPvo6WMRcrfIk4UsNuJ1pV7jz6e2joqOMUWdLX2m2GDki8nyxLM3ruSMZv 9iEZI6ZUOOfHMaBPKSYpGTmBFk3CW3Hca3AImInfS0+UOEWc2pCx5tFMvTAsDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661901896; a=rsa-sha256; cv=none; b=FdagvJg89rPJa+EuBj20CLyIUlz6GgAv3dTtYXQK9D+3gjdouUTigkKv/Q+mVAUWa2uxve sEf4on/YMMjYZFSt+icOgvzrTQrMaBasA+J+hRevLW2oH9mzLYNrHYnF+B2hYbWyT6KH34 OaYKM1XZkpP9hyoonfWV+lrSiIdac9jHBF/vemdWjJw8D4gFTOZoTo3r3KA4/e7bSfJGyF HH+Y/xNylqV8y4r5mK1GE9pB0f9BYHazgjwH5uzo0bH8aNnP1ekBfbJuKkj9EicvK7HJFr 92+s8OkPhhMjL6hj6s1lUm9/YaCzqaL3H7xjptHGuAIM5g7jwrwHE+phpDWZcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1df08e905a0b093bd05ac93761bacabc92171629 commit 1df08e905a0b093bd05ac93761bacabc92171629 Author: Gleb Smirnoff AuthorDate: 2022-08-30 23:21:19 +0000 Commit: Gleb Smirnoff CommitDate: 2022-08-30 23:24:37 +0000 natd: use PF_DIVERT/SOCK_RAW instead of PF_INET/SOCK_RAW/IPPROTO_DIVERT --- sbin/natd/natd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c index 402c430dfdfd..599a5247ac85 100644 --- a/sbin/natd/natd.c +++ b/sbin/natd/natd.c @@ -226,7 +226,7 @@ int main (int argc, char** argv) */ if (mip->inOutPort) { - mip->divertInOut = socket (PF_INET, SOCK_RAW, IPPROTO_DIVERT); + mip->divertInOut = socket(PF_DIVERT, SOCK_RAW, 0); if (mip->divertInOut == -1) Quit ("Unable to create divert socket."); if (mip->divertInOut > fdMax) @@ -249,14 +249,14 @@ int main (int argc, char** argv) } else { - mip->divertIn = socket (PF_INET, SOCK_RAW, IPPROTO_DIVERT); + mip->divertIn = socket(PF_DIVERT, SOCK_RAW, 0); if (mip->divertIn == -1) Quit ("Unable to create incoming divert socket."); if (mip->divertIn > fdMax) fdMax = mip->divertIn; - mip->divertOut = socket (PF_INET, SOCK_RAW, IPPROTO_DIVERT); + mip->divertOut = socket(PF_DIVERT, SOCK_RAW, 0); if (mip->divertOut == -1) Quit ("Unable to create outgoing divert socket."); if (mip->divertOut > fdMax) @@ -317,7 +317,7 @@ int main (int argc, char** argv) } if (globalPort) { - divertGlobal = socket (PF_INET, SOCK_RAW, IPPROTO_DIVERT); + divertGlobal = socket(PF_DIVERT, SOCK_RAW, 0); if (divertGlobal == -1) Quit ("Unable to create divert socket."); if (divertGlobal > fdMax)