From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org
Subject: nf-next: a mixed bag
Date: Mon, 3 May 2010 11:51:25 +0200 [thread overview]
Message-ID: <1272880297-11198-1-git-send-email-jengelh@medozas.de> (raw)
Hi,
please leave comments (or merge if ok).
Included:
- two fixes
- things that came up in between
- xt2 preparatory work
thanks,
Jan
The following changes since commit 4b2cbd42bef5a22bb681acd607a7c3fbca1eeb3c:
Jan Engelhardt (1):
netfilter: x_tables: rectify XT_FUNCTION_MAXNAMELEN usage
are available in the git repository at:
git://dev.medozas.de/linux master
Jan Engelhardt (11):
netfilter: ip_tables: fix compilation when debug is enabled
netfilter: xtables: fix incorrect return code
netfilter: xtables: dissolve do_match function
netfilter: xtables: combine struct xt_match_param and xt_target_param
netfilter: xtables: substitute temporary defines by final name
netfilter: xtables: deconstify struct xt_action_param for matches
netfilter: xtables: change hotdrop pointer to direct modification
netfilter: xtables: combine built-in extension structs
netfilter: ebtables: change ebt_basic_match to xt convention
netfilter: xtables: move functions around
netfilter: xtables: convert basic nfproto match functions into xt matches
include/linux/netfilter/x_tables.h | 49 ++---
net/bridge/netfilter/ebt_802_3.c | 2 +-
net/bridge/netfilter/ebt_among.c | 2 +-
net/bridge/netfilter/ebt_arp.c | 2 +-
net/bridge/netfilter/ebt_arpreply.c | 2 +-
net/bridge/netfilter/ebt_dnat.c | 2 +-
net/bridge/netfilter/ebt_ip.c | 2 +-
net/bridge/netfilter/ebt_ip6.c | 2 +-
net/bridge/netfilter/ebt_limit.c | 2 +-
net/bridge/netfilter/ebt_log.c | 2 +-
net/bridge/netfilter/ebt_mark.c | 2 +-
net/bridge/netfilter/ebt_mark_m.c | 2 +-
net/bridge/netfilter/ebt_nflog.c | 2 +-
net/bridge/netfilter/ebt_pkttype.c | 2 +-
net/bridge/netfilter/ebt_redirect.c | 2 +-
net/bridge/netfilter/ebt_snat.c | 2 +-
net/bridge/netfilter/ebt_stp.c | 2 +-
net/bridge/netfilter/ebt_ulog.c | 2 +-
net/bridge/netfilter/ebt_vlan.c | 2 +-
net/bridge/netfilter/ebtables.c | 146 +++++++++------
net/ipv4/netfilter/arp_tables.c | 224 ++++++++++++---------
net/ipv4/netfilter/arpt_mangle.c | 2 +-
net/ipv4/netfilter/ip_tables.c | 342 ++++++++++++++++----------------
net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +-
net/ipv4/netfilter/ipt_ECN.c | 2 +-
net/ipv4/netfilter/ipt_LOG.c | 2 +-
net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +-
net/ipv4/netfilter/ipt_NETMAP.c | 2 +-
net/ipv4/netfilter/ipt_REDIRECT.c | 2 +-
net/ipv4/netfilter/ipt_REJECT.c | 2 +-
net/ipv4/netfilter/ipt_ULOG.c | 2 +-
net/ipv4/netfilter/ipt_addrtype.c | 4 +-
net/ipv4/netfilter/ipt_ah.c | 4 +-
net/ipv4/netfilter/ipt_ecn.c | 4 +-
net/ipv4/netfilter/nf_nat_rule.c | 4 +-
net/ipv6/netfilter/ip6_tables.c | 354 +++++++++++++++++-----------------
net/ipv6/netfilter/ip6t_LOG.c | 2 +-
net/ipv6/netfilter/ip6t_REJECT.c | 2 +-
net/ipv6/netfilter/ip6t_ah.c | 6 +-
net/ipv6/netfilter/ip6t_eui64.c | 4 +-
net/ipv6/netfilter/ip6t_frag.c | 6 +-
net/ipv6/netfilter/ip6t_hbh.c | 6 +-
net/ipv6/netfilter/ip6t_ipv6header.c | 2 +-
net/ipv6/netfilter/ip6t_mh.c | 6 +-
net/ipv6/netfilter/ip6t_rt.c | 6 +-
net/netfilter/xt_CLASSIFY.c | 2 +-
net/netfilter/xt_CONNSECMARK.c | 2 +-
net/netfilter/xt_CT.c | 2 +-
net/netfilter/xt_DSCP.c | 8 +-
net/netfilter/xt_HL.c | 4 +-
net/netfilter/xt_LED.c | 2 +-
net/netfilter/xt_NFLOG.c | 2 +-
net/netfilter/xt_NFQUEUE.c | 4 +-
net/netfilter/xt_NOTRACK.c | 2 +-
net/netfilter/xt_RATEEST.c | 2 +-
net/netfilter/xt_SECMARK.c | 2 +-
net/netfilter/xt_TCPMSS.c | 4 +-
net/netfilter/xt_TCPOPTSTRIP.c | 4 +-
net/netfilter/xt_TEE.c | 4 +-
net/netfilter/xt_TPROXY.c | 2 +-
net/netfilter/xt_TRACE.c | 2 +-
net/netfilter/xt_cluster.c | 2 +-
net/netfilter/xt_comment.c | 2 +-
net/netfilter/xt_connbytes.c | 2 +-
net/netfilter/xt_connlimit.c | 6 +-
net/netfilter/xt_connmark.c | 4 +-
net/netfilter/xt_conntrack.c | 6 +-
net/netfilter/xt_dccp.c | 6 +-
net/netfilter/xt_dscp.c | 6 +-
net/netfilter/xt_esp.c | 4 +-
net/netfilter/xt_hashlimit.c | 4 +-
net/netfilter/xt_helper.c | 2 +-
net/netfilter/xt_hl.c | 4 +-
net/netfilter/xt_iprange.c | 4 +-
net/netfilter/xt_length.c | 4 +-
net/netfilter/xt_limit.c | 2 +-
net/netfilter/xt_mac.c | 2 +-
net/netfilter/xt_mark.c | 4 +-
net/netfilter/xt_multiport.c | 8 +-
net/netfilter/xt_osf.c | 2 +-
net/netfilter/xt_owner.c | 2 +-
net/netfilter/xt_physdev.c | 2 +-
net/netfilter/xt_pkttype.c | 2 +-
net/netfilter/xt_policy.c | 2 +-
net/netfilter/xt_quota.c | 2 +-
net/netfilter/xt_rateest.c | 2 +-
net/netfilter/xt_realm.c | 2 +-
net/netfilter/xt_recent.c | 4 +-
net/netfilter/xt_sctp.c | 6 +-
net/netfilter/xt_socket.c | 6 +-
net/netfilter/xt_state.c | 2 +-
net/netfilter/xt_statistic.c | 2 +-
net/netfilter/xt_string.c | 2 +-
net/netfilter/xt_tcpmss.c | 4 +-
net/netfilter/xt_tcpudp.c | 14 +-
net/netfilter/xt_time.c | 2 +-
net/netfilter/xt_u32.c | 2 +-
net/sched/act_ipt.c | 2 +-
98 files changed, 730 insertions(+), 677 deletions(-)
next reply other threads:[~2010-05-03 9:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 9:51 Jan Engelhardt [this message]
2010-05-03 9:51 ` [PATCH 01/11] netfilter: ip_tables: fix compilation when debug is enabled Jan Engelhardt
2010-05-03 9:51 ` [PATCH 02/11] netfilter: xtables: fix incorrect return code Jan Engelhardt
2010-05-03 9:51 ` [PATCH 03/11] netfilter: xtables: dissolve do_match function Jan Engelhardt
2010-05-03 9:51 ` [PATCH 04/11] netfilter: xtables: combine struct xt_match_param and xt_target_param Jan Engelhardt
2010-05-03 9:51 ` [PATCH 05/11] netfilter: xtables: substitute temporary defines by final name Jan Engelhardt
2010-05-03 9:51 ` [PATCH 06/11] netfilter: xtables: deconstify struct xt_action_param for matches Jan Engelhardt
2010-05-03 9:51 ` [PATCH 07/11] netfilter: xtables: change hotdrop pointer to direct modification Jan Engelhardt
2010-05-03 9:51 ` [PATCH 08/11] netfilter: xtables: combine built-in extension structs Jan Engelhardt
2010-05-03 9:51 ` [PATCH 09/11] netfilter: ebtables: change ebt_basic_match to xt convention Jan Engelhardt
2010-05-03 9:51 ` [PATCH 10/11] netfilter: xtables: move functions around Jan Engelhardt
2010-05-03 9:51 ` [PATCH 11/11] netfilter: xtables: convert basic nfproto match functions into xt matches Jan Engelhardt
2010-05-11 12:59 ` Patrick McHardy
2010-05-11 13:38 ` Jan Engelhardt
2010-05-11 13:45 ` Patrick McHardy
2010-05-11 16:08 ` Jan Engelhardt
2010-05-07 20:11 ` nf-next: a mixed bag Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1272880297-11198-1-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).