[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
(usagi-users 03070) [Patch] nf_conntrack seq_file api - fixes
- To: usagi-users@xxxxxxxxxxxxxx
- Subject: (usagi-users 03070) [Patch] nf_conntrack seq_file api - fixes
- From: Michal Rokos <michal@xxxxxxxxxx>
- Date: Thu, 14 Oct 2004 19:50:18 +0200
- Reply-to: usagi-users@xxxxxxxxxxxxxx
- Resent-date: Fri, 15 Oct 2004 11:30:31 +0900
- Resent-from: sekiya@xxxxxxxxxxxxxx
- Resent-message-id: <200410151130.FMLAAB13848.usagi-users@linux-ipv6.org>
- Resent-to: usagi-users@xxxxxxxxxxxxxx (moderated)
- User-agent: KMail/1.7
Hi,
few things escaped. Sorry.
Michal
PS: I'm already subscribed.
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/10/14 16:28:02+02:00 michal@xxxxxxxxxxxxxxxxx
# Fix 2 leftovers from seq_file API migration
#
# net/netfilter/nf_conntrack_proto_generic.c
# 2004/10/14 16:27:47+02:00 michal@xxxxxxxxxxxxxxxxx +20 -8
# Fix 2 leftovers from seq_file API migration
#
# net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
# 2004/10/14 16:27:47+02:00 michal@xxxxxxxxxxxxxxxxx +25 -12
# Fix 2 leftovers from seq_file API migration
#
# include/net/icmp.h
# 2004/10/14 16:57:46+02:00 michal@xxxxxxxxxxxxxxxxx +0 -1
# Remove seq_file.h from net/icmp.h
#
diff -Nru a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-10-14 17:05:28 +02:00
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-10-14 17:05:28 +02:00
@@ -19,6 +19,7 @@
#include <linux/netfilter.h>
#include <linux/in6.h>
#include <linux/icmpv6.h>
+#include <linux/seq_file.h>
#include <linux/netfilter/nf_conntrack_tuple.h>
#include <linux/netfilter/nf_conntrack_protocol.h>
#include <linux/netfilter_ipv6/nf_conntrack_icmpv6.h>
@@ -68,18 +69,18 @@
}
/* Print out the per-protocol part of the tuple. */
-static unsigned int icmpv6_print_tuple(char *buffer,
- const struct nf_conntrack_tuple *tuple)
+static int icmpv6_print_tuple(struct seq_file *s,
+ const struct nf_conntrack_tuple *tuple)
{
- return sprintf(buffer, "type=%u code=%u id=%u ",
- tuple->dst.u.icmp.type,
- tuple->dst.u.icmp.code,
- ntohs(tuple->src.u.icmp.id));
+ return seq_printf(s, "type=%u code=%u id=%u ",
+ tuple->dst.u.icmp.type,
+ tuple->dst.u.icmp.code,
+ ntohs(tuple->src.u.icmp.id));
}
/* Print out the private part of the conntrack. */
-static unsigned int icmpv6_print_conntrack(char *buffer,
- const struct nf_conn *conntrack)
+static int icmpv6_print_conntrack(struct seq_file *s,
+ const struct nf_conn *conntrack)
{
return 0;
}
@@ -130,9 +131,21 @@
return 1;
}
-struct nf_conntrack_protocol nf_conntrack_protocol_icmpv6
-= { { NULL, NULL }, PF_INET6, IPPROTO_ICMPV6, "icmpv6",
- icmpv6_pkt_to_tuple, icmpv6_invert_tuple, icmpv6_print_tuple,
- icmpv6_print_conntrack, icmpv6_packet, icmpv6_new, NULL, NULL, NULL };
+struct nf_conntrack_protocol nf_conntrack_protocol_icmpv6 =
+{
+ .list = { NULL, NULL },
+ .l3proto = PF_INET6,
+ .proto = IPPROTO_ICMPV6,
+ .name = "icmpv6",
+ .pkt_to_tuple = icmpv6_pkt_to_tuple,
+ .invert_tuple = icmpv6_invert_tuple,
+ .print_tuple = icmpv6_print_tuple,
+ .print_conntrack = icmpv6_print_conntrack,
+ .packet = icmpv6_packet,
+ .new = icmpv6_new,
+ .destroy = NULL,
+ .exp_matches_pkt = NULL,
+ .me = NULL
+};
EXPORT_SYMBOL(nf_conntrack_protocol_icmpv6);
diff -Nru a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
--- a/net/netfilter/nf_conntrack_proto_generic.c 2004-10-14 17:05:28 +02:00
+++ b/net/netfilter/nf_conntrack_proto_generic.c 2004-10-14 17:05:28 +02:00
@@ -40,15 +40,15 @@
}
/* Print out the per-protocol part of the tuple. */
-static unsigned int generic_print_tuple(char *buffer,
- const struct nf_conntrack_tuple *tuple)
+static int generic_print_tuple(struct seq_file *s,
+ const struct nf_conntrack_tuple *tuple)
{
return 0;
}
/* Print out the private part of the conntrack. */
-static unsigned int generic_print_conntrack(char *buffer,
- const struct nf_conn *state)
+static int generic_print_conntrack(struct seq_file *s,
+ const struct nf_conn *state)
{
return 0;
}
@@ -71,7 +71,19 @@
return 1;
}
-struct nf_conntrack_protocol nf_conntrack_generic_protocol
-= { { NULL, NULL }, PF_UNSPEC, 0, "unknown",
- generic_pkt_to_tuple, generic_invert_tuple, generic_print_tuple,
- generic_print_conntrack, packet, new, NULL, NULL, NULL };
+struct nf_conntrack_protocol nf_conntrack_generic_protocol =
+{
+ .list = { NULL, NULL },
+ .l3proto = PF_UNSPEC,
+ .proto = 0,
+ .name = "unknown",
+ .pkt_to_tuple = generic_pkt_to_tuple,
+ .invert_tuple = generic_invert_tuple,
+ .print_tuple = generic_print_tuple,
+ .print_conntrack = generic_print_conntrack,
+ .packet = packet,
+ .new = new,
+ .destroy = NULL,
+ .exp_matches_pkt = NULL,
+ .me = NULL
+};
diff -Nru a/include/net/icmp.h b/include/net/icmp.h
--- a/include/net/icmp.h 2004-10-14 17:05:57 +02:00
+++ b/include/net/icmp.h 2004-10-14 17:05:57 +02:00
@@ -26,7 +26,6 @@
#include <net/protocol.h>
#include <net/snmp.h>
#include <linux/ip.h>
-#include <linux/seq_file.h>
struct icmp_err {
int errno;
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/10/14 19:40:03+02:00 michal@xxxxxxxxxxxxxxxxx
# Include seq_file.h in nf_conntrack_protocol.h since it's used there.
#
# net/netfilter/nf_conntrack_standalone.c
# 2004/10/14 19:39:34+02:00 michal@xxxxxxxxxxxxxxxxx +0 -1
# Include seq_file.h in nf_conntrack_protocol.h since it's used there.
#
# net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
# 2004/10/14 19:39:34+02:00 michal@xxxxxxxxxxxxxxxxx +0 -1
# Include seq_file.h in nf_conntrack_protocol.h since it's used there.
#
# include/linux/netfilter/nf_conntrack_protocol.h
# 2004/10/14 19:39:34+02:00 michal@xxxxxxxxxxxxxxxxx +1 -0
# Include seq_file.h in nf_conntrack_protocol.h since it's used there.
#
diff -Nru a/include/linux/netfilter/nf_conntrack_protocol.h b/include/linux/netfilter/nf_conntrack_protocol.h
--- a/include/linux/netfilter/nf_conntrack_protocol.h 2004-10-14 19:46:30 +02:00
+++ b/include/linux/netfilter/nf_conntrack_protocol.h 2004-10-14 19:46:30 +02:00
@@ -12,6 +12,7 @@
/* Header for use in defining a given protocol for connection tracking. */
#ifndef _NF_CONNTRACK_PROTOCOL_H
#define _NF_CONNTRACK_PROTOCOL_H
+#include <linux/seq_file.h>
#include <linux/netfilter/nf_conntrack.h>
struct nf_conntrack_protocol
diff -Nru a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
--- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-10-14 19:46:30 +02:00
+++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 2004-10-14 19:46:30 +02:00
@@ -19,7 +19,6 @@
#include <linux/netfilter.h>
#include <linux/in6.h>
#include <linux/icmpv6.h>
-#include <linux/seq_file.h>
#include <linux/netfilter/nf_conntrack_tuple.h>
#include <linux/netfilter/nf_conntrack_protocol.h>
#include <linux/netfilter_ipv6/nf_conntrack_icmpv6.h>
diff -Nru a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
--- a/net/netfilter/nf_conntrack_standalone.c 2004-10-14 19:46:30 +02:00
+++ b/net/netfilter/nf_conntrack_standalone.c 2004-10-14 19:46:30 +02:00
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
#include <linux/netdevice.h>
#ifdef CONFIG_SYSCTL
#include <linux/sysctl.h>