From owner-svn-src-all@freebsd.org Sat Oct 24 10:31:44 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1649FA1B9E5; Sat, 24 Oct 2015 10:31:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C96E014D3; Sat, 24 Oct 2015 10:31:43 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 1C15425D3A02; Sat, 24 Oct 2015 10:31:30 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id E5361C7705F; Sat, 24 Oct 2015 10:31:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id 59zyFJeXM6h2; Sat, 24 Oct 2015 10:31:28 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4410:e5ab:ebfb:e904:2055] (unknown [IPv6:fde9:577b:c1a9:4410:e5ab:ebfb:e904:2055]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 60D84C76FE9; Sat, 24 Oct 2015 10:31:26 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: svn commit: r289350 - head/sys/netinet From: "Bjoern A. Zeeb" In-Reply-To: <20151016123139.GX1023@FreeBSD.org> Date: Sat, 24 Oct 2015 10:31:07 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201510150144.t9F1iWdo089946@repo.freebsd.org> <20151016123139.GX1023@FreeBSD.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.2104) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 10:31:44 -0000 > On 16 Oct 2015, at 12:31 , Gleb Smirnoff wrote: >=20 > On Thu, Oct 15, 2015 at 01:44:32AM +0000, Bjoern A. Zeeb wrote: > B> Author: bz > B> Date: Thu Oct 15 01:44:32 2015 > B> New Revision: 289350 > B> URL: https://svnweb.freebsd.org/changeset/base/289350 > B>=20 > B> Log: > B> Hopefully also unbreak VIMAGE kernels replacing the &V_... with > B> &VNET_NAME(...). > B> Everything else is just a whitespace wrapping change. > B>=20 > B> Modified: > B> head/sys/netinet/tcp_pcap.c > B>=20 > B> Modified: head/sys/netinet/tcp_pcap.c > B> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > B> --- head/sys/netinet/tcp_pcap.c Thu Oct 15 01:09:14 2015 = (r289349) > B> +++ head/sys/netinet/tcp_pcap.c Thu Oct 15 01:44:32 2015 = (r289350) > B> @@ -70,9 +70,9 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_ > B> =20 > B> VNET_DEFINE(int, tcp_pcap_packets) =3D 0; > B> #define V_tcp_pcap_packets VNET(tcp_pcap_packets) > B> -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_pcap_packets, CTLFLAG_RW, > B> - &V_tcp_pcap_packets, 0, "Default number of packets saved per = direction " > B> - "per TCPCB"); > B> +SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcp_pcap_packets, > B> + CTLFLAG_RW, &VNET_NAME(tcp_pcap_packets), 0, > B> + "Default number of packets saved per direction per TCPCB"); >=20 > It also lacks CTLFLAG_VNET flag. Will panic on write now. Yeah, I had followed up on that in PB (not checked what happened since = yet). The real question is whether this should be allowed to be changed from = within a VNET as that opens the machine up to a local DoS if you ask me. The above was just to make it compile again and make GENERIC work. Bjoern=