From nobody Tue Aug 30 02:24:57 2022 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 4MGrk12qYgz4bHsc; Tue, 30 Aug 2022 02:24:57 +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 4MGrk11hfPz436t; Tue, 30 Aug 2022 02:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661826297; 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=5Mgbhu5H54tvwyuCS+rOimbX3v1SRvlEVF5Ct9AoYXg=; b=YkAJvNXfe+Bi3Iips8Rf0ZkQLjgWLLb6exs6JXmcAdFufHqd4M4R45LG1G7WKKI1R9qEM6 sWGG1j+PXanlR8GqkTesWJfLuYEHrCiVjJkvbwDTpjEHO3EbWsPin1bow3FunUX0QxSU/1 8bHBtAQtb2qzmNkg/A6hIopmOaEiHpfq/i9XgEjI2L4g8XCHZK/uq97N0/VMYDFpPWdfL3 NGXJpUlRYKWIb4E8kokYIXpOJEFB6k4K1GJm6wvDQITxZEhsDVxtOggA65byO+fnWm4IvS iBJp5cEhS9HwCNkVs6XUXhYj6JEzGj6QfZHAkEB9D/Ky9i3lsSLcBGGULmPyOA== 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 4MGrk10l39zdTN; Tue, 30 Aug 2022 02:24:57 +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 27U2OvJV008149; Tue, 30 Aug 2022 02:24:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27U2Ovpn008148; Tue, 30 Aug 2022 02:24:57 GMT (envelope-from git) Date: Tue, 30 Aug 2022 02:24:57 GMT Message-Id: <202208300224.27U2Ovpn008148@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: 8fc80638496e - main - divert: merge div_output() into div_send() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 8fc80638496e620519b2585d9fab409494ea4b43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661826297; 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=5Mgbhu5H54tvwyuCS+rOimbX3v1SRvlEVF5Ct9AoYXg=; b=N8n3lQ1Xebu2XtZViUpRVMiwIaX6E8wnIHe+dSp5FcKZS3L/3Prp45v1/NdzXdYf/W3BcV KlT4d0glUuFrTkhSuMh6eQwBGmWItetDgbukUfHizz2R7s7kMOdI0tz0KvAAdce7HJT72i Vyr0t61NZfxYRYob1HmOGgk5EHyvEKxwGLIhN749m2OEVX+GOKXB+BlQBQ3/1Bf7kAV2KK NX9x7UGpMEVbsFuM81PEE5nX+aL+xEHBhW1zWhzPd5p6MP/1G+Rrt+AORj+eA9Pt3kCjSv vgcqo5J1oczVy+myWEFO+NTpfwGD19qGEhWfaW2ZcOzfk7HSvJVOqdZgfstNhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661826297; a=rsa-sha256; cv=none; b=mxhV3Eswuyfpet5fflwvjNJ4pH71aGdqSvhH7cksO3TmfpBKsGcuAEY0qsUjgNoFurDcCV FkSaFYTLnBmgYy0R8UVU97IGj/TjcyqbxEQ9i09a+HbCVa8yNd1s6KaM49ZyvxUjY8yOw4 de03Ba1KcBnWoMbHnEPu6lE+UCaLiuSawwHSarX1uWrc6gw4DFkZx0TbuJVMkYdjV2BHs2 BZUgaBTO9nyCGDbyEdVqq/UsAr8BbnIVwihW7iFv5d7KYBSLgWlz65D710RYNKu/XcN11Q f+x8Rs0Xg42L8VsDk43fb/ZI+HSQ3TdMizHywfZ3xP9FixLBSz02JUE3MMVYvQ== 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=8fc80638496e620519b2585d9fab409494ea4b43 commit 8fc80638496e620519b2585d9fab409494ea4b43 Author: Gleb Smirnoff AuthorDate: 2022-08-30 02:15:01 +0000 Commit: Gleb Smirnoff CommitDate: 2022-08-30 02:15:01 +0000 divert: merge div_output() into div_send() No functional change intended. --- sys/netinet/ip_divert.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index b4730b069fc1..d14ec5190ad0 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -293,18 +293,25 @@ divert_packet(struct mbuf *m, bool incoming) * the interface with that address. */ static int -div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin, - struct mbuf *control) +div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, + struct mbuf *control, struct thread *td) { struct epoch_tracker et; + struct sockaddr_in *sin = (struct sockaddr_in *)nam; const struct ip *ip; struct m_tag *mtag; struct ipfw_rule_ref *dt; int error, family; - if (control) { - m_freem(control); /* XXX */ - control = NULL; + if (control) + m_freem(control); + + /* Packet must have a header (but that's about it) */ + if (m->m_len < sizeof (struct ip) && + (m = m_pullup(m, sizeof (struct ip))) == NULL) { + KMOD_IPSTAT_INC(ips_toosmall); + m_freem(m); + return (EINVAL); } if (sin != NULL) { @@ -634,25 +641,6 @@ div_shutdown(struct socket *so) return 0; } -static int -div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, - struct mbuf *control, struct thread *td) -{ - - /* Packet must have a header (but that's about it) */ - if (m->m_len < sizeof (struct ip) && - (m = m_pullup(m, sizeof (struct ip))) == NULL) { - KMOD_IPSTAT_INC(ips_toosmall); - if (control != NULL) - m_freem(control); - m_freem(m); - return EINVAL; - } - - /* Send packet */ - return div_output(so, m, (struct sockaddr_in *)nam, control); -} - static int div_pcblist(SYSCTL_HANDLER_ARGS) {