Skip to contentSkip to conversation

netfilter: add my copyright statements

PATCH New Pablo Neira Ayuso 1 participant 1 message Apr 19, 2013

Subsystems (3)
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 netfilter: add my copyright statements

From: Patrick McHardy <[email protected]>

Add copyright statements to all netfilter files which have had significant changes done by myself in the past.

Some notes:

- nf_conntrack_ecache.c was incorrectly attributed to Rusty and Netfilter Core Team when it got split out of nf_conntrack_core.c. The copyrights even state a date which lies six years before it was written. It was written in 2005 by Harald and myself.

- net/ipv{4,6}/netfilter.c, net/netfitler/nf_queue.c were missing copyright statements. I've added the copyright statement from net/netfilter/core.c, where this code originated

- for nf_conntrack_proto_tcp.c I've also added Jozsef, since I didn't want it to give the wrong impression

---

Resending this patch, it seems the email client has trimmed off part of the patch due to enconding issues with the copyright symbol that appears in several headers.

 net/ipv4/netfilter.c                                  |    7 ++++++-
 net/ipv4/netfilter/arp_tables.c                       |    1 +
 net/ipv4/netfilter/ip_tables.c                        |    1 +
 net/ipv4/netfilter/ipt_ULOG.c                         |    1 +
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c        |    1 +
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c |    1 +
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c          |    1 +
 net/ipv4/netfilter/nf_nat_h323.c                      |    1 +
 net/ipv4/netfilter/nf_nat_pptp.c                      |    2 ++
 net/ipv4/netfilter/nf_nat_proto_gre.c                 |    2 ++
 net/ipv4/netfilter/nf_nat_snmp_basic.c                |    2 ++
 net/ipv6/netfilter.c                                  |    6 ++++++
 net/ipv6/netfilter/ip6_tables.c                       |    1 +
 net/ipv6/netfilter/ip6t_REJECT.c                      |    2 ++
 net/netfilter/core.c                                  |    1 +
 net/netfilter/nf_conntrack_amanda.c                   |    1 +
 net/netfilter/nf_conntrack_core.c                     |    1 +
 net/netfilter/nf_conntrack_ecache.c                   |    8 +++++---
 net/netfilter/nf_conntrack_expect.c                   |    1 +
 net/netfilter/nf_conntrack_ftp.c                      |    1 +
 net/netfilter/nf_conntrack_h323_main.c                |    1 +
 net/netfilter/nf_conntrack_helper.c                   |    1 +
 net/netfilter/nf_conntrack_irc.c                      |    1 +
 net/netfilter/nf_conntrack_pptp.c                     |    2 ++
 net/netfilter/nf_conntrack_proto.c                    |    1 +
 net/netfilter/nf_conntrack_proto_gre.c                |    1 +
 net/netfilter/nf_conntrack_proto_sctp.c               |    3 +++
 net/netfilter/nf_conntrack_proto_tcp.c                |    2 ++
 net/netfilter/nf_conntrack_proto_udp.c                |    1 +
 net/netfilter/nf_conntrack_standalone.c               |    1 +
 net/netfilter/nf_conntrack_tftp.c                     |    2 +-
 net/netfilter/nf_nat_amanda.c                         |    1 +
 net/netfilter/nf_nat_helper.c                         |    1 +
 net/netfilter/nf_queue.c                              |    5 +++++
 net/netfilter/nfnetlink_log.c                         |    1 +
 net/netfilter/x_tables.c                              |    1 +
 net/netfilter/xt_TCPMSS.c                             |    1 +
 net/netfilter/xt_conntrack.c                          |    1 +
 net/netfilter/xt_hashlimit.c                          |    1 +
 net/netfilter/xt_limit.c                              |    1 +
 40 files changed, 66 insertions(+), 5 deletions(-)
net/ipv4/netfilter.c +6 -1
index 8b201e8..c3e0ade 100644
@@ -1,4 +1,9 @@
-/* IPv4 specific functions of netfilter core */
+/*
+ * IPv4 specific functions of netfilter core
+ *
+ * Rusty Russell (C) 2000 -- This code is GPL.
+ * Patrick McHardy (C) 2006-2012
+ */
 #include <linux/kernel.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
net/ipv4/netfilter/arp_tables.c +1 -0
index 7dc6a97..85a4f21 100644
@@ -6,6 +6,7 @@
  * Some ARP specific bits are:
  *
  * Copyright (C) 2002 David S. Miller ([email protected])
+ * Copyright (C) 2006-2009 Patrick McHardy <[email protected]>
  *
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
net/ipv4/netfilter/ip_tables.c +1 -0
index e391db1..d23118d 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
  * Copyright (C) 2000-2005 Netfilter Core Team <[email protected]>
+ * Copyright (C) 2006-2010 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/ipv4/netfilter/ipt_ULOG.c +1 -0
index 8799c83..f8a222cb 100644
@@ -4,6 +4,7 @@
  * (C) 2000-2004 by Harald Welte <[email protected]>
  * (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
+ * (C) 2005-2007 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c +1 -0
index 2820aa1..567d841 100644
@@ -1,6 +1,7 @@
 
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +1 -0
index f2ca127..4c48e43 100644
@@ -2,6 +2,7 @@
  *
  * (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2006 Netfilter Core Team <[email protected]>
+ * (C) 2006-2010 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/ipv4/netfilter/nf_conntrack_proto_icmp.c +1 -0
index c2cd63d..a338dad 100644
@@ -1,5 +1,6 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
+ * (C) 2006-2010 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/ipv4/netfilter/nf_nat_h323.c +1 -0
index 9c3db10..9eea059d 100644
@@ -2,6 +2,7 @@
  * H.323 extension for NAT alteration.
  *
  * Copyright (c) 2006 Jing Min Zhao <[email protected]>
+ * Copyright (c) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This source code is licensed under General Public License version 2.
  *
net/ipv4/netfilter/nf_nat_pptp.c +2 -0
index a06d7d7..657d230 100644
@@ -13,6 +13,8 @@
  *
  * Development of this code funded by Astaro AG (http://www.astaro.com/)
  *
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
+ *
  * TODO: - NAT to a unique tuple, not to TCP source port
  * 	   (needs netfilter tuple reservation)
  */
net/ipv4/netfilter/nf_nat_proto_gre.c +2 -0
index ea44f02..690d8901 100644
@@ -21,6 +21,8 @@
  *
  * Development of this code funded by Astaro AG (http://www.astaro.com/)
  *
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
+ *
  */
 
 #include <linux/module.h>
net/ipv4/netfilter/nf_nat_snmp_basic.c +2 -0
index bac7122..5f011cc 100644
@@ -38,6 +38,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  * Author: James Morris <[email protected]>
+ *
+ * Copyright (c) 2006-2010 Patrick McHardy <[email protected]>
  */
 #include <linux/module.h>
 #include <linux/moduleparam.h>
net/ipv6/netfilter.c +6 -0
index fc5fbd7..72836f4 100644
@@ -1,3 +1,9 @@
+/*
+ * IPv6 specific functions of netfilter core
+ *
+ * Rusty Russell (C) 2000 -- This code is GPL.
+ * Patrick McHardy (C) 2006-2012
+ */
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/ipv6.h>
net/ipv6/netfilter/ip6_tables.c +1 -0
index 8861b1e..44400c2 100644
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
  * Copyright (C) 2000-2005 Netfilter Core Team <[email protected]>
+ * Copyright (c) 2006-2010 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/ipv6/netfilter/ip6t_REJECT.c +2 -0
index ed3b427..70f9abc 100644
@@ -7,6 +7,8 @@
  * Authors:
  *	Yasuyuki Kozakai	<[email protected]>
  *
+ * Copyright (c) 2005-2007 Patrick McHardy <[email protected]>
+ *
  * Based on net/ipv4/netfilter/ipt_REJECT.c
  *
  * This program is free software; you can redistribute it and/or
net/netfilter/core.c +1 -0
index 7d97302..07c865a 100644
@@ -5,6 +5,7 @@
  * way.
  *
  * Rusty Russell (C)2000 -- This code is GPL.
+ * Patrick McHardy (c) 2006-2012
  */
 #include <linux/kernel.h>
 #include <linux/netfilter.h>
net/netfilter/nf_conntrack_amanda.c +1 -0
index dbdaa11..b8b95f4 100644
@@ -2,6 +2,7 @@
  *
  * (C) 2002 by Brian J. Murrell <[email protected]>
  * based on HW's ip_conntrack_irc.c as well as other modules
+ * (C) 2006 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
net/netfilter/nf_conntrack_core.c +1 -0
index 007e8c4..0cd9cf2 100644
@@ -5,6 +5,7 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2006 Netfilter Core Team <[email protected]>
  * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+ * (C) 2005-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_ecache.c +5 -3
index b5d2eb8..1df1761 100644
@@ -1,8 +1,10 @@
 /* Event cache for netfilter. */
 
-/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2006 Netfilter Core Team <[email protected]>
- * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+/*
+ * (C) 2005 Harald Welte <[email protected]>
+ * (C) 2005 Patrick McHardy <[email protected]>
+ * (C) 2005-2006 Netfilter Core Team <[email protected]>
+ * (C) 2005 USAGI/WIDE Project <http://www.linux-ipv6.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_expect.c +1 -0
index 8c10e3d..7684263 100644
@@ -3,6 +3,7 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2006 Netfilter Core Team <[email protected]>
  * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+ * (c) 2005-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_ftp.c +1 -0
index 62fb8fa..6b21707 100644
@@ -3,6 +3,7 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
  * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_h323_main.c +1 -0
index 7df7b36..bdebd03 100644
@@ -2,6 +2,7 @@
  * H.323 connection tracking helper
  *
  * Copyright (c) 2006 Jing Min Zhao <[email protected]>
+ * Copyright (c) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This source code is licensed under General Public License version 2.
  *
net/netfilter/nf_conntrack_helper.c +1 -0
index a0b1c5c..974a2a4 100644
@@ -3,6 +3,7 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2006 Netfilter Core Team <[email protected]>
  * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_irc.c +1 -0
index 70985c5..0fd2976 100644
@@ -1,6 +1,7 @@
 /* IRC extension for IP connection tracking, Version 1.21
  * (C) 2000-2002 by Harald Welte <[email protected]>
  * based on RR's ip_conntrack_ftp.c
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
net/netfilter/nf_conntrack_pptp.c +2 -0
index e6678d2..7bd03de 100644
@@ -11,6 +11,8 @@
  *
  * Development of this code funded by Astaro AG (http://www.astaro.com/)
  *
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
+ *
  * Limitations:
  * 	 - We blindly assume that control connections are always
  * 	   established in PNS->PAC direction.  This is a violation
net/netfilter/nf_conntrack_proto.c +1 -0
index 58ab405..0ab9636 100644
@@ -3,6 +3,7 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2006 Netfilter Core Team <[email protected]>
  * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_proto_gre.c +1 -0
index 155ce9f..9d9c0da 100644
@@ -21,6 +21,7 @@
  *
  * Development of this code funded by Astaro AG (http://www.astaro.com/)
  *
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  */
 
 #include <linux/module.h>
net/netfilter/nf_conntrack_proto_sctp.c +3 -0
index ec83536..1314d33 100644
@@ -1,6 +1,9 @@
 /*
  * Connection tracking protocol helper module for SCTP.
  *
+ * Copyright (c) 2004 Kiran Kumar Immidi <[email protected]>
+ * Copyright (c) 2004-2012 Patrick McHardy <[email protected]>
+ *
  * SCTP is defined in RFC 2960. References to various sections in this code
  * are to this RFC.
  *
net/netfilter/nf_conntrack_proto_tcp.c +2 -0
index f021a20..4d4d8f1 100644
@@ -1,5 +1,7 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
+ * (C) 2002-2013 Jozsef Kadlecsik <[email protected]>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_proto_udp.c +1 -0
index fee4322..9d7721c 100644
@@ -1,5 +1,6 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_standalone.c +1 -0
index ebb67d3..bd700b4 100644
@@ -1,5 +1,6 @@
 /* (C) 1999-2001 Paul `Rusty' Russell
  * (C) 2002-2004 Netfilter Core Team <[email protected]>
+ * (C) 2005-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_conntrack_tftp.c +1 -1
index e9936c8..e68ab4f 100644
@@ -1,5 +1,5 @@
 /* (C) 2001-2002 Magnus Boden <[email protected]>
- *
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
net/netfilter/nf_nat_amanda.c +1 -0
index 3b67c9d..eb77238 100644
@@ -1,6 +1,7 @@
 /* Amanda extension for TCP NAT alteration.
  * (C) 2002 by Brian J. Murrell <[email protected]>
  * based on a copy of HW's ip_nat_irc.c as well as other modules
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
net/netfilter/nf_nat_helper.c +1 -0
index 23c2b38..5fea563 100644
@@ -2,6 +2,7 @@
  *
  * (C) 2000-2002 Harald Welte <[email protected]>
  * (C) 2003-2006 Netfilter Core Team <[email protected]>
+ * (C) 2007-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/nf_queue.c +5 -0
index d812c12..5ccf01e 100644
@@ -1,3 +1,8 @@
+/*
+ * Rusty Russell (C)2000 -- This code is GPL.
+ * Patrick McHardy (c) 2006-2012
+ */
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/init.h>
net/netfilter/nfnetlink_log.c +1 -0
index 1a0be2a..978cea4 100644
@@ -3,6 +3,7 @@
  * nfetlink.
  *
  * (C) 2005 by Harald Welte <[email protected]>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * Based on the old ipv4-only ipt_ULOG.c:
  * (C) 2000-2004 by Harald Welte <[email protected]>
net/netfilter/x_tables.c +1 -0
index 686c771..1a73b18 100644
@@ -2,6 +2,7 @@
  * x_tables core - Backend for {ip,ip6,arp}_tables
  *
  * Copyright (C) 2006-2006 Harald Welte <[email protected]>
+ * Copyright (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * Based on existing ip_tables code which is
  *   Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
net/netfilter/xt_TCPMSS.c +1 -0
index 71a266d..a75240f 100644
@@ -2,6 +2,7 @@
  * This is a module which is used for setting the MSS option in TCP packets.
  *
  * Copyright (C) 2000 Marc Boucher <[email protected]>
+ * Copyright (C) 2007 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
net/netfilter/xt_conntrack.c +1 -0
index 61805d7..188404b9 100644
@@ -3,6 +3,7 @@
  *	information. (Superset of Rusty's minimalistic state match.)
  *
  *	(C) 2001  Marc Boucher ([email protected]).
+ *	(C) 2006-2012 Patrick McHardy <[email protected]>
  *	Copyright © CC Computer Consultants GmbH, 2007 - 2008
  *
  *	This program is free software; you can redistribute it and/or modify
net/netfilter/xt_hashlimit.c +1 -0
index f330e8b..0199e7b 100644
@@ -3,6 +3,7 @@
  *	separately for each hashbucket (sourceip/sourceport/dstip/dstport)
  *
  *	(C) 2003-2004 by Harald Welte <[email protected]>
+ *	(C) 2006-2012 Patrick McHardy <[email protected]>
  *	Copyright © CC Computer Consultants GmbH, 2007 - 2008
  *
  * Development of this code was funded by Astaro AG, http://www.astaro.com/
net/netfilter/xt_limit.c +1 -0
index a4c1e45..bef8505 100644
@@ -1,5 +1,6 @@
 /* (C) 1999 Jérôme de Vivie <[email protected]>
  * (C) 1999 Hervé Eychenne <[email protected]>
+ * (C) 2006-2012 Patrick McHardy <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
Signature · 1 line
1.7.10.4