vserver 1.9.3

[linux-2.6.git] / include / linux / netfilter_ipv4 / ip_conntrack_protocol.h

diff --git a/include/linux/netfilter_ipv4/ip_conntrack_protocol.h b/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
index 56e37ef..0ff067b 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
@@ -3,11 +3,10 @@
 #define _IP_CONNTRACK_PROTOCOL_H
 #include <linux/netfilter_ipv4/ip_conntrack.h>
 
+struct seq_file;
+
 struct ip_conntrack_protocol
 {
-       /* Next pointer. */
-       struct list_head list;
-
        /* Protocol number. */
        u_int8_t proto;
 
@@ -26,13 +25,12 @@ struct ip_conntrack_protocol
        int (*invert_tuple)(struct ip_conntrack_tuple *inverse,
                            const struct ip_conntrack_tuple *orig);
 
-       /* Print out the per-protocol part of the tuple. */
-       unsigned int (*print_tuple)(char *buffer,
-                                   const struct ip_conntrack_tuple *);
+       /* Print out the per-protocol part of the tuple. Return like seq_* */
+       int (*print_tuple)(struct seq_file *,
+                          const struct ip_conntrack_tuple *);
 
        /* Print out the private part of the conntrack. */
-       unsigned int (*print_conntrack)(char *buffer,
-                                       const struct ip_conntrack *);
+       int (*print_conntrack)(struct seq_file *, const struct ip_conntrack *);
 
        /* Returns verdict for packet, or -1 for invalid. */
        int (*packet)(struct ip_conntrack *conntrack,
@@ -50,17 +48,46 @@ struct ip_conntrack_protocol
        int (*exp_matches_pkt)(struct ip_conntrack_expect *exp,
                               const struct sk_buff *skb);
 
+       int (*error)(struct sk_buff *skb, enum ip_conntrack_info *ctinfo,
+                    unsigned int hooknum);
+
        /* Module (if any) which this is connected to. */
        struct module *me;
 };
 
+#define MAX_IP_CT_PROTO 256
+extern struct ip_conntrack_protocol *ip_ct_protos[MAX_IP_CT_PROTO];
+
 /* Protocol registration. */
 extern int ip_conntrack_protocol_register(struct ip_conntrack_protocol *proto);
 extern void ip_conntrack_protocol_unregister(struct ip_conntrack_protocol *proto);
 
+static inline struct ip_conntrack_protocol *ip_ct_find_proto(u_int8_t protocol)
+{
+       return ip_ct_protos[protocol];
+}
+
 /* Existing built-in protocols */
 extern struct ip_conntrack_protocol ip_conntrack_protocol_tcp;
 extern struct ip_conntrack_protocol ip_conntrack_protocol_udp;
 extern struct ip_conntrack_protocol ip_conntrack_protocol_icmp;
+extern struct ip_conntrack_protocol ip_conntrack_generic_protocol;
 extern int ip_conntrack_protocol_tcp_init(void);
+
+/* Log invalid packets */
+extern unsigned int ip_ct_log_invalid;
+
+#ifdef CONFIG_SYSCTL
+#ifdef DEBUG_INVALID_PACKETS
+#define LOG_INVALID(proto) \
+       (ip_ct_log_invalid == (proto) || ip_ct_log_invalid == IPPROTO_RAW)
+#else
+#define LOG_INVALID(proto) \
+       ((ip_ct_log_invalid == (proto) || ip_ct_log_invalid == IPPROTO_RAW) \
+        && net_ratelimit())
+#endif
+#else
+#define LOG_INVALID(proto) 0
+#endif /* CONFIG_SYSCTL */
+
 #endif /*_IP_CONNTRACK_PROTOCOL_H*/