History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

David S. Miller committed 17 years ago

Commit b5bb1432 parents bb4f92b 1d4520971 files · +1626 −784Browse files

Showing the changes to include/linux/netfilter (8 of 71 files). Show all

Unified · Split

8 files
  1. include/linux/netfilter/Kbuild +8 −0
  2. include/linux/netfilter/nfnetlink.h +1 −0
  3. include/linux/netfilter/x_tables.h +8 −7
  4. include/linux/netfilter/xt_LED.h +13 −0
  5. include/linux/netfilter/xt_cluster.h +15 −0
  6. include/linux/netfilter/xt_limit.h +5 −4
  7. include/linux/netfilter/xt_quota.h +3 −1
  8. include/linux/netfilter/xt_statistic.h +4 −3
include/linux/netfilter/Kbuild+8−0
@@ -7,16 +7,21 @@ header-y += xt_CLASSIFY.h · 6 unmodified lines
7header-y += xt_CONNMARK.h7header-y += xt_CONNMARK.h
8header-y += xt_CONNSECMARK.h8header-y += xt_CONNSECMARK.h
9header-y += xt_DSCP.h9header-y += xt_DSCP.h
10header-y += xt_LED.h
10header-y += xt_MARK.h11header-y += xt_MARK.h
11header-y += xt_NFLOG.h12header-y += xt_NFLOG.h
12header-y += xt_NFQUEUE.h13header-y += xt_NFQUEUE.h
13header-y += xt_RATEEST.h14header-y += xt_RATEEST.h
14header-y += xt_SECMARK.h15header-y += xt_SECMARK.h
15header-y += xt_TCPMSS.h16header-y += xt_TCPMSS.h
17header-y += xt_TCPOPTSTRIP.h
18header-y += xt_TPROXY.h
16header-y += xt_comment.h19header-y += xt_comment.h
17header-y += xt_connbytes.h20header-y += xt_connbytes.h
21header-y += xt_connlimit.h
18header-y += xt_connmark.h22header-y += xt_connmark.h
19header-y += xt_conntrack.h23header-y += xt_conntrack.h
24header-y += xt_cluster.h
20header-y += xt_dccp.h25header-y += xt_dccp.h
21header-y += xt_dscp.h26header-y += xt_dscp.h
22header-y += xt_esp.h27header-y += xt_esp.h
@@ -30,6 +35,7 @@ header-y += xt_mark.h · 7 unmodified lines
30header-y += xt_multiport.h35header-y += xt_multiport.h
31header-y += xt_owner.h36header-y += xt_owner.h
32header-y += xt_pkttype.h37header-y += xt_pkttype.h
38header-y += xt_quota.h
33header-y += xt_rateest.h39header-y += xt_rateest.h
34header-y += xt_realm.h40header-y += xt_realm.h
35header-y += xt_recent.h41header-y += xt_recent.h
@@ -39,6 +45,8 @@ header-y += xt_statistic.h · 3 unmodified lines
39header-y += xt_string.h45header-y += xt_string.h
40header-y += xt_tcpmss.h46header-y += xt_tcpmss.h
41header-y += xt_tcpudp.h47header-y += xt_tcpudp.h
48header-y += xt_time.h
49header-y += xt_u32.h
42 50
43unifdef-y += nf_conntrack_common.h51unifdef-y += nf_conntrack_common.h
44unifdef-y += nf_conntrack_ftp.h52unifdef-y += nf_conntrack_ftp.h
include/linux/netfilter/nfnetlink.h+1−0
@@ -76,6 +76,7 @@ extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); · 75 unmodified lines
76extern int nfnetlink_has_listeners(unsigned int group);76extern int nfnetlink_has_listeners(unsigned int group);
77extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, 77extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group,
78 int echo);78 int echo);
79extern void nfnetlink_set_err(u32 pid, u32 group, int error);
79extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);80extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);
80 81
81extern void nfnl_lock(void);82extern void nfnl_lock(void);
include/linux/netfilter/x_tables.h+8−7
@@ -349,23 +349,22 @@ struct xt_table · 348 unmodified lines
349{349{
350 struct list_head list;350 struct list_head list;
351 351
352 /* A unique name... */
353 const char name[XT_TABLE_MAXNAMELEN];
354
355 /* What hooks you will enter on */352 /* What hooks you will enter on */
356 unsigned int valid_hooks;353 unsigned int valid_hooks;
357 354
358 /* Lock for the curtain */355 /* Lock for the curtain */
359 rwlock_t lock;356 struct mutex lock;
360 357
361 /* Man behind the curtain... */358 /* Man behind the curtain... */
362 //struct ip6t_table_info *private;359 struct xt_table_info *private;
363 void *private;
364 360
365 /* Set this to THIS_MODULE if you are a module, otherwise NULL */361 /* Set this to THIS_MODULE if you are a module, otherwise NULL */
366 struct module *me;362 struct module *me;
367 363
368 u_int8_t af; /* address/protocol family */364 u_int8_t af; /* address/protocol family */
365
366 /* A unique name... */
367 const char name[XT_TABLE_MAXNAMELEN];
369};368};
370 369
371#include <linux/netfilter_ipv4.h>370#include <linux/netfilter_ipv4.h>
@@ -386,7 +385,7 @@ struct xt_table_info · 14 unmodified lines
386 385
387 /* ipt_entry tables: one per CPU */386 /* ipt_entry tables: one per CPU */
388 /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */387 /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */
389 char *entries[1];388 void *entries[1];
390};389};
391 390
392#define XT_TABLE_INFO_SZ (offsetof(struct xt_table_info, entries) \391#define XT_TABLE_INFO_SZ (offsetof(struct xt_table_info, entries) \
@@ -433,6 +432,8 @@ extern void xt_proto_fini(struct net *net, u_int8_t af); · 40 unmodified lines
433 432
434extern struct xt_table_info *xt_alloc_table_info(unsigned int size);433extern struct xt_table_info *xt_alloc_table_info(unsigned int size);
435extern void xt_free_table_info(struct xt_table_info *info);434extern void xt_free_table_info(struct xt_table_info *info);
435extern void xt_table_entry_swap_rcu(struct xt_table_info *old,
436 struct xt_table_info *new);
436 437
437#ifdef CONFIG_COMPAT438#ifdef CONFIG_COMPAT
438#include <net/compat.h>439#include <net/compat.h>
include/linux/netfilter/xt_LED.h+13−0
@@ -0,0 +1,13 @@
1#ifndef _XT_LED_H
2#define _XT_LED_H
3
4struct xt_led_info {
5 char id[27]; /* Unique ID for this trigger in the LED class */
6 __u8 always_blink; /* Blink even if the LED is already on */
7 __u32 delay; /* Delay until LED is switched off after trigger */
8
9 /* Kernel data used in the module */
10 void *internal_data __attribute__((aligned(8)));
11};
12
13#endif /* _XT_LED_H */
include/linux/netfilter/xt_cluster.h+15−0
@@ -0,0 +1,15 @@
1#ifndef _XT_CLUSTER_MATCH_H
2#define _XT_CLUSTER_MATCH_H
3
4enum xt_cluster_flags {
5 XT_CLUSTER_F_INV = (1 << 0)
6};
7
8struct xt_cluster_match_info {
9 u_int32_t total_nodes;
10 u_int32_t node_mask;
11 u_int32_t hash_seed;
12 u_int32_t flags;
13};
14
15#endif /* _XT_CLUSTER_MATCH_H */
include/linux/netfilter/xt_limit.h+5−4
@@ -4,6 +4,8 @@ · 3 unmodified lines
4/* timings are in milliseconds. */4/* timings are in milliseconds. */
5#define XT_LIMIT_SCALE 100005#define XT_LIMIT_SCALE 10000
6 6
7struct xt_limit_priv;
8
7/* 1/10,000 sec period => max of 10,000/sec. Min rate is then 4294909/* 1/10,000 sec period => max of 10,000/sec. Min rate is then 429490
8 seconds, or one every 59 hours. */10 seconds, or one every 59 hours. */
9struct xt_rateinfo {11struct xt_rateinfo {
@@ -11,11 +13,10 @@ struct xt_rateinfo { · 1 unmodified line
11 u_int32_t burst; /* Period multiplier for upper limit. */13 u_int32_t burst; /* Period multiplier for upper limit. */
12 14
13 /* Used internally by the kernel */15 /* Used internally by the kernel */
14 unsigned long prev;16 unsigned long prev; /* moved to xt_limit_priv */
15 u_int32_t credit;17 u_int32_t credit; /* moved to xt_limit_priv */
16 u_int32_t credit_cap, cost;18 u_int32_t credit_cap, cost;
17 19
18 /* Ugly, ugly fucker. */20 struct xt_limit_priv *master;
19 struct xt_rateinfo *master;
20};21};
21#endif /*_XT_RATE_H*/22#endif /*_XT_RATE_H*/
include/linux/netfilter/xt_quota.h+3−1
@@ -6,13 +6,15 @@ enum xt_quota_flags { · 5 unmodified lines
6};6};
7#define XT_QUOTA_MASK 0x17#define XT_QUOTA_MASK 0x1
8 8
9struct xt_quota_priv;
10
9struct xt_quota_info {11struct xt_quota_info {
10 u_int32_t flags;12 u_int32_t flags;
11 u_int32_t pad;13 u_int32_t pad;
12 14
13 /* Used internally by the kernel */15 /* Used internally by the kernel */
14 aligned_u64 quota;16 aligned_u64 quota;
15 struct xt_quota_info *master;17 struct xt_quota_priv *master;
16};18};
17 19
18#endif /* _XT_QUOTA_H */20#endif /* _XT_QUOTA_H */
include/linux/netfilter/xt_statistic.h+4−3
@@ -13,6 +13,8 @@ enum xt_statistic_flags { · 12 unmodified lines
13};13};
14#define XT_STATISTIC_MASK 0x114#define XT_STATISTIC_MASK 0x1
15 15
16struct xt_statistic_priv;
17
16struct xt_statistic_info {18struct xt_statistic_info {
17 u_int16_t mode;19 u_int16_t mode;
18 u_int16_t flags;20 u_int16_t flags;
@@ -23,11 +25,10 @@ struct xt_statistic_info { · 4 unmodified lines
23 struct {25 struct {
24 u_int32_t every;26 u_int32_t every;
25 u_int32_t packet;27 u_int32_t packet;
26 /* Used internally by the kernel */28 u_int32_t count; /* unused */
27 u_int32_t count;
28 } nth;29 } nth;
29 } u;30 } u;
30 struct xt_statistic_info *master __attribute__((aligned(8)));31 struct xt_statistic_priv *master __attribute__((aligned(8)));
31};32};
32 33
33#endif /* _XT_STATISTIC_H */34#endif /* _XT_STATISTIC_H */