From patchwork Sun Jun 30 23:54:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 255954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D70502C02A8 for ; Mon, 1 Jul 2013 09:54:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751128Ab3F3Xyu (ORCPT ); Sun, 30 Jun 2013 19:54:50 -0400 Received: from mail.us.es ([193.147.175.20]:59852 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751088Ab3F3Xyt (ORCPT ); Sun, 30 Jun 2013 19:54:49 -0400 Received: (qmail 15929 invoked from network); 1 Jul 2013 01:54:48 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 1 Jul 2013 01:54:48 +0200 Received: (qmail 22335 invoked by uid 507); 30 Jun 2013 23:54:46 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17440. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.2/7.5):. Processed in 1.813119 secs); 30 Jun 2013 23:54:46 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-97.2 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL,RDNS_DYNAMIC,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 30 Jun 2013 23:54:44 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/410/antivirus1); Mon, 01 Jul 2013 01:54:44 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus1) Received: (qmail 13965 invoked from network); 1 Jul 2013 01:54:45 +0200 Received: from 114.235.78.188.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@188.78.235.114) by us.es with SMTP; 1 Jul 2013 01:54:45 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 00/12] netfilter updates for net-next Date: Mon, 1 Jul 2013 01:54:29 +0200 Message-Id: <1372636481-3705-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Hi David, The following batch contains Netfilter/IPVS updates for net-next, they are: * Enforce policy to several nfnetlink subsystem, from Daniel Borkmann. * Use xt_socket to match the third packet (to perform simplistic socket-based stateful filtering), from Eric Dumazet. * Avoid large timeout for picked up from the middle TCP flows, from Florian Westphal. * Exclude IPVS from struct net if IPVS is disabled and removal of unnecessary included header file, from JunweiZhang. * Release SCTP connection immediately under load, to mimic current TCP behaviour, from Julian Anastasov. * Replace and enhance SCTP state machine, from Julian Anastasov. * Add tweak to reduce sync traffic in the presence of persistence, also from Julian Anastasov. * Add tweak for the IPVS SH scheduler not to reject connections directed to a server, choose a new one instead, from Alexander Frolkin. * Add support for sloppy TCP and SCTP modes, that creates state information on any packet, not only initial handshake packets, from Alexander Frolkin. Please, consider pulling this batch from: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master Thanks! ---------------------------------------------------------------- The following changes since commit fedaf4ffc224a194e2d13a3ec2abe5df0bc94258: ndisc: Convert use of typedef ctl_table to struct ctl_table (2013-06-19 23:18:07 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master for you to fetch changes up to 496e4ae7dc944faa1721bfda7e9d834d5611a874: netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag (2013-06-30 18:15:48 +0200) ---------------------------------------------------------------- Alexander Frolkin (2): ipvs: sloppy TCP and SCTP ipvs: SH fallback and L4 hashing Daniel Borkmann (1): netfilter: check return code from nla_parse_tested Eric Dumazet (1): netfilter: xt_socket: add XT_SOCKET_NOWILDCARD flag Florian Westphal (2): netfilter: nf_conntrack: avoid large timeout for mid-stream pickup netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag Julian Anastasov (4): ipvs: provide iph to schedulers ipvs: replace the SCTP state machine ipvs: drop SCTP connections depending on state ipvs: add sync_persist_mode flag JunweiZhang (2): kernel: remove unnecessary head file netns: exclude ipvs from struct net when IPVS disabled Documentation/networking/ipvs-sysctl.txt | 13 + include/net/ip_vs.h | 84 ++- include/net/net_namespace.h | 2 + include/uapi/linux/ip_vs.h | 6 + include/uapi/linux/netfilter/nfnetlink_queue.h | 2 + include/uapi/linux/netfilter/xt_socket.h | 7 + kernel/sysctl_binary.c | 1 - net/netfilter/ipvs/ip_vs_conn.c | 12 + net/netfilter/ipvs/ip_vs_core.c | 4 +- net/netfilter/ipvs/ip_vs_ctl.c | 21 + net/netfilter/ipvs/ip_vs_dh.c | 10 +- net/netfilter/ipvs/ip_vs_lblc.c | 12 +- net/netfilter/ipvs/ip_vs_lblcr.c | 12 +- net/netfilter/ipvs/ip_vs_lc.c | 3 +- net/netfilter/ipvs/ip_vs_nq.c | 3 +- net/netfilter/ipvs/ip_vs_proto_sctp.c | 860 +++++------------------- net/netfilter/ipvs/ip_vs_proto_tcp.c | 14 +- net/netfilter/ipvs/ip_vs_rr.c | 3 +- net/netfilter/ipvs/ip_vs_sed.c | 3 +- net/netfilter/ipvs/ip_vs_sh.c | 108 ++- net/netfilter/ipvs/ip_vs_sync.c | 19 +- net/netfilter/ipvs/ip_vs_wlc.c | 3 +- net/netfilter/ipvs/ip_vs_wrr.c | 3 +- net/netfilter/nf_conntrack_netlink.c | 30 +- net/netfilter/nf_conntrack_proto_tcp.c | 6 + net/netfilter/nfnetlink_cthelper.c | 16 +- net/netfilter/nfnetlink_cttimeout.c | 6 +- net/netfilter/nfnetlink_queue_core.c | 16 +- net/netfilter/xt_socket.c | 70 +- 29 files changed, 529 insertions(+), 820 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html