[netfilter-cvslog] r3289 - in
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6:
include/linux/netfilter include/linux/netfilter/ipv4
include/linux/netfilter/ipv6 net/ipv4/netfilter
net/ipv6/netfilter net/netfilter
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Sat Nov 20 18:37:01 CET 2004
Author: yasuyuki at netfilter.org
Date: 2004-11-20 18:37:00 +0100 (Sat, 20 Nov 2004)
New Revision: 3289
Modified:
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_icmp.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_l3proto.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_sctp.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tuple.h
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_generic.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_tcp.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c
trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
Log:
fixed copyrights and comments
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_icmp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_icmp.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_icmp.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,17 +1,11 @@
/*
- * nf_conntrack_icmp.h
+ * ICMP tracking.
*
- * Definitions and Declarations for ICMP tracking.
- *
* Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - enable working with Layer 3 protocol independent connection tracking.
*/
#ifndef _NF_CONNTRACK_ICMP_H
#define _NF_CONNTRACK_ICMP_H
-/* ICMP tracking. */
#include <asm/atomic.h>
struct nf_ct_icmp
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_ipv4.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_ipv4.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv4/nf_conntrack_ipv4.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,8 +1,6 @@
/*
- * nf_conntrack_ipv4.h
+ * IPv4 support for nf_conntrack.
*
- * Definitions and Declarations for IPv4 tracking.
- *
* 23 Mar 2004: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - move L3 protocol dependent part from include/linux/netfilter_ipv4/
* ip_conntarck.h
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/ipv6/nf_conntrack_icmpv6.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,17 +1,14 @@
/*
- * nf_conntrack_icmpv6.h
+ * ICMPv6 tracking.
*
- * Definitions and Declarations for ICMPv6 tracking.
+ * 21 Apl 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - separated from nf_conntrack_icmp.h
*
* Derived from include/linux/netfiter_ipv4/ip_conntrack_icmp.h
- *
- * 21 Apl 2004: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - separated from nf_conntrack_icmp.h
*/
#ifndef _NF_CONNTRACK_ICMPV6_H
#define _NF_CONNTRACK_ICMPV6_H
-/* ICMPv6 tracking. */
#include <asm/atomic.h>
#ifndef ICMPV6_NI_QUERY
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,20 +1,16 @@
/*
- * nf_conntrack.h
+ * Connection state tracking for netfilter. This is separated from,
+ * but required by, the (future) NAT layer; it can also be used by an iptables
+ * extension.
*
- * Definitions and Declarations for Layer 3 independent connection tracking.
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - generalize L3 protocol dependent part.
*
* Derived from include/linux/netfiter_ipv4/ip_conntrack.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - generalize L3 protocol dependent part.
*/
#ifndef _NF_CONNTRACK_H
#define _NF_CONNTRACK_H
-/* Connection state tracking for netfilter. This is separated from,
- but required by, the NAT layer; it can also be used by an iptables
- extension. */
-
#include <linux/config.h>
#include <linux/netfilter/nf_conntrack_tuple.h>
#include <linux/bitops.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_core.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,22 +1,20 @@
/*
- * nf_conntrack_core.h
+ * This header is used to share core functionality between the
+ * standalone connection tracking module, and the compatibility layer's use
+ * of connection tracking.
*
- * Definitions and Declarations for Layer 3 independent connection tracking.
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - generalize L3 protocol dependent part.
*
* Derived from include/linux/netfiter_ipv4/ip_conntrack_core.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - generalize L3 protocol dependent part.
*/
#ifndef _NF_CONNTRACK_CORE_H
#define _NF_CONNTRACK_CORE_H
+
#include <linux/netfilter.h>
#include <linux/netfilter_ipv4/lockhelp.h>
-/* This header is used to share core functionality between the
- standalone connection tracking module, and the compatibility layer's use
- of connection tracking. */
extern unsigned int
nf_conntrack_in(int pf, unsigned int hooknum, struct sk_buff **pskb);
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_ftp.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -6,10 +6,9 @@
* Derived from include/linux/netfiter_ipv4/ip_conntrack_ftp.h
*
* 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - enable working with Layer 3 protocol independent connection tracking.
+ * - IPv6 support.
*/
-
#ifndef _NF_CONNTRACK_FTP_H
#define _NF_CONNTRACK_FTP_H
/* FTP tracking. */
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_helper.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,15 +1,12 @@
/*
- * nf_conntrack_helper.h
+ * connection tracking helpers.
*
- * Definitions and Declarations for helper modules.
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - generalize L3 protocol dependent part.
*
* Derived from include/linux/netfiter_ipv4/ip_conntrack_helper.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - generalize L3 protocol dependent part.
*/
-/* connection tracking helpers. */
#ifndef _NF_CONNTRACK_HELPER_H
#define _NF_CONNTRACK_HELPER_H
#include <linux/netfilter/nf_conntrack.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_l3proto.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_l3proto.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_l3proto.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,29 +1,14 @@
/*
- * nf_conntrack_l3proto.h
- *
- * Definitions and Declarations for layer 3 protocol modules.
- *
* Copyright (C)2003,2004 USAGI/WIDE Project
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Header for use in defining a given L3 protocol for connection tracking.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Author:
+ * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Authors:
- * Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * Derived from include/netfilter_ipv4/ip_conntrack_protocol.h
*/
-/* Header for use in defining a given L3 protocol for connection tracking. */
#ifndef _NF_CONNTRACK_L3PROTO_H
#define _NF_CONNTRACK_L3PROTO_H
#include <linux/seq_file.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_protocol.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,15 +1,12 @@
/*
- * nf_conntrack_protocol.h
+ * Header for use in defining a given protocol for connection tracking.
*
- * Definitions and Declarations for protocol modules.
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - generalized L3 protocol dependent part.
*
* Derived from include/linux/netfiter_ipv4/ip_conntrack_protcol.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - enable working with L3 protocol independent connection tracking.
*/
-/* Header for use in defining a given protocol for connection tracking. */
#ifndef _NF_CONNTRACK_PROTOCOL_H
#define _NF_CONNTRACK_PROTOCOL_H
#include <linux/netfilter/nf_conntrack.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_sctp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_sctp.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_sctp.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,6 +1,11 @@
+/*
+ * SCTP tracking.
+ *
+ * Derived from include/linux/netfiter_ipv4/ip_conntrack_tcp.h
+ */
+
#ifndef _NF_CONNTRACK_SCTP_H
#define _NF_CONNTRACK_SCTP_H
-/* SCTP tracking. */
enum sctp_conntrack {
SCTP_CONNTRACK_NONE,
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tcp.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,17 +1,11 @@
/*
- * nf_conntrack_tcp.h
+ * TCP tracking.
*
- * Definitions and Declarations for TCP tracking.
- *
* Derived from include/linux/netfiter_ipv4/ip_conntrack_tcp.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
- * - enable working with L3 protocol independent connection tracking.
*/
#ifndef _NF_CONNTRACK_TCP_H
#define _NF_CONNTRACK_TCP_H
-/* TCP tracking. */
enum tcp_conntrack {
TCP_CONNTRACK_NONE,
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tuple.h
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tuple.h 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/include/linux/netfilter/nf_conntrack_tuple.h 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,12 +1,10 @@
/*
- * nf_conntrack_tuple.h
- *
* Definitions and Declarations for tuple.
*
- * Derived from include/linux/netfiter_ipv4/ip_conntrack_tuple.h
- *
- * 16 Dec 2003: Yasuyuki Kozakai @ USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - generalize L3 protocol dependent part.
+ *
+ * Derived from include/linux/netfiter_ipv4/ip_conntrack_tuple.h
*/
#ifndef _NF_CONNTRACK_TUPLE_H
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,16 +1,17 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 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
* published by the Free Software Foundation.
*
- * 16 Dec 2004: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
- * - move L3 protocol dependent part to this file.
- * 23 Mar 2004: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - move L3 protocol dependent part to this file.
+ * 23 Mar 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - add get_features() to support various size of conntrack
* structures.
+ *
+ * Derived from net/ipv4/netfilter/ip_conntrack_standalone.c
*/
#include <linux/config.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_proto_icmp.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv4/netfilter/nf_conntrack_proto_icmp.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,12 +1,11 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 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
* published by the Free Software Foundation.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - enable working with Layer 3 protocol independent connection tracking.
*
* Derived from net/ipv4/netfilter/ip_conntrack_proto_icmp.c
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,24 +1,21 @@
/*
- * Copyright (C)2003,2004 USAGI/WIDE Project
+ * Copyright (C)2004 USAGI/WIDE Project
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Author:
+ * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - support Layer 3 protocol independent connection tracking.
+ * Based on the original ip_conntrack code which had the following
+ * copyright information:
+ * (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
*
- * Authors:
- * Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
- *
- * 23 Mar 2004: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 23 Mar 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - add get_features() to support various size of conntrack
* structures.
*/
@@ -584,6 +581,7 @@
}
MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Yasuyuki KOZAKAI @USAGI <yasuyuki.kozakai at toshiba.co.jp>");
static int __init init(void)
{
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,15 +1,19 @@
-/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
+/*
+ * Copyright (C)2003,2004 USAGI/WIDE Project
*
* 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.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
- * - ICMPv6 tracking support.
+ * Author:
+ * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
*
- * Derived from net/ipv4/netfilter/ip_conntrack_proto_icmp.c
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - ICMPv6 tracking support. Derived from the original ip_conntrack code
+ * net/ipv4/netfilter/ip_conntrack_proto_icmp.c which had the following
+ * copyright information:
+ * (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
*/
#include <linux/types.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/ipv6/netfilter/nf_conntrack_reasm.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -3,8 +3,8 @@
*
* Copyright (C)2004 USAGI/WIDE Project
*
- * Authors:
- * Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * Author:
+ * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
*
* Based on: net/ipv6/reassembly.c
*
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_core.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -16,9 +16,9 @@
* 16 Jul 2002: Harald Welte <laforge at gnumonks.org>
* - add usage/reference counts to ip_conntrack_expect
* - export ip_conntrack[_expect]_{find_get,put} functions
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - generalize L3 protocol denendent part.
- * 23 Mar 2004: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 23 Mar 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - add support various size of conntrack structures.
*
* Derived from net/ipv4/netfilter/ip_conntrack_core.c
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_ftp.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -8,7 +8,7 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - enable working with Layer 3 protocol independent connection tracking.
* - track EPRT and EPSV commands with IPv6 address.
*
@@ -31,7 +31,7 @@
#include <linux/netfilter/nf_conntrack_ftp.h>
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Yasuyuki KOZAKAI <yasuyuki.kozakai at toshiba.co.jp>");
+MODULE_AUTHOR("Rusty Russell <rusty at rustcorp.com.au>");
MODULE_DESCRIPTION("ftp connection tracking helper");
/* This is slow, but it's simple. --RR */
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_l3proto_generic.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,15 +1,21 @@
-/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
+/*
* (C) 2003,2004 USAGI/WIDE Project <http://www.linux-ipv6.org>
*
+ * Based largely upon the original ip_conntrack code which
+ * had the following copyright information:
+ *
+ * (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.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
* published by the Free Software Foundation.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * Author:
+ * Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ *
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - enable working with L3 protocol independent connection tracking.
- *
- * Derived from net/ipv4/netfilter/ip_conntrack_proto_generic.c
*/
#include <linux/config.h>
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_generic.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_generic.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_generic.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,12 +1,11 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 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
* published by the Free Software Foundation.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - enable working with L3 protocol independent connection tracking.
*
* Derived from net/ipv4/netfilter/ip_conntrack_proto_generic.c
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_sctp.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -8,6 +8,9 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
+ * 17 Oct 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
+ * - enable working with L3 protocol independent connection tracking.
+ *
* Derived from net/ipv4/ip_conntrack_sctp.c
*/
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_tcp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_tcp.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_tcp.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,6 +1,5 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 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
@@ -17,7 +16,7 @@
* - More robust state changes
* - Tuning timer parameters
*
- * Yasuyuki KOZAKAI:
+ * 27 Oct 2004: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - genelized Layer 3 protocol part.
*
* Derived from net/ipv4/netfilter/ip_conntrack_proto_tcp.c
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_proto_udp.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -1,12 +1,11 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 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
* published by the Free Software Foundation.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - enable working with Layer 3 protocol independent connection tracking.
*
* Derived from net/ipv4/netfilter/ip_conntrack_proto_udp.c
Modified: trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c
===================================================================
--- trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c 2004-11-20 06:44:02 UTC (rev 3288)
+++ trunk/patch-o-matic-ng/nf_conntrack/linux-2.6/net/netfilter/nf_conntrack_standalone.c 2004-11-20 17:37:00 UTC (rev 3289)
@@ -6,13 +6,12 @@
/* (C) 1999-2001 Paul `Rusty' Russell
* (C) 2002-2004 Netfilter Core Team <coreteam at netfilter.org>
- * (C) 2003,2004 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
* published by the Free Software Foundation.
*
- * 16 Dec 2003: Yasuyuki Kozakai <yasuyuki.kozakai at toshiba.co.jp>
+ * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai at toshiba.co.jp>
* - generalize L3 protocol dependent part.
*
* Derived from net/ipv4/netfilter/ip_conntrack_standalone.c
More information about the netfilter-cvslog
mailing list